[maven-archetype] Upgrade to upstream version 2.2
Michal Srb
msrb at fedoraproject.org
Wed Feb 6 09:20:16 UTC 2013
commit dab66f14f9ca9b6ec77b78a80f098c0babc17f61
Author: Michal Srb <msrb at redhat.com>
Date: Wed Feb 6 10:10:26 2013 +0100
Upgrade to upstream version 2.2
- Build with xmvn
- Remove unnecessary depmap and patch
.gitignore | 1 +
...omponent-metadata-instead-of-maven-plugin.patch | 30 ----
maven-archetype.depmap | 14 --
maven-archetype.spec | 163 ++++----------------
sources | 2 +-
5 files changed, 35 insertions(+), 175 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 12eb55b..bae0c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/maven-archetype-2.1-source-release.zip
+/maven-archetype-2.2-source-release.zip
diff --git a/maven-archetype.spec b/maven-archetype.spec
index 4b68e3a..5ab0411 100644
--- a/maven-archetype.spec
+++ b/maven-archetype.spec
@@ -1,17 +1,13 @@
Name: maven-archetype
-Version: 2.1
-Release: 7%{?dist}
+Version: 2.2
+Release: 1%{?dist}
Summary: Maven project templating toolkit
Group: Development/Libraries
License: ASL 2.0
URL: https://maven.apache.org/archetype/
-Source0: http://search.maven.org/remotecontent?filepath=org/apache/maven/archetype/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0: http://repo.maven.apache.org/maven2/org/apache/maven/archetype/%{name}/%{version}/%{name}-%{version}-source-release.zip
-# custom depmap needed to resolve ant-antlr which doesn't have pom/depmap
-Source1: %{name}.depmap
-
-Patch0: 0001-Use-component-metadata-instead-of-maven-plugin.patch
Patch1: 0002-Use-generics.patch
Patch2: 0003-Add-Maven-3-compatibility.patch
Patch3: %{name}-fix-jetty-namespace.patch
@@ -20,15 +16,13 @@ BuildArch: noarch
BuildRequires: jpackage-utils
# we added test dep skipping there
-BuildRequires: maven > 3.0.3-13
BuildRequires: maven-war-plugin
BuildRequires: maven-dependency-plugin
BuildRequires: maven-plugin-bundle
+BuildRequires: maven-script-interpreter
BuildRequires: jchardet
BuildRequires: plexus-containers-component-metadata
-
-Requires: jpackage-utils
-Requires: maven
+BuildRequires: xmvn
%description
Archetype is a Maven project templating toolkit. An archetype is
@@ -66,7 +60,6 @@ within your organization.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
%{summary}.
@@ -74,9 +67,6 @@ Requires: jpackage-utils
%package catalog
Summary: Maven Archetype Catalog model
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: %{name} = %{version}-%{release}
%description catalog
%{summary}.
@@ -84,9 +74,6 @@ Requires: %{name} = %{version}-%{release}
%package descriptor
Summary: Maven Archetype Descriptor model
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: %{name} = %{version}-%{release}
%description descriptor
%{summary}.
@@ -94,9 +81,6 @@ Requires: %{name} = %{version}-%{release}
%package registry
Summary: Maven Archetype Registry model
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: %{name} = %{version}-%{release}
%description registry
%{summary}.
@@ -104,19 +88,6 @@ Requires: %{name} = %{version}-%{release}
%package common
Summary: Maven Archetype common classes
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-catalog = %{version}-%{release}
-Requires: %{name}-descriptor = %{version}-%{release}
-Requires: %{name}-registry = %{version}-%{release}
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: jchardet
-Requires: dom4j
-Requires: jdom
-Requires: maven-project
-Requires: plexus-containers-container-default
-Requires: apache-commons-io
-Requires: plexus-velocity
%description common
%{summary}.
@@ -124,8 +95,6 @@ Requires: plexus-velocity
%package packaging
Summary: Maven Archetype packaging configuration for archetypes
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: %{name} = %{version}-%{release}
%description packaging
%{summary}.
@@ -133,20 +102,13 @@ Requires: %{name} = %{version}-%{release}
%package -n %{name}-plugin
Summary: Maven Plugin for using archetypes
Group: Development/Libraries
-Requires: jpackage-utils
-Requires: plexus-utils
-Requires: apache-commons-collections
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-catalog = %{version}-%{release}
-Requires: %{name}-descriptor = %{version}-%{release}
-Requires: %{name}-registry = %{version}-%{release}
%description -n %{name}-plugin
%{summary}.
%prep
%setup -q
-%patch0 -p1
+
%patch1 -p1
%patch2 -p1
%patch3
@@ -186,105 +148,46 @@ pushd archetype-models/archetype-descriptor
popd
+# groovy is not really needed
+%pom_remove_dep org.codehaus.groovy:groovy maven-archetype-plugin/pom.xml
+
+%pom_disable_module archetype-testing
+%pom_remove_plugin org.apache.maven.plugins:maven-antrun-plugin archetype-common/pom.xml
+
+
%build
+%mvn_package :archetype-models maven-archetype
# we don't have cargo so skip tests for now
-mvn-rpmbuild -X -Dmaven.test.skip=true \
- -Dmaven.local.depmap.file=%{SOURCE1} \
- install javadoc:aggregate
+%mvn_build -s -f
%install
-# parent pom
-install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom
-
-for module in common packaging; do
- pushd archetype-$module
- install -Dpm 644 target/archetype-$module-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/$module.jar
- install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
-
- %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f $module
- popd
-done
-
-pushd archetype-models
- install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}-models.pom
-
- %add_maven_depmap JPP-%{name}-models.pom
-
- for module in catalog descriptor registry;do
- pushd archetype-$module
- install -Dpm 644 target/archetype-$module-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/$module.jar
- install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom
-
- %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f $module
- popd
- done
-popd
+%mvn_install
-pushd %{name}-plugin
-install -Dpm 644 target/%{name}-plugin-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/plugin.jar
-install -Dpm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP.%{name}-plugin.pom
-%add_maven_depmap JPP.%{name}-plugin.pom %{name}/plugin.jar -f plugin
-popd
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+%files -f .mfiles-maven-archetype
+%doc LICENSE NOTICE
+
+%files catalog -f .mfiles-archetype-catalog
+%files descriptor -f .mfiles-archetype-descriptor
+%files registry -f .mfiles-archetype-registry
-%files
-%doc LICENSE NOTICE
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavenpomdir}/JPP-%{name}-models.pom
-%{_mavendepmapfragdir}/%{name}
-%dir %{_javadir}/%{name}
+%files common -f .mfiles-archetype-common
-%files javadoc
+%files packaging -f .mfiles-archetype-packaging
+
+%files -n %{name}-plugin -f .mfiles-maven-archetype-plugin
+
+%files javadoc -f .mfiles-javadoc
%doc LICENSE
-%{_javadocdir}/%{name}
-%exclude %{_javadocdir}/%{name}/javadoc.sh
-
-%files catalog
-%{_mavendepmapfragdir}/%{name}-catalog
-%{_mavenpomdir}/JPP.%{name}-catalog.pom
-%{_javadir}/%{name}/catalog.jar
-
-%files descriptor
-%{_mavendepmapfragdir}/%{name}-descriptor
-%{_mavenpomdir}/JPP.%{name}-descriptor.pom
-%{_javadir}/%{name}/descriptor.jar
-
-%files registry
-%{_mavendepmapfragdir}/%{name}-registry
-%{_mavenpomdir}/JPP.%{name}-registry.pom
-%{_javadir}/%{name}/registry.jar
-
-%files common
-%{_mavendepmapfragdir}/%{name}-common
-%{_mavenpomdir}/JPP.%{name}-common.pom
-%{_javadir}/%{name}/common.jar
-
-%files packaging
-%{_mavendepmapfragdir}/%{name}-packaging
-%{_mavenpomdir}/JPP.%{name}-packaging.pom
-%{_javadir}/%{name}/packaging.jar
-
-%files -n %{name}-plugin
-%{_mavendepmapfragdir}/%{name}-plugin
-%{_mavenpomdir}/JPP.%{name}-plugin.pom
-%{_javadir}/%{name}/plugin.jar
%changelog
+* Fri Feb 01 2013 Michal Srb <msrb at redhat.com> - 2.2-1
+- Update to upstream version 2.2
+- Build with xmvn
+- Remove unnecessary depmap and patch
+
* Thu Aug 09 2012 Gerard Ryan <galileo at fedoraproject.org> - 2.1-7
- Add OSGI info to descriptor.jar
diff --git a/sources b/sources
index 037314b..dce2b97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce68217be882bdb491b9c9a2b36e0a80 maven-archetype-2.1-source-release.zip
+eb527b5e49fb64664fd15708f20b2806 maven-archetype-2.2-source-release.zip
More information about the scm-commits
mailing list