[RPM (6.0)] [DIST generic] ws-commons-axiom-1.2.12-1.jpp6
Ralph Apel <[email protected]> Fri, 11 Jan 2013 17:34:32 +0100
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : ws-commons-axiom Relocations: (not relocatable) Version : 1.2.12 Vendor: JPackage Project Release : 1.jpp6 Build Date: Fri 11 Jan 2013 05:27:03 PM CET Install Date: (not installed) Build Host: linux.fritz.box Group : Text Processing/Markup/XML Source RPM: (none) Size : 1631842 License: ASL 2.0 Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://ws.apache.org/commons/axiom/ Summary : AXIOM XML infoset model for Apache Axis2 Description : AXIOM stands for AXis Object Model (also known as OM - Object Model) and refers to the XML infoset model that is initialy developed for Apache Axis2. --------------- Ralph Apel <[email protected]> 0:1.2.12-1 - 1.2.12 --------------- ws-commons-axiom.src: W: source-or-patch-not-bzipped ws-commons-axiom-osgi-pom.patch ws-commons-axiom.src: W: source-or-patch-not-bzipped ws-commons-axiom-testsuite-pom.patch ws-commons-axiom.src: W: source-or-patch-not-bzipped ws-commons-axiom-pom.patch ws-commons-axiom.src: W: source-or-patch-not-bzipped ws-commons-axiom-jaxen-testsuite-pom.patch ws-commons-axiom.src: W: source-or-patch-not-bzipped ws-commons-axiom-parent-pom.patch ws-commons-axiom.src: W: no-signature ws-commons-axiom.src: W: invalid-license ASL 2.0 1 packages and 0 specfiles checked; 0 errors, 7 warnings. --------------- Index: ws-commons-axiom-jpp-depmap.xml =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/ws-commons-axiom/ws-commons-axiom-jpp-depmap.xml,v retrieving revision 1.3 diff -u -r1.3 ws-commons-axiom-jpp-depmap.xml --- ws-commons-axiom-jpp-depmap.xml 3 Aug 2009 21:12:00 -0000 1.3 +++ ws-commons-axiom-jpp-depmap.xml 11 Jan 2013 16:34:31 -0000 @@ -1,35 +1,64 @@ <dependencies> + +<dependency> + <maven> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.6.4</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>velocity14</artifactId> + <version>1.4</version> + </jpp> +</dependency> + +<dependency> + <maven> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + <version>1.6.4</version> + </maven> + <jpp> + <groupId>JPP/apache-felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + <version>1.6.4</version> + </jpp> +</dependency> + <dependency> <maven> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> + <groupId>org.apache.commons</groupId> + <artifactId>com.springsource.org.apache.commons.logging</artifactId> + <version>1.1.1</version> </maven> <jpp> <groupId>JPP</groupId> <artifactId>commons-logging</artifactId> - <version>1.0.4</version> + <version>1.1.1</version> </jpp> </dependency> - <dependency> - <maven> - <groupId>woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>3.2.0</version> - </maven> - <jpp> - <groupId>JPP/wstx</groupId> - <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> - </jpp> - </dependency> +<dependency> + <maven> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3</version> + </jpp> +</dependency> +<!-- +--> <dependency> <maven> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-stax-api_1.0_spec</artifactId> - <version>1.0.1</version> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + <version>1.0-2</version> </maven> <jpp> <groupId>JPP</groupId> @@ -37,69 +66,55 @@ <version>1.2.0</version> </jpp> </dependency> - <dependency> <maven> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.1_spec</artifactId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> <version>1.0.1</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>geronimo-jaf-1.1-api</artifactId> - <version>1.2.0</version> - </jpp> - </dependency> - - <dependency> - <maven> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-javamail_1.4_spec</artifactId> - <version>1.2</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>geronimo-javamail-1.4-api</artifactId> + <artifactId>geronimo-stax-1.0-api</artifactId> <version>1.2.0</version> </jpp> </dependency> <dependency> <maven> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1-beta-9</version> + <groupId>com.thoughtworks.qdox</groupId> + <artifactId>qdox18</artifactId> + <version>1.8</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>jaxen</artifactId> - <version>1.1</version> + <artifactId>qdox18</artifactId> + <version>1.8</version> </jpp> </dependency> <dependency> <maven> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <version>1.0</version> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>stax2-api</artifactId> + <version>3.0.2</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>xmlunit</artifactId> - <version>1.0</version> + <groupId>JPP/wstx</groupId> + <artifactId>stax2</artifactId> + <version>3.2.8</version> </jpp> </dependency> <dependency> <maven> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.3.03</version> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>woodstox-core-asl</artifactId> + <version>4.0.8</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>xml-commons-jaxp-1.3-apis</artifactId> - <version>1.3.04</version> + <groupId>JPP/wstx</groupId> + <artifactId>wstx-asl</artifactId> + <version>3.2.8</version> </jpp> </dependency> @@ -118,67 +133,40 @@ <dependency> <maven> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.7.1</version> + <groupId>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> + <version>1.3.04</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>xerces-j2</artifactId> - <version>2.7.1</version> + <artifactId>xml-commons-jaxp-1.3-apis</artifactId> + <version>1.3.04</version> </jpp> </dependency> -<!-- <dependency> <maven> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4</version> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>sun-mail-monolithic</artifactId> - <version>1.4</version> + <artifactId>jsp_2_0_api</artifactId> + <version>2.0</version> </jpp> </dependency> <dependency> <maven> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>sun-jaf</artifactId> - <version>1.1</version> - </jpp> - </dependency> ---> - <dependency> - <maven> - <groupId>jdepend</groupId> - <artifactId>jdepend</artifactId> - <version>2.9.1</version> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>jdepend</artifactId> - <version>2.9.1</version> - </jpp> - </dependency> - - <dependency> - <maven> - <groupId>org.apache.maven</groupId> - <artifactId>maven-default-skin</artifactId> - <version>1.0</version> - </maven> - <jpp> - <groupId>JPP/maven2</groupId> - <artifactId>default-skin</artifactId> - <version>1.0</version> + <artifactId>jsp_2_0_api</artifactId> + <version>2.0</version> </jpp> </dependency> Index: ws-commons-axiom.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/ws-commons-axiom/ws-commons-axiom.spec,v retrieving revision 1.5 diff -u -r1.5 ws-commons-axiom.spec --- ws-commons-axiom.spec 4 Aug 2009 20:38:22 -0000 1.5 +++ ws-commons-axiom.spec 11 Jan 2013 16:34:31 -0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2008, JPackage Project +# Copyright (c) 2000-2013, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,26 +33,19 @@ %define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -%bcond_with gcj_support %bcond_without maven -%if %with gcj_support -%define gcj_support 1 -%else -%define gcj_support 0 -%endif - %define section free Name: ws-commons-axiom -Version: 1.2.8 -Release: 2%{?dist} +Version: 1.2.12 +Release: 1%{?dist} Epoch: 0 Summary: AXIOM XML infoset model for Apache Axis2 License: ASL 2.0 Url: http://ws.apache.org/commons/axiom/ Group: Text Processing/Markup/XML -# svn -q export http://svn.apache.org/repos/asf/webservices/commons/tags/axiom/1.2.8/ ws-commons-axiom-1.2.8 && tar cjf ws-commons-axiom-1.2.8.tar.bz2 ws-commons-axiom-1.2.8 +# svn -q export http://svn.apache.org/repos/asf/webservices/commons/tags/axiom/1.2.12/ ws-commons-axiom-1.2.12 && tar cjf ws-commons-axiom-1.2.12.tar.bz2 ws-commons-axiom-1.2.12 Source0: ws-commons-axiom-%{version}.tar.bz2 Source1: %{name}-settings.xml Source2: %{name}-jpp-depmap.xml @@ -60,16 +53,22 @@ Source4: %{name}-modules-axiom-api-build.xml Source5: %{name}-modules-axiom-dom-build.xml Source6: %{name}-modules-axiom-impl-build.xml -BuildRequires: jpackage-utils >= 0:1.7.2 -BuildRequires: ant >= 0:1.6 +Patch0: %{name}-pom.patch +Patch1: %{name}-jaxen-testsuite-pom.patch +Patch2: %{name}-parent-pom.patch +Patch3: %{name}-testsuite-pom.patch +Patch4: %{name}-osgi-pom.patch +BuildRequires: jpackage-utils >= 0:1.7.5 +BuildRequires: ant >= 0:1.7.1 BuildRequires: junit >= 0:3.8.2 %if %with maven BuildRequires: bcel BuildRequires: maven-surefire-provider-junit -BuildRequires: maven2 >= 2.0.4-10jpp +BuildRequires: maven2 >= 2.0.8 BuildRequires: maven2-plugin-antrun BuildRequires: maven2-plugin-assembly BuildRequires: maven2-plugin-compiler +BuildRequires: maven2-plugin-dependency BuildRequires: maven2-plugin-install BuildRequires: maven2-plugin-javadoc BuildRequires: maven2-plugin-jar @@ -79,17 +78,20 @@ BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-site BuildRequires: maven2-plugin-source -BuildRequires: maven2-plugin-surefire -BuildRequires: maven2-default-skin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit4 +BuildRequires: maven-skins +BuildRequires: apache-felix-maven-scr-plugin +BuildRequires: apache-felix-ipojo-junit4osgi BuildRequires: mojo-maven2-plugin-jdepend BuildRequires: mojo-maven2-plugin-xmlbeans BuildRequires: ws-commons-axiom %endif -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -%endif BuildRequires: crimson -BuildRequires: geronimo-specs-poms +BuildRequires: gmaven +BuildRequires: gmaven-runtime-1.6 +BuildRequires: geronimo-genesis +BuildRequires: geronimo-genesis2 BuildRequires: geronimo-stax-1.0-api BuildRequires: geronimo-javamail-1.4-api BuildRequires: geronimo-jaf-1.1-api @@ -99,15 +101,16 @@ BuildRequires: jdepend BuildRequires: saxon8 BuildRequires: saxon8-dom +BuildRequires: sun-sjsxp BuildRequires: wstx >= 0:3.1.1 -BuildRequires: xerces-j2 -BuildRequires: xml-commons-jaxp-1.3-apis +#BuildRequires: xerces-j2 +#BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: xml-commons-resolver12 BuildRequires: xmlunit -Requires(post): jpackage-utils >= 0:1.7.2 -Requires(postun): jpackage-utils >= 0:1.7.2 +Requires(post): jpackage-utils >= 0:1.7.5 +Requires(postun): jpackage-utils >= 0:1.7.5 Requires: stax_1_0_api -Requires: xml-commons-jaxp-1.3-apis +#Requires: xml-commons-jaxp-1.3-apis Requires: javamail = 0:1.4 Requires: jaf = 0:1.1 Requires: jakarta-commons-logging @@ -116,12 +119,10 @@ Requires: saxon8 Requires: saxon8-dom Requires: wstx >= 0:3.1.1 -Requires: xerces-j2 +#Requires: xerces-j2 Obsoletes: apache-axiom < %{epoch}:%{version}-%{release} Provides: apache-axiom = %{epoch}:%{version}-%{release} -%if ! %{gcj_support} BuildArch: noarch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -151,23 +152,15 @@ %prep %setup -q cp -p %{SOURCE1} settings.xml +%patch0 -b .sav0 +%patch1 -b .sav1 +%patch2 -b .sav2 +%patch3 -b .sav3 +%patch4 -b .sav4 # fix eol %{__perl} -pi -e 's/\r$//g' LICENSE.txt NOTICE.txt README.txt RELEASE-NOTE.txt -rm -f src/site/xdoc/download.* -cp -p %{SOURCE3} build.xml -cp -p %{SOURCE4} modules/axiom-api/build.xml -cp -p %{SOURCE5} modules/axiom-dom/build.xml -cp -p %{SOURCE6} modules/axiom-impl/build.xml - -mkdir modules/axiom-api/src/site -cp -p src/site/site.xml modules/axiom-api/src/site -mkdir modules/axiom-dom/src/site -cp -p src/site/site.xml modules/axiom-dom/src/site -mkdir modules/axiom-impl/src/site -cp -p src/site/site.xml modules/axiom-impl/src/site - mkdir external_repo ln -s %{_javadir} external_repo/JPP @@ -178,13 +171,24 @@ sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml + %build export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL +mkdir -p $MAVEN_REPO_LOCAL/org/apache/ws/commons/axiom/axiom-api-tests/1.2.12/ +ln -sf $(pwd)/modules/axiom-api/target/axiom-api-1.2.12-tests.jar \ + $MAVEN_REPO_LOCAL/org/apache/ws/commons/axiom/axiom-api-tests/1.2.12/axiom-api-tests-1.2.12.jar + export MAVEN_SETTINGS=$(pwd)/settings.xml -%{_bindir}/mvn-jpp -e -s ${MAVEN_SETTINGS} -Dmaven2.jpp.depmap.file=%{SOURCE2} -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dmaven.test.skip=true install javadoc:javadoc site +%{_bindir}/mvn-jpp -e \ + -s ${MAVEN_SETTINGS} \ + -Dmaven2.jpp.depmap.file=%{SOURCE2} \ + -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \ + -Dmaven.test.failure.ignore=true \ + install javadoc:aggregate site +# -Dmaven.test.skip=true \ %if 0 pushd modules/axiom-tests %{_bindir}/mvn-jpp -e -s ${MAVEN_SETTINGS} -Dmaven2.jpp.depmap.file=%{SOURCE2} -Dmaven.repo.local=$MAVEN_REPO_LOCAL install @@ -294,34 +298,18 @@ popd %endif -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - %clean rm -rf $RPM_BUILD_ROOT %post %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %postun %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %files %defattr(0644,root,root,0755) -%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTE.txt +%doc NOTICE README.txt RELEASE-NOTE.txt %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %{_javadir}/%{name}-api-%{version}.jar @@ -344,15 +332,11 @@ %{_datadir}/maven2/poms/JPP.%{name}-integration.pom %{_datadir}/maven2/poms/JPP.%{name}-tests.pom %{_mavendepmapfragdir}/%{name} -%if %{gcj_support} -%dir %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* -%endif %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} %if %with maven %files manual @@ -361,6 +345,9 @@ %endif %changelog +* Fri Jan 11 2013 Ralph Apel <[email protected]> 0:1.2.12-1 +- 1.2.12 + * Tue Aug 04 2009 David Walluck <[email protected]> 0:1.2.8-2 - remove Requires: crimson as it is only for tests