From c8df6baac57504406147441b97a9b35fe27df8d0 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: May 01 2015 18:21:06 +0000 Subject: Update to 2.1 --- diff --git a/.gitignore b/.gitignore index f922a35..f974b69 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /objenesis-1.2.tar.xz +/2.1.tar.gz diff --git a/001-objenesis-fix-build.patch b/001-objenesis-fix-build.patch deleted file mode 100644 index c235271..0000000 --- a/001-objenesis-fix-build.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- A/main/pom.xml 2009-08-27 00:15:13.000000000 +0200 -+++ B/main/pom.xml 2010-05-10 14:44:07.634785201 +0200 -@@ -38,7 +38,7 @@ - maven-timestamp-plugin - - -- com.google.code.maven-license-plugin -+ com.mycila.maven-license-plugin - maven-license-plugin - - ---- A/pom.xml 2009-08-26 23:12:00.000000000 +0200 -+++ B/pom.xml 2010-05-10 14:44:07.635789574 +0200 -@@ -203,9 +203,9 @@ - - - -- com.google.code.maven-license-plugin -+ com.mycila.maven-license-plugin - maven-license-plugin -- 1.4.0 -+ 1.6.1 - -
${basedir}/../header.txt
- -@@ -291,7 +291,7 @@ - - - -- com.google.code.maven-license-plugin -+ com.mycila.maven-license-plugin - maven-license-plugin - - ---- A/tck/pom.xml 2009-08-26 23:27:20.000000000 +0200 -+++ B/tck/pom.xml 2010-05-10 14:52:36.424792684 +0200 -@@ -34,70 +34,6 @@ - ${project.version} - - -- -- -- -- org.springframework.osgi -- spring-osgi-test -- 1.2.0 -- test -- -- -- org.springframework.osgi -- spring-osgi-annotation -- 1.2.0 -- test -- -- -- org.springframework.osgi -- spring-osgi-extender -- 1.2.0 -- test -- -- -- -- -- org.slf4j -- com.springsource.slf4j.org.apache.commons.logging -- 1.5.0 -- test -- -- -- org.slf4j -- com.springsource.slf4j.api -- 1.5.0 -- test -- -- -- org.slf4j -- com.springsource.slf4j.log4j -- 1.5.0 -- test -- -- -- log4j -- log4j -- -- -- com.springsource.org.apache.log4j -- org.apache.log4j -- -- -- -- -- org.springframework.osgi -- log4j.osgi -- 1.2.15-SNAPSHOT -- test -- -- -- -- -- org.eclipse.osgi -- org.eclipse.osgi -- 3.2.2 -- test -- - - - -@@ -107,7 +43,7 @@ - maven-timestamp-plugin - - -- com.google.code.maven-license-plugin -+ com.mycila.maven-license-plugin - maven-license-plugin - - diff --git a/JRockitInstantntiatorCharacters.patch b/JRockitInstantntiatorCharacters.patch deleted file mode 100644 index 19d8e48..0000000 --- a/JRockitInstantntiatorCharacters.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r a6eb6f4f2a1b objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java ---- a/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java Mon Feb 20 09:13:19 2012 +0100 -+++ b/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java Mon Feb 20 09:15:05 2012 +0100 -@@ -7,7 +7,7 @@ - * - * BEA does not guarantee that the code works, and provides no support for it. Use at your own risk. - * -- * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St�hl, BEA JRockit Product Manager. -+ * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St\u00E0hl, BEA JRockit Product Manager. - * - */ - package org.objenesis.instantiator.jrockit; -diff -r a6eb6f4f2a1b objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java ---- a/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java Mon Feb 20 09:13:19 2012 +0100 -+++ b/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java Mon Feb 20 09:15:05 2012 +0100 -@@ -7,7 +7,7 @@ - * - * BEA does not guarantee that the code works, and provides no support for it. Use at your own risk. - * -- * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St�hl, BEA JRockit Product Manager. -+ * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St\u00E0hl, BEA JRockit Product Manager. - * - */ - diff --git a/objenesis.spec b/objenesis.spec index 356bbf4..450e427 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -30,34 +30,20 @@ Summary: A library for instantiating Java objects Name: objenesis -Version: 1.2 -Release: 18%{dist} -Group: Development/Libraries +Version: 2.1 +Release: 1%{dist} License: ASL 2.0 URL: http://objenesis.org/ -# svn export http://objenesis.googlecode.com/svn/tags/1_2/ objenesis-1.2 -# tar cfJ objenesis-1.2.tar.xz objenesis-1.2 -Source0: %{name}-%{version}.tar.xz +Source0: https://github.com/easymock/%{name}/archive/%{version}.tar.gz -# Skipping website (requires xsite), this patch is unused atm -#Patch0: objenesis-website-pom.patch - -# Remove deps for test scope (unavailable); fix -# maven-license-plugin groupID to latest version available. -Patch1: 001-objenesis-fix-build.patch -Patch2: JRockitInstantntiatorCharacters.patch - -BuildRequires: jpackage-utils -BuildRequires: java-devel -BuildRequires: junit BuildRequires: maven-local -BuildRequires: maven-shade-plugin -BuildRequires: maven-license-plugin -BuildRequires: maven-timestamp-plugin -BuildRequires: xpp3-minimal -BuildRequires: objectweb-asm -BuildRequires: apache-resource-bundles -BuildRequires: maven-wagon-ssh-external +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin) +BuildRequires: mvn(org.apache.maven.wagon:wagon-ssh-external) BuildArch: noarch @@ -83,7 +69,6 @@ when this is useful: %package javadoc -Group: Documentation Summary: Javadoc for %{name} BuildArch: noarch @@ -102,13 +87,13 @@ This package contains the API documentation for %{name}. %prep %setup -q -#%%patch0 -b .sav0 -%patch1 -p1 -%patch2 -p2 # Enable generation of pom.properties (rhbz#1017850) %pom_xpath_remove pom:addMavenDescriptor +%pom_remove_plugin :maven-timestamp-plugin +%pom_remove_plugin :maven-license-plugin +%pom_xpath_remove "pom:dependency[pom:scope='test']" tck %build # tests are skipped because of missing dependency spring-osgi-test @@ -129,7 +114,6 @@ This package contains the API documentation for %{name}. %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE.txt %files javadoc -f .mfiles-javadoc @@ -137,6 +121,9 @@ This package contains the API documentation for %{name}. %changelog +* Thu Apr 30 2015 Michal Srb - 2.1-1 +- Update to 2.1 + * Tue Feb 3 2015 Mikolaj Izdebski - 1.2-18 - Add missing BR on maven-wagon-ssh-external - Resolves: rhbz#1106608 diff --git a/sources b/sources index f7f087c..dddfec2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bb12f3849fa1225bfab7106c716c34d objenesis-1.2.tar.xz +8f6e5f347b950f23a8c4ae6618c4b65d 2.1.tar.gz