[RPM (6.0)] [DIST generic] maven-archetype2-2.2-1.jpp6
Ralph Apel <[email protected]>
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : maven-archetype2 Relocations: (not relocatable) Version : 2.2 Vendor: JPackage Project Release : 1.jpp6 Build Date: Fri 17 Aug 2012 10:30:42 AM CEST Install Date: (not installed) Build Host: linux.fritz.box Group : Development/Java Source RPM: (none) Size : 318363 License: ASL 2.0 Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://maven.apache.org/ Summary : Maven Archetype 2 Description : Maven Archetypes. --------------- Ralph Apel <[email protected]> 0:2.2-1 - 2.2 --------------- maven-archetype2.src: W: source-or-patch-not-bzipped maven-archetype-2.2.tgz maven-archetype2.src: W: source-or-patch-not-bzipped maven-archetype2-pom.patch maven-archetype2.src: W: non-standard-group Development/Java maven-archetype2.src: W: no-signature maven-archetype2.src: W: invalid-license ASL 2.0 1 packages and 0 specfiles checked; 0 errors, 5 warnings. --------------- Index: maven-archetype2-jpp-depmap.xml =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/maven-archetype2/maven-archetype2-jpp-depmap.xml,v retrieving revision 1.3 diff -u -r1.3 maven-archetype2-jpp-depmap.xml --- maven-archetype2-jpp-depmap.xml 16 Sep 2011 22:27:30 -0000 1.3 +++ maven-archetype2-jpp-depmap.xml 17 Aug 2012 08:35:25 -0000 @@ -11,4 +11,31 @@ <version>1.7.0</version> </jpp> </dependency> + +<dependency> + <maven> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-common-artifact-filters</artifactId> + <version>1.4</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>maven-common-artifact-filters</artifactId> + <version>1.4</version> + </jpp> +</dependency> + + <dependency> + <maven> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5-20081211</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>servlet_2_5_api</artifactId> + <version>2.5</version> + </jpp> + </dependency> + </dependencies> Index: maven-archetype2.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/maven-archetype2/maven-archetype2.spec,v retrieving revision 1.3 diff -u -r1.3 maven-archetype2.spec --- maven-archetype2.spec 16 Sep 2011 22:27:30 -0000 1.3 +++ maven-archetype2.spec 17 Aug 2012 08:35:25 -0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2010, JPackage Project +# Copyright (c) 2000-2012, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -31,43 +31,45 @@ %bcond_without maven %define section free - %global bname archetype %global oname maven-archetype -%global namedversion 2.0-alpha-5 +%global namedversion 2.2 +%define _binary_payload w9.gzdio +%define _source_payload w9.gzdio +%define _binary_filedigest_algorithm 1 +%define _source_filedigest_algorithm 1 Name: maven-archetype2 -Version: 2.0 -Release: 0.a5.1%{?dist} +Version: 2.2 +Release: 1%{?dist} Epoch: 0 Summary: Maven Archetype 2 License: ASL 2.0 Group: Development/Java URL: http://maven.apache.org/ -# svn -r 1041154 export http://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-2.0-alpha-5/ && tar cjf maven-archetype-2.0-alpha-5.tar.bz2 maven-archetype-2.0-alpha-5 -Source0: %{oname}-%{namedversion}.tar.bz2 +# svn export http://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-2.2/ & tar czf maven-archetype-2.2.tgz maven-archetype-2.2/ +Source0: %{oname}-%{namedversion}.tgz Source1: %{name}-build.xml Source2: %{name}-jpp-depmap.xml Source4: %{name}-parent-2.pom Source5: %{name}-autogenerated-files.tar.gz -Patch0: maven-archetype-plugin-pom.patch -Patch1: maven-archetype-compile.patch -Requires(post): jpackage-utils >= 0:1.7.3 -Requires(postun): jpackage-utils >= 0:1.7.3 -Requires: java >= 0:1.5.0 -Requires: jpackage-utils +Patch0: maven-archetype2-pom.patch +Requires(post): jpackage-utils >= 0:1.7.5 +Requires(postun): jpackage-utils >= 0:1.7.5 +Requires: java >= 0:1.6.0 +Requires: jpackage-utils >= 0:1.7.5 Requires: geronimo-jta-1.0.1B-api -Requires: jakarta-commons-io +Requires: apache-commons-io Requires: jchardet Requires: maven-shared-invoker -BuildRequires: ant >= 0:1.6.5 +BuildRequires: ant >= 0:1.7.1 BuildRequires: ant-antlr -BuildRequires: java-devel >= 0:1.5.0 -BuildRequires: jpackage-utils >= 0:1.7.3 +BuildRequires: java-devel >= 0:1.6.0 +BuildRequires: jpackage-utils >= 0:1.7.5 BuildRequires: junit %if %with maven BuildRequires: maven2-common-poms -BuildRequires: maven2 >= 0:2.0.7 +BuildRequires: maven2 >= 0:2.0.8 BuildRequires: maven2-plugin-ant BuildRequires: maven2-plugin-antrun BuildRequires: maven2-plugin-compiler @@ -79,10 +81,11 @@ BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-war BuildRequires: maven2-plugin-site -BuildRequires: maven2-plugin-surefire -BuildRequires: maven-surefire-provider-junit +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit4 BuildRequires: maven-shared-invoker BuildRequires: maven-shared-plugin-testing-harness +BuildRequires: maven-script-interpreter BuildRequires: maven-wagon BuildRequires: modello-maven-plugin >= 0:1.0-0.a17 # FIXME: (dwalluck): This has the maven fragment for jetty6-maven2-plugins @@ -93,9 +96,9 @@ BuildRequires: xpp3-minimal %endif BuildRequires: cargo -BuildRequires: easymock-java5 +BuildRequires: easymock BuildRequires: modello >= 0:1.0-0.a17 -BuildRequires: jakarta-commons-io +BuildRequires: apache-commons-io BuildRequires: jchardet BuildRequires: geronimo-genesis BuildRequires: geronimo-jta-1.0.1B-api @@ -116,18 +119,14 @@ %prep %setup -q -n %{oname}-%{namedversion} cp -p %{SOURCE1} build.xml -#gzip -dc %{SOURCE4} | tar xf - %if %without maven gzip -dc %{SOURCE5} | tar xf - %endif -#%%patch0 -p0 -b .sav0 -%patch1 -p0 -b .sav1 +%patch0 -p0 -b .sav0 %build export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL -mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/ -cp -p %{SOURCE4} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.apache.maven.archetype-maven-archetype-parent.pom mkdir external_repo ln -s %{_javadir} external_repo/JPP @@ -136,11 +135,11 @@ %if %with maven %{_bindir}/mvn-jpp \ -e \ - -Dmaven.test.skip=true \ - -Dmaven.test.failure.ignore=true \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -Dmaven2.jpp.depmap.file=%{SOURCE2} \ install javadoc:aggregate +# -Dmaven.test.skip=true \ +# -Dmaven.test.failure.ignore=true \ %else export CLASSPATH=$(build-classpath \ classworlds \ @@ -196,7 +195,7 @@ commons-httpclient \ commons-io \ commons-lang \ -easymock-java5 \ +easymock \ jchardet \ jdom \ jetty6/jetty6 \ @@ -254,7 +253,7 @@ ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc CLASSPATH=$CLASSPATH:$(pwd)/target/archetype-packaging-%{namedversion}.jar popd -pushd archetype-plugin +pushd maven-archetype-plugin ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc popd %endif @@ -273,6 +272,24 @@ %add_to_maven_depmap org.apache.maven.archetype archetype-common %{namedversion} JPP/%{name} common install -p -m 644 archetype-common/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-common.pom +%add_to_maven_depmap org.apache.maven.archetype archetype-models %{namedversion} JPP/%{name} models +install -p -m 644 archetype-models/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-models.pom + +install -p -m 644 archetype-models/archetype-catalog/target/archetype-catalog-%{namedversion}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/catalog-%{version}.jar +%add_to_maven_depmap org.apache.maven.archetype archetype-catalog %{namedversion} JPP/%{name} catalog +install -p -m 644 archetype-models/archetype-catalog/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-catalog.pom + +install -p -m 644 archetype-models/archetype-descriptor/target/archetype-descriptor-%{namedversion}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/descriptor-%{version}.jar +%add_to_maven_depmap org.apache.maven.archetype archetype-descriptor %{namedversion} JPP/%{name} descriptor +install -p -m 644 archetype-models/archetype-descriptor/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-descriptor.pom + +install -p -m 644 archetype-models/archetype-registry/target/archetype-registry-%{namedversion}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/registry-%{version}.jar +%add_to_maven_depmap org.apache.maven.archetype archetype-registry %{namedversion} JPP/%{name} registry +install -p -m 644 archetype-models/archetype-registry/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-registry.pom + install -p -m 644 archetype-packaging/target/archetype-packaging-%{namedversion}.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}/packaging-%{version}.jar %add_to_maven_depmap org.apache.maven.archetype archetype-packaging %{namedversion} JPP/%{name} packaging @@ -291,13 +308,12 @@ %add_to_maven_depmap org.apache.maven.archetype archetype-repository %{namedversion} JPP/%{name} repository install -p -m 644 archetype-testing/archetype-repository/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-repository.pom -install -p -m 644 archetype-plugin/target/%{oname}-plugin-%{namedversion}.jar \ +install -p -m 644 maven-archetype-plugin/target/%{oname}-plugin-%{namedversion}.jar \ $RPM_BUILD_ROOT%{_javadir}/%{name}/archetype2-plugin-%{version}.jar %add_to_maven_depmap org.apache.maven.plugins %{oname}-plugin %{namedversion} JPP/%{name} archetype2-plugin -install -p -m 644 archetype-plugin/pom.xml \ +install -p -m 644 maven-archetype-plugin/pom.xml \ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-archetype2-plugin.pom -#(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for war in *-%{version}*.war; do ln -s ${war} $(echo $war | sed -e 's/-%{version}//' -e 's/\.war/.jar/'); done) (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc @@ -312,7 +328,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/common cp -pr archetype-common/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/common install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/plugin -cp -pr archetype-plugin/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/plugin +cp -pr maven-archetype-plugin/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/plugin %endif ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} @@ -328,23 +344,9 @@ %files %defattr(0644,root,root,0755) %dir %{_javadir}*/%{name} -%{_javadir}*/%{name}/archetype2-plugin-%{version}.jar -%{_javadir}*/%{name}/archetype2-plugin.jar -%{_javadir}*/%{name}/common-%{version}.jar -%{_javadir}*/%{name}/common.jar -%{_javadir}*/%{name}/packaging-%{version}.jar -%{_javadir}*/%{name}/packaging.jar -%{_javadir}*/%{name}/proxy-%{version}.war -%{_javadir}*/%{name}/proxy.war -%{_javadir}*/%{name}/repository-%{version}.war -%{_javadir}*/%{name}/repository.war -%{_datadir}/maven2/poms/JPP.%{name}-archetype.pom -%{_datadir}/maven2/poms/JPP.%{name}-archetype2-plugin.pom -%{_datadir}/maven2/poms/JPP.%{name}-common.pom -%{_datadir}/maven2/poms/JPP.%{name}-packaging.pom -%{_datadir}/maven2/poms/JPP.%{name}-proxy.pom -%{_datadir}/maven2/poms/JPP.%{name}-repository.pom -%{_datadir}/maven2/poms/JPP.%{name}-testing.pom +%{_javadir}*/%{name}/*.jar +%{_javadir}*/%{name}/*.war +%{_datadir}/maven2/poms/* %{_mavendepmapfragdir}/%{name} %files javadoc @@ -353,6 +355,9 @@ %{_javadocdir}/%{name} %changelog +* Fri Aug 17 2012 Ralph Apel <[email protected]> 0:2.2-1 +- 2.2 + * Fri Sep 16 2011 David Walluck <[email protected]> 0:2.0-0.a5.1 - fixes for JPP-6