[RPM (6.0)] guava-libraries-12.0.1-1.jpp6
Ralph Apel <[email protected]> Sat, 9 Aug 2014 21:48:44 +0200
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : guava-libraries Relocations: (not relocatable) Version : 12.0.1 Vendor: JPackage Project Release : 1.jpp6 Build Date: Sat 09 Aug 2014 09:26:07 PM CEST Install Date: (not installed) Build Host: linux.fritz.box Group : Development/Libraries Source RPM: (none) Size : 1708674 License: ASL 2.0 Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://code.google.com/p/guava-libraries Summary : Google Core Libraries for Java Description : Guava is a suite of core and expanded libraries that include utility classes, Google's collections, io classes, and much much more. This project is a complete packaging of all the Guava libraries into a single jar. Individual portions of Guava can be used by downloading the appropriate module and its dependencies. --------------- Ralph Apel <[email protected]> - 12.0.1-1 - 12.0.1 --------------- --------------- Index: guava-libraries-guava-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/guava-libraries/guava-libraries-guava-pom.patch,v retrieving revision 1.1 diff -u -r1.1 guava-libraries-guava-pom.patch --- guava-libraries-guava-pom.patch 5 Jun 2012 19:40:37 -0000 1.1 +++ guava-libraries-guava-pom.patch 9 Aug 2014 19:48:42 -0000 @@ -1,14 +1,14 @@ ---- guava/pom.xml.sav1 2011-10-10 16:06:14.000000000 +0200 -+++ guava/pom.xml 2012-06-05 20:38:05.212513558 +0200 -@@ -47,6 +47,7 @@ - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> +--- guava/pom.xml.sav1 2012-07-10 13:21:40.000000000 +0200 ++++ guava/pom.xml 2014-08-09 16:06:22.307345326 +0200 +@@ -64,6 +64,7 @@ <configuration> -+ <verbose>false</verbose> - <source>1.5</source> - <target>1.5</target> - <!-- Prepend guava-bootstrap to avoid an API incompatibility between JDK5 and JDK6 --> -@@ -84,6 +85,7 @@ + <source>1.6</source> + <target>1.6</target> ++ <compilerArgument>-J-Xmx128m</compilerArgument> + </configuration> + </plugin> + <plugin> +@@ -88,6 +89,7 @@ </execution> </executions> </plugin> @@ -16,7 +16,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> -@@ -105,6 +107,7 @@ +@@ -109,6 +111,7 @@ </execution> </executions> </plugin> Index: guava-libraries-jpp-depmap.xml =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/guava-libraries/guava-libraries-jpp-depmap.xml,v retrieving revision 1.1 diff -u -r1.1 guava-libraries-jpp-depmap.xml --- guava-libraries-jpp-depmap.xml 5 Jun 2012 19:40:37 -0000 1.1 +++ guava-libraries-jpp-depmap.xml 9 Aug 2014 19:48:42 -0000 @@ -1,109 +1,266 @@ <dependencies> -<!-- ---> <dependency> <maven> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>1.0-2</version> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-common-artifact-filters</artifactId> + <version>1.3</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>stax_1_0_api</artifactId> - <version>1.0</version> + <artifactId>maven-common-artifact-filters</artifactId> + <version>1.3</version> </jpp> </dependency> <dependency> - <maven> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.14.0-GA</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>javassist</artifactId> - <version>3.9.0</version> - </jpp> + <maven> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java15-sun</artifactId> + <version>1.1</version> + </maven> + <jpp> + <groupId>JPP/mojo-signatures</groupId> + <artifactId>java15</artifactId> + <version>1.1</version> + </jpp> </dependency> <dependency> - <maven> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-common-artifact-filters</artifactId> - <version>1.3</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>maven-common-artifact-filters</artifactId> - <version>1.3</version> - </jpp> + <maven> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer</artifactId> + <version>1.7</version> + </maven> + <jpp> + <groupId>JPP/mojo-animal-sniffer</groupId> + <artifactId>animal-sniffer</artifactId> + <version>1.7</version> + </jpp> </dependency> <dependency> - <maven> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <version>1.3.RC2</version> - </maven> - <jpp> - <groupId>JPP/hamcrest13</groupId> - <artifactId>core</artifactId> - <version>1.3</version> - </jpp> + <maven> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-annotations</artifactId> + <version>1.7</version> + </maven> + <jpp> + <groupId>JPP/mojo-animal-sniffer</groupId> + <artifactId>animal-sniffer-annotations</artifactId> + <version>1.7</version> + </jpp> </dependency> <dependency> - <maven> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <version>1.3.RC2</version> - </maven> - <jpp> - <groupId>JPP/hamcrest13</groupId> - <artifactId>library</artifactId> - <version>1.3</version> - </jpp> + <maven> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-ant-tasks</artifactId> + <version>1.7</version> + </maven> + <jpp> + <groupId>JPP/mojo-animal-sniffer</groupId> + <artifactId>animal-sniffer-ant-tasks</artifactId> + <version>1.7</version> + </jpp> </dependency> <dependency> <maven> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-enforcer-rule</artifactId> + <version>1.7</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>junit4-dep</artifactId> - <version>4.8.2</version> + <groupId>JPP/mojo-animal-sniffer</groupId> + <artifactId>animal-sniffer-enforcer-rule</artifactId> + <version>1.7</version> </jpp> </dependency> <dependency> <maven> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.5</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.7</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>mockito-core</artifactId> - <version>1.8.5</version> + <groupId>JPP/mojo-animal-sniffer</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.7</version> </jpp> </dependency> <dependency> <maven> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java15-sun</artifactId> - <version>1.1</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-parent</artifactId> + <version>1.7</version> </maven> <jpp> - <groupId>JPP/mojo-signatures</groupId> - <artifactId>java15</artifactId> - <version>1.1</version> + <groupId>JPP/mojo-animal-sniffer</groupId> + <artifactId>animal-sniffer-parent</artifactId> + <version>1.7</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.codehaus.mojo</groupId> + <artifactId>java-boot-classpath-detector</artifactId> + <version>1.7</version> + </maven> + <jpp> + <groupId>JPP/mojo-animal-sniffer</groupId> + <artifactId>java-boot-classpath-detector</artifactId> + <version>1.7</version> </jpp> </dependency> +<!-- +--> +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-aether-provider</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-artifact</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-compat</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-core</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-embedder</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-embedder</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-model</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model-builder</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-model-builder</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-repository-metadata</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-repository-metadata</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-settings</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings-builder</artifactId> + <version>3.0.3</version> + </maven> + <jpp> + <groupId>JPP/maven3</groupId> + <artifactId>maven-settings-builder</artifactId> + <version>3.0.3</version> + </jpp> +</dependency> + + </dependencies> Index: guava-libraries-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/guava-libraries/guava-libraries-pom.patch,v retrieving revision 1.1 diff -u -r1.1 guava-libraries-pom.patch --- guava-libraries-pom.patch 5 Jun 2012 19:40:37 -0000 1.1 +++ guava-libraries-pom.patch 9 Aug 2014 19:48:42 -0000 @@ -1,11 +1,18 @@ ---- pom.xml.sav 2012-02-26 13:45:50.199900212 +0100 -+++ pom.xml 2012-02-26 13:46:17.218900833 +0100 -@@ -28,7 +28,7 @@ - </license> - </licenses> - <prerequisites> -- <maven>2.0.9</maven> -+ <maven>2.0.8</maven> - </prerequisites> - <scm> - <connection>scm:git:https://code.google.com/p/guava-libraries/</connection> +--- pom.xml.sav 2014-08-07 10:03:26.006350999 +0200 ++++ pom.xml 2014-08-07 10:03:45.058421614 +0200 +@@ -57,6 +57,7 @@ + </modules> + <build> + <plugins> ++ <!-- + <plugin> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.4</version> +@@ -68,6 +69,7 @@ + </execution> + </executions> + </plugin> ++ --> + </plugins> + </build> + <distributionManagement> Index: guava-libraries.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/guava-libraries/guava-libraries.spec,v retrieving revision 1.1 diff -u -r1.1 guava-libraries.spec --- guava-libraries.spec 5 Jun 2012 19:40:37 -0000 1.1 +++ guava-libraries.spec 9 Aug 2014 19:48:42 -0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2012, JPackage Project +# Copyright (c) 2000-2014, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -32,49 +32,41 @@ %global _mavenpomdir %{_datadir}/maven2/poms/ Name: guava-libraries -Version: 10.0.1 +Version: 12.0.1 Release: 1%{?dist} Summary: Google Core Libraries for Java -Packager: Ralph Apel <[email protected]> -Distribution: JPackage -Vendor: JPackage Project - Group: Development/Libraries License: ASL 2.0 URL: http://code.google.com/p/guava-libraries -Source0: guava-libraries-10.0.1.tar.gz +Source0: guava-libraries-12.0.1.tar.bz2 # git clone https://code.google.com/p/guava-libraries/ -# cd guava-libraries/ -# git tag -l -# git archive v10.0.1 > ../../SOURCES/guava-libraries-10.0.1.tar -# gzip ../../SOURCES/guava-libraries-10.0.1.tar -Source1: guava-libraries-settings.xml -Source2: guava-libraries-jpp-depmap.xml +# git archive --prefix="guava-libraries-12.0.1/" --format=tar v12.0.1 | bzip2 > ../../SOURCES/guava-libraries-12.0.1.tar.bz2 +Source1: guava-libraries-jpp-depmap.xml Patch0: guava-libraries-pom.patch Patch1: guava-libraries-guava-pom.patch +Patch2: guava-libraries-Maps.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: jpackage-utils >= 0:1.7.5 -BuildRequires: java-devel >= 0:1.6.0 -BuildRequires: ant >= 0:1.7.1 -BuildRequires: maven2 >= 0:2.0.8 -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-dependency -BuildRequires: maven2-plugin-enforcer -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-javadoc -BuildRequires: maven-surefire-plugin +BuildRequires: java-1.6.0-sun-devel +BuildRequires: maven2 +BuildRequires: maven3 +BuildRequires: maven-antrun-plugin +BuildRequires: maven-bundle-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-dependency-plugin +BuildRequires: maven-jar-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-source-plugin BuildRequires: maven-surefire-provider-junit3 BuildRequires: maven-surefire-provider-junit4 -BuildRequires: apache-commons-parent BuildRequires: findbugs BuildRequires: hamcrest13 -BuildRequires: junit -BuildRequires: oss-parent +BuildRequires: gwt +BuildRequires: truth-old Requires(post): jpackage-utils >= 0:1.7.5 Requires(postun): jpackage-utils >= 0:1.7.5 @@ -102,40 +94,35 @@ %prep -%setup -q -c +%setup -q -cp %{SOURCE1} settings.xml %patch0 -b .sav0 %patch1 -b .sav1 +%patch2 -b .sav2 %build -sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml -sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml -sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository - -mkdir external_repo -ln -s %{_javadir} external_repo/JPP - -export SETTINGS=$(pwd)/settings.xml - -mvn-jpp \ +pushd guava +mkdir -p target/classes +mkdir -p target/generated-sources/annotations +for j in $(find src -name "*.java"); do + javac -d /builddir/build/BUILD/guava-libraries-12.0.1/guava/target/classes -classpath /builddir/build/BUILD/guava-libraries-12.0.1/guava/target/classes:/usr/share/maven/repository/JPP/findbugs/jsr305.jar: -sourcepath /builddir/build/BUILD/guava-libraries-12.0.1/guava/src: -s /builddir/build/BUILD/guava-libraries-12.0.1/guava/target/generated-sources/annotations -g -nowarn -target 1.6 -source 1.6 -encoding UTF-8 $j +done +popd +mvn-rpmbuild \ -e \ - -s $SETTINGS \ - -Dmaven2.jpp.depmap.file=%{SOURCE2} \ + -Dmaven.local.depmap.file=%{SOURCE1} \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -Dmaven.test.failure.ignore=true \ install javadoc:aggregate - %install rm -rf %{buildroot} # jars install -d -m 755 %{buildroot}%{_javadir}/%{name} install -m 644 guava/target/guava-%{version}.jar %{buildroot}%{_javadir}/%{name}/guava-%{version}.jar -install -m 644 guava-bootstrap/target/guava-bootstrap-%{version}.jar %{buildroot}%{_javadir}/%{name}/guava-bootstrap-%{version}.jar install -m 644 guava-gwt/target/guava-gwt-%{version}.jar %{buildroot}%{_javadir}/%{name}/guava-gwt-%{version}.jar install -m 644 guava-testlib/target/guava-testlib-%{version}.jar %{buildroot}%{_javadir}/%{name}/guava-testlib-%{version}.jar install -m 644 guava-tests/target/guava-tests-%{version}.jar %{buildroot}%{_javadir}/%{name}/guava-tests-%{version}.jar @@ -145,7 +132,6 @@ %add_to_maven_depmap com.google.guava guava-parent %{version} JPP/%{name} guava-parent %add_to_maven_depmap com.google.guava guava %{version} JPP/%{name} guava -%add_to_maven_depmap com.google.guava guava-bootstrap %{version} JPP/%{name} guava-bootstrap %add_to_maven_depmap com.google.guava guava-gwt %{version} JPP/%{name} guava-gwt %add_to_maven_depmap com.google.guava guava-testlib %{version} JPP/%{name} guava-testlib %add_to_maven_depmap com.google.guava guava-tests %{version} JPP/%{name} guava-tests @@ -154,7 +140,6 @@ install -d -m 755 %{buildroot}%{_datadir}/maven2/poms/ install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-guava-parent.pom install -m 644 guava/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-guava.pom -install -m 644 guava-bootstrap/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-guava-bootstrap.pom install -m 644 guava-gwt/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-guava-gwt.pom install -m 644 guava-testlib/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-guava-testlib.pom install -m 644 guava-tests/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-guava-tests.pom @@ -188,6 +173,9 @@ %{_javadocdir}/%{name} %changelog +* Thu Aug 07 2014 Ralph Apel <[email protected]> - 12.0.1-1 +- 12.0.1 + * Mon Jun 04 2012 Ralph Apel <[email protected]> - 10.0.1-1 - 10.0.1