rpms/objenesis
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.1

Browse Source
This commit is contained in:
Michal Srb 2015-05-01 20:21:06 +02:00
parent b7a6753675
commit c8df6baac5
5 changed files with 18 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/objenesis-1.2.tar.xz
/2.1.tar.gz

116
001-objenesis-fix-build.patch
View File

@ -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 @@
<artifactId>maven-timestamp-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
+ <groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
</plugin>
<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 @@
</executions>
</plugin>
<plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
+ <groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.6.1</version>
<configuration>
<header>${basedir}/../header.txt</header>
<excludes>
@@ -291,7 +291,7 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
+ <groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<executions>
<execution>
--- 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 @@
<version>${project.version}</version>
</dependency>
- <!-- Dependencies below are for the OSGi test -->
-
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-test</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-annotation</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- <version>1.2.0</version>
- <scope>test</scope>
- </dependency>
-
- <!-- These are just to have a nice logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
- <version>1.5.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>com.springsource.slf4j.api</artifactId>
- <version>1.5.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>com.springsource.slf4j.log4j</artifactId>
- <version>1.5.0</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <groupId>org.apache.log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>log4j.osgi</artifactId>
- <version>1.2.15-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <!-- And this is our Equinox implementation -->
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.2.2</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -107,7 +43,7 @@
<artifactId>maven-timestamp-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
+ <groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
</plugin>
<plugin>

24
JRockitInstantntiatorCharacters.patch
View File

@ -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.
*
*/

45
objenesis.spec
View File

@ -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 <msrb@redhat.com> - 2.1-1
- Update to 2.1
* Tue Feb 3 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-18
- Add missing BR on maven-wagon-ssh-external
- Resolves: rhbz#1106608

2
sources
View File

@ -1 +1 @@
1bb12f3849fa1225bfab7106c716c34d objenesis-1.2.tar.xz
8f6e5f347b950f23a8c4ae6618c4b65d 2.1.tar.gz