[maven-compiler-plugin] Add few missing (Build)requires
by Stanislav Ochotnicky
commit 404b6028f0058791473b40a97be116531c591fba
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Jun 23 11:57:02 2011 +0200
Add few missing (Build)requires
- Remove post(un) scriptlets with update_maven_depmap
- Use new add_maven_depmap macro
maven-compiler-plugin.spec | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index 171c58d..3eb0ae1 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-compiler-plugin
Version: 2.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Compiler Plugin
Group: Development/Libraries
@@ -24,12 +24,16 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-testing-harness
+BuildRequires: maven-toolchain
+BuildRequires: plexus-utils
+BuildRequires: plexus-compiler
Requires: maven
+Requires: maven-toolchain
+Requires: plexus-utils
+Requires: plexus-compiler
Requires: jpackage-utils
Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Provides: maven2-plugin-compiler = %{version}-%{release}
Obsoletes: maven2-plugin-compiler <= 0:2.0.8
@@ -60,13 +64,14 @@ mvn-rpmbuild -e \
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins maven-compiler-plugin %{version} JPP maven-compiler-plugin
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
@@ -76,12 +81,6 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/*
%{_mavenpomdir}/*
@@ -91,6 +90,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.3.2-4
+- Add few missing (Build)requires
+- Remove post(un) scriptlets with update_maven_depmap
+- Use new add_maven_depmap macro
+
* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.3.2-3
- Do not require maven2.
- Guidelines fixes.
12 years, 9 months
[maven2] Add maven-toolchain subpackage
by Stanislav Ochotnicky
commit 1816b5f2c86fb67b62a91ba921d12d4546c21301
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Jun 27 12:45:12 2011 +0200
Add maven-toolchain subpackage
maven2.spec | 104 ++++++++++++++++++++++------------------------------------
1 files changed, 40 insertions(+), 64 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 8b1e059..d27c6f2 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -227,6 +227,10 @@ Requires: slf4j
Requires: velocity
Requires: maven-project = %{version}-%{release}
Requires: maven-artifact-manager = %{version}-%{release}
+Requires: maven-profile = %{version}-%{release}
+Requires: maven-monitor = %{version}-%{release}
+Requires: maven-plugin-registry = %{version}-%{release}
+Requires: maven-toolchain = %{version}-%{release}
%endif
BuildArch: noarch
@@ -302,6 +306,14 @@ Requires: plexus-containers-container-default
%description -n maven-plugin-registry
Maven plugin registry artifact
+%package -n maven-toolchain
+Group: Development/Libraries
+Summary: Compatibility Maven toolchain artifact
+Requires: jpackage-utils
+
+%description -n maven-toolchain
+Maven toolchain artifact
+
%prep
%setup -q -n apache-maven-2.2.1
@@ -492,75 +504,26 @@ install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
# Individual jars #
###################
-# artifact-manager and project go into separate fragments
-subdir="maven-artifact-manager"
-pushd $subdir
-install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
- $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-project"
-pushd $subdir
-install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
- $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-plugin-registry"
-pushd $subdir
-install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
- $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-monitor"
-pushd $subdir
-install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
- $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-model"
-pushd $subdir
-install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-%add_to_maven_depmap org.apache.maven maven-model-v3 %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
- $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
-
-subdir="maven-profile"
-pushd $subdir
-install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
-%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
-popd
-
-mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
- $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+# parts of maven2 now go into separate subpackages
+for subdir in maven-artifact-manager maven-project \
+ maven-plugin-registry maven-monitor maven-model \
+ maven-profile maven-toolchain;do
+ pushd $subdir
+ install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
+ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
+ %add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
+ mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
+ $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+ popd
+done
+
+
for file in \
maven-script/maven-script-ant/target/maven-script-ant-%{version}.jar \
maven-script/maven-script-beanshell/target/maven-script-beanshell-%{version}.jar \
apache-maven/target/apache-maven-%{version}.jar \
maven-artifact-test/target/maven-artifact-test-%{version}.jar \
- maven-toolchain/target/maven-toolchain-%{version}.jar \
- maven-toolchain/target/original-maven-toolchain-%{version}.jar \
maven-settings/target/maven-settings-%{version}.jar \
maven-plugin-parameter-documenter/target/maven-plugin-parameter-documenter-%{version}.jar \
maven-artifact/target/maven-artifact-%{version}.jar \
@@ -630,6 +593,11 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%{_datadir}/%{name}/poms
%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom
%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-registry.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-monitor.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-model.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom
%{_datadir}/%{name}/repository
%{_mavendepmapfragdir}
%{_javadir}/%{name}
@@ -669,8 +637,16 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%{_javadir}/%{name}/maven-profile.jar
%{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
+%files -n maven-toolchain
+%{_mavendepmapfragdir}/maven-toolchain
+%{_javadir}/%{name}/maven-toolchain.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-toolchain.pom
+
%changelog
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-25
+- Add maven-toolchain subpackage
+
* Fri Jun 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-24
- Add few new subpackages
- Add several missing requires to new subpackages
12 years, 9 months
[maven-site-plugin] Add several missing things to (Build)Requires
by Stanislav Ochotnicky
commit 3606620535125fc487f83a6af1c48135ed0a46d4
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Jun 23 12:14:22 2011 +0200
Add several missing things to (Build)Requires
- Fix build for maven3-only buildroot
0001-Pom-dependencies-fix.patch | 54 ++++++++++++++++++++++++++++
0002-Maven-3-compatibility-functions.patch | 32 ++++++++++++++++
add-servlet-dep.patch | 19 ----------
maven-site-plugin.spec | 42 +++++++++++++++------
4 files changed, 116 insertions(+), 31 deletions(-)
---
diff --git a/0001-Pom-dependencies-fix.patch b/0001-Pom-dependencies-fix.patch
new file mode 100644
index 0000000..3e2cb7e
--- /dev/null
+++ b/0001-Pom-dependencies-fix.patch
@@ -0,0 +1,54 @@
+From 62554696dc9ba729a8990f29c344512eec5f88e0 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 27 Jun 2011 10:34:48 +0200
+Subject: [PATCH 1/2] Pom dependencies fix
+
+---
+ pom.xml | 17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 3fbbb71..c29d2d0 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -179,7 +179,7 @@ under the License.
+ <properties>
+ <doxiaVersion>1.2</doxiaVersion>
+ <doxiaSitetoolsVersion>1.2</doxiaSitetoolsVersion>
+- <mavenVersion>2.2.0</mavenVersion>
++ <mavenVersion>3.0.3</mavenVersion>
+ <wagonVersion>1.0-beta-6</wagonVersion>
+ </properties>
+
+@@ -203,6 +203,11 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+@@ -345,6 +350,16 @@ under the License.
+ <artifactId>jetty</artifactId>
+ <version>6.1.5</version>
+ </dependency>
++ <dependency>
++ <groupId>javax.servlet</groupId>
++ <artifactId>servlet-api</artifactId>
++ <version>2.5</version>
++ </dependency>
++ <dependency>
++ <groupId>org.mortbay.jetty</groupId>
++ <artifactId>jetty-util</artifactId>
++ <version>6.1.24</version>
++ </dependency>
+
+ <!-- test -->
+ <dependency>
+--
+1.7.5.4
+
diff --git a/0002-Maven-3-compatibility-functions.patch b/0002-Maven-3-compatibility-functions.patch
new file mode 100644
index 0000000..bdc8635
--- /dev/null
+++ b/0002-Maven-3-compatibility-functions.patch
@@ -0,0 +1,32 @@
+From 9fc579f0a193d952d9efd4896a83ad7765d89f94 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 27 Jun 2011 10:36:03 +0200
+Subject: [PATCH 2/2] Maven 3 compatibility functions
+
+---
+ .../site/SiteDescriptorArtifactMetadata.java | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java b/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java
+index 2ad6437..8e570d1 100644
+--- a/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java
++++ b/src/main/java/org/apache/maven/plugins/site/SiteDescriptorArtifactMetadata.java
+@@ -114,6 +114,15 @@ public class SiteDescriptorArtifactMetadata
+ return "site descriptor " + artifact.getGroupId() + ":" + artifact.getArtifactId() + " " + file.getName();
+ }
+
++ public void merge( org.apache.maven.repository.legacy.metadata.ArtifactMetadata metadata )
++ {
++ SiteDescriptorArtifactMetadata m = (SiteDescriptorArtifactMetadata) metadata;
++ if ( !m.file.equals( file ) )
++ {
++ throw new IllegalStateException( "Cannot add two different pieces of metadata for: " + getKey() );
++ }
++ }
++
+ public void merge( ArtifactMetadata metadata )
+ {
+ SiteDescriptorArtifactMetadata m = (SiteDescriptorArtifactMetadata) metadata;
+--
+1.7.5.4
+
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index c6a48c9..c934763 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -1,18 +1,20 @@
Name: maven-site-plugin
Version: 2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Site Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-site-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Patch0: add-servlet-dep.patch
+Patch0: 0001-Pom-dependencies-fix.patch
+Patch1: 0002-Maven-3-compatibility-functions.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven
+BuildRequires: maven-artifact-manager
BuildRequires: maven-plugin-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: plexus-maven-plugin
@@ -24,16 +26,35 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-doxia-tools
+BuildRequires: maven-project
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-plugin-cobertura
+BuildRequires: maven-wagon
BuildRequires: jetty
+BuildRequires: servlet25
+BuildRequires: plexus-archiver
+BuildRequires: plexus-containers-container-default
+BuildRequires: plexus-i18n
+BuildRequires: plexus-velocity
+BuildRequires: plexus-utils
+
Requires: maven
Requires: jetty
Requires: java
Requires: jpackage-utils
+Requires: maven-artifact-manager
Requires: maven-doxia-tools
+Requires: maven-project
+Requires: maven-shared-reporting-api
+Requires: maven-wagon
+Requires: servlet25
+Requires: plexus-archiver
+Requires: plexus-containers-container-default
+Requires: plexus-i18n
+Requires: plexus-velocity
+Requires: plexus-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -52,8 +73,9 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
-%setup -q
-%patch0
+%setup -q
+%patch0 -p1
+%patch1 -p1
%build
mvn-rpmbuild \
@@ -76,23 +98,19 @@ install -pm 644 pom.xml \
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.3-2
+- Add several missing things to (Build)Requires
+- Fix build for maven3-only buildroot
+
* Wed May 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.3-1
- Update to new upstream version.
12 years, 9 months
[plexus-build-api] Add spice-parent to Requires
by Stanislav Ochotnicky
commit 43aa052b6177e562c587eb71d15a3d0b88eb3c2b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Jun 23 17:25:23 2011 +0200
Add spice-parent to Requires
plexus-build-api.spec | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/plexus-build-api.spec b/plexus-build-api.spec
index 6113151..355e0c0 100644
--- a/plexus-build-api.spec
+++ b/plexus-build-api.spec
@@ -1,10 +1,10 @@
Name: plexus-build-api
Version: 0.0.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Plexus Build API
Group: Development/Libraries
-License: ASL 2.0
+License: ASL 2.0
URL: http://svn.sonatype.org/spice/tags/plexus-build-api-0.0.6
#svn export http://svn.sonatype.org/spice/tags/plexus-build-api-0.0.6
#tar zcf plexus-build-api-0.0.6.tar.gz plexus-build-api-0.0.6/
@@ -36,6 +36,7 @@ BuildRequires: maven-surefire-provider-junit4
Requires: plexus-container-default
Requires: plexus-utils
Requires: jpackage-utils
+Requires: spice-parent
Requires: java
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -52,7 +53,7 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
-%setup -q
+%setup -q
%build
mvn-rpmbuild install javadoc:javadoc
@@ -80,16 +81,17 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%{_javadir}/plexus/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/plexus/%{name}
%changelog
+* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.0.6-7
+- Add spice-parent to Requires
+
* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0.0.6-6
- Build with maven.
- Fix requires.
12 years, 9 months
[maven-resources-plugin] Add several packages to BR/R as stated in pom.xml
by Stanislav Ochotnicky
commit 48958ddae5047afa377169cd87179a546725aef4
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jun 24 18:02:09 2011 +0200
Add several packages to BR/R as stated in pom.xml
maven-resources-plugin.spec | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec
index deab947..94cf8fc 100644
--- a/maven-resources-plugin.spec
+++ b/maven-resources-plugin.spec
@@ -25,11 +25,21 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-shared-filtering
+BuildRequires: plexus-interpolation
BuildRequires: plexus-digest
+BuildRequires: maven-project
+BuildRequires: maven-monitor
-Requires: maven-plugin-testing-harness
Requires: plexus-build-api
+Requires: plexus-containers-container-default
+Requires: plexus-utils
+Requires: plexus-interpolation
+Requires: maven-plugin-testing-harness
+Requires: maven-shared-filtering
Requires: maven
+Requires: maven-project
+Requires: maven-monitor
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -91,7 +101,7 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%changelog
* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.4.3-4
-- Add plexus-build-api to Requires
+- Add several packages to BR/R as stated in pom.xml
* Tue Jun 21 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.4.3-3
- Build with maven 3.
12 years, 9 months
[maven-shared] Add second groupId for reporting-api to add compatibility
by Stanislav Ochotnicky
commit aacb85b8f7760bf504921fc4cd5b363f26917496
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Jun 23 14:33:23 2011 +0200
Add second groupId for reporting-api to add compatibility
- Versionless javadocs and remove defattr macros (not needed anymore)
- Use new maven2 compatibility packages
- Remove old patches
maven-ant-pom_xml.patch | 24 -----
maven-artifact-resolver-pom.patch | 14 ---
maven-dependency-tree-pom.patch | 18 ----
maven-osgi-pom.patch | 14 ---
maven-repository-build-pom.patch | 19 ----
maven-runtime-pom.patch | 19 ----
maven-shared-jpp-depmap.xml | 9 +-
maven-shared-maven3.patch | 169 +++++++++++++++++++++++++++++++++++++
maven-shared.spec | 106 +++++++++++++----------
9 files changed, 233 insertions(+), 159 deletions(-)
---
diff --git a/maven-shared-jpp-depmap.xml b/maven-shared-jpp-depmap.xml
index bcb8517..e457605 100644
--- a/maven-shared-jpp-depmap.xml
+++ b/maven-shared-jpp-depmap.xml
@@ -15,14 +15,15 @@
</dependency>
<dependency>
<maven>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model-v3</artifactId>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
<version>2.0</version>
</maven>
<jpp>
- <groupId>JPP/maven2</groupId>
- <artifactId>maven-model</artifactId>
+ <groupId>JPP/maven-shared</groupId>
+ <artifactId>reporting-api</artifactId>
<version>2.0.8</version>
</jpp>
</dependency>
+
</dependencies>
diff --git a/maven-shared-maven3.patch b/maven-shared-maven3.patch
new file mode 100644
index 0000000..694409f
--- /dev/null
+++ b/maven-shared-maven3.patch
@@ -0,0 +1,169 @@
+From 3b8e3f12500fb77db54e7dd672b77bdab3cf82ad Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Fri, 24 Jun 2011 15:08:57 +0200
+Subject: [PATCH] Add maven3 compatibility deps
+
+---
+ maven-ant/pom.xml | 5 +++++
+ maven-artifact-resolver/pom.xml | 5 +++++
+ maven-dependency-tree/pom.xml | 10 ++++++++++
+ .../tree/DefaultDependencyTreeBuilder.java | 7 ++-----
+ .../tree/DependencyTreeResolutionListener.java | 5 +++++
+ maven-downloader/pom.xml | 10 ++++++++++
+ maven-repository-builder/pom.xml | 5 +++++
+ maven-shared-io/pom.xml | 5 +++++
+ 8 files changed, 47 insertions(+), 5 deletions(-)
+
+diff --git a/maven-ant/pom.xml b/maven-ant/pom.xml
+index 3abab27..22ba05f 100644
+--- a/maven-ant/pom.xml
++++ b/maven-ant/pom.xml
+@@ -59,6 +59,11 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+diff --git a/maven-artifact-resolver/pom.xml b/maven-artifact-resolver/pom.xml
+index 307dc69..b94028e 100644
+--- a/maven-artifact-resolver/pom.xml
++++ b/maven-artifact-resolver/pom.xml
+@@ -43,6 +43,11 @@ under the License.
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.1.0</version>
+ <scope>provided</scope>
+diff --git a/maven-dependency-tree/pom.xml b/maven-dependency-tree/pom.xml
+index 0710791..4ed5c7f 100644
+--- a/maven-dependency-tree/pom.xml
++++ b/maven-dependency-tree/pom.xml
+@@ -55,6 +55,16 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+diff --git a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
+index bfce140..f1a0ec8 100644
+--- a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
++++ b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DefaultDependencyTreeBuilder.java
+@@ -29,6 +29,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
+ import org.apache.maven.artifact.resolver.ArtifactCollector;
+ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+ import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
++import org.apache.maven.artifact.resolver.ResolutionListener;
+ import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+ import org.apache.maven.project.MavenProject;
+ import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+@@ -96,14 +97,10 @@ public class DefaultDependencyTreeBuilder extends AbstractLogEnabled implements
+
+ result = collector.collect( dependencyArtifacts, project.getArtifact(), managedVersions, repository,
+ project.getRemoteArtifactRepositories(), metadataSource, filter,
+- Collections.singletonList( listener ) );
++ Collections.singletonList((ResolutionListener) listener ) );
+
+ return listener.getRootNode();
+ }
+- catch ( ArtifactResolutionException exception )
+- {
+- throw new DependencyTreeBuilderException( "Cannot build project dependency tree", exception );
+- }
+ catch ( InvalidDependencyVersionException e )
+ {
+ throw new DependencyTreeBuilderException( "Invalid dependency version for artifact "
+diff --git a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
+index 492f382..0d6b483 100644
+--- a/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
++++ b/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
+@@ -362,6 +362,11 @@ public class DependencyTreeResolutionListener implements ResolutionListener, Res
+ managedScopes.put( replacement.getId(), artifact.getScope() );
+ }
+ }
++
++ public void manageArtifactSystemPath( Artifact artifact, Artifact replacement )
++ {
++ throw new UnsupportedOperationException();
++ }
+
+ // public methods ---------------------------------------------------------
+
+diff --git a/maven-downloader/pom.xml b/maven-downloader/pom.xml
+index d9b6a45..f03a4c8 100644
+--- a/maven-downloader/pom.xml
++++ b/maven-downloader/pom.xml
+@@ -48,6 +48,16 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+diff --git a/maven-repository-builder/pom.xml b/maven-repository-builder/pom.xml
+index 695d859..17c2476 100644
+--- a/maven-repository-builder/pom.xml
++++ b/maven-repository-builder/pom.xml
+@@ -50,6 +50,11 @@ under the License.
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+diff --git a/maven-shared-io/pom.xml b/maven-shared-io/pom.xml
+index 325cdd0..743e37a 100644
+--- a/maven-shared-io/pom.xml
++++ b/maven-shared-io/pom.xml
+@@ -53,6 +53,11 @@
+ <!-- Maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>3.0.3</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+--
+1.7.5.4
+
diff --git a/maven-shared.spec b/maven-shared.spec
index dc4c4ac..0ce96d6 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -67,7 +67,7 @@ Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
Version: 15
-Release: 15%{?dist}
+Release: 16%{?dist}
License: ASL 2.0
Group: Development/Libraries
@@ -78,13 +78,8 @@ Source0: maven-shared-components-%{version}.tar.gz
Source1: %{name}-jpp-depmap.xml
Patch0: %{name}-pom.patch
-Patch1: maven-ant-pom_xml.patch
-Patch2: maven-dependency-tree-pom.patch
-Patch3: maven-osgi-pom.patch
-Patch4: maven-repository-build-pom.patch
-Patch5: maven-runtime-pom.patch
+Patch1: %{name}-maven3.patch
Patch6: maven-runtime-XMLMavenRuntimeVisitor.patch
-Patch7: maven-artifact-resolver-pom.patch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant
@@ -103,6 +98,7 @@ BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-doxia-tools
BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-shared-file-management
BuildRequires: maven-plugin-testing-tools
BuildRequires: maven-test-tools
BuildRequires: plexus-maven-plugin
@@ -117,8 +113,15 @@ BuildRequires: modello
BuildRequires: easymock2
BuildRequires: objectweb-asm
BuildRequires: dom4j
-BuildRequires: aqute-bndlib
+BuildRequires: aqute-bndlib
BuildRequires: maven-wagon
+BuildRequires: maven-artifact-manager
+BuildRequires: maven-project
+BuildRequires: maven-profile
+#BuildRequires: maven-plugin-registry
+BuildRequires: maven-monitor
+BuildRequires: maven-model
+
Requires: ant
Requires: maven
@@ -160,7 +163,7 @@ Group: Development/Libraries
Version: %{osgi_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: aqute-bndlib
-Requires: maven
+Requires: maven-project
%description osgi
Library for Maven-OSGi integration
@@ -171,8 +174,9 @@ Group: Development/Libraries
Version: %{ant_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
-Requires: maven
Requires: plexus-containers-container-default
+Requires: maven-project
+Requires: maven
%description ant
Runs ant scripts embedded in the POM.
@@ -184,8 +188,10 @@ Version: %{common_artifact_filters_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-test-tools >= 0:%{test_tools_version}-%{release}
Requires: junit
-Requires: maven
Requires: plexus-container-default
+Requires: plexus-utils
+Requires: maven-project
+Requires: maven
%description common-artifact-filters
%{summary}.
@@ -197,6 +203,7 @@ Version: %{dependency_tree_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-plugin-testing-harness >= 0:%{plugin_testing_harness_version}-%{release}
Requires: maven
+Requires: maven-project
%description dependency-tree
%{summary}.
@@ -207,6 +214,7 @@ Group: Development/Libraries
Version: %{downloader_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
+Requires: maven-artifact-manager
%description downloader
Provide a super simple interface for downloading a
@@ -218,7 +226,9 @@ Group: Development/Libraries
Version: %{dependency_analyzer_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
+Requires: maven-project
Requires: objectweb-asm
+Requires: plexus-utils
%description dependency-analyzer
%{summary}.
@@ -242,6 +252,7 @@ Version: %{model_converter_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: dom4j
Requires: maven
+Requires: maven-model
Requires: plexus-container-default
Requires: plexus-utils
@@ -256,7 +267,10 @@ Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: jakarta-commons-validator
Requires: jakarta-oro
Requires: maven
+Requires: maven-project
Requires: maven-doxia
+Requires: apache-commons-validator
+Requires: plexus-utils
%description reporting-impl
%{summary}.
@@ -268,6 +282,8 @@ Version: %{repository_builder_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: %{name}-common-artifact-filters = 0:%{common_artifact_filters_version}-%{release}
Requires: maven
+Requires: maven-artifact-manager
+Requires: maven-project
%description repository-builder
%{summary}.
@@ -278,6 +294,7 @@ Group: Development/Libraries
Version: %{io_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
+Requires: maven-artifact-manager
Requires: maven-wagon
Requires: plexus-utils
Requires: plexus-container-default
@@ -291,6 +308,9 @@ Group: Development/Libraries
Version: %{jar_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: maven
+Requires: plexus-digest
+Requires: bcel
+Requires: apache-commons-collections
%description jar
Utilities that help identify the contents of a JAR,
@@ -336,6 +356,8 @@ Version: %{artifact_resolver_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
Requires: maven
+Requires: maven-artifact-manager
+Requires: maven-project
%description artifact-resolver
Provides a component for plugins to easily resolve project dependencies.
@@ -347,6 +369,12 @@ Version: %{filtering_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
Requires: maven
+Requires: maven-project
+# this is not shared-monitor!
+Requires: maven-monitor
+Requires: plexus-utils
+Requires: plexus-build-api
+Requires: plexus-interpolation
%description filtering
A component to assist in filtering of resource files with properties from a Maven project.
@@ -358,6 +386,7 @@ Version: %{reporting_api_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
Requires: maven
+Requires: maven-doxia
%description reporting-api
Maven Reporting API.
@@ -369,6 +398,7 @@ Version: %{runtime_version}
Requires: %{name} = 0:%{shared_components_version}-%{release}
Requires: ant
Requires: maven
+Requires: maven-project
%description runtime
Maven Runtime allows introspection of Maven project metadata at runtime. Basic artifact information or full Maven
@@ -379,13 +409,8 @@ order, and also for a given class within a project.
%setup -q -n %{name}-components-%{shared_components_version}
chmod -R go=u-w *
%patch0 -b .sav0
-%patch1 -b .sav1
-%patch2 -b .sav2
-%patch3 -b .sav3
-%patch4 -b .sav4
-%patch5 -b .sav5
+%patch1 -p1 -b .sav1
%patch6 -b .sav6
-%patch7 -b .sav7
# need namespace for new version modello
sed -i "s|<model>|<model xmlns=\"http://modello.codehaus.org/MODELLO/1.3.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://modello.codehaus.org/MODELLO/1.3.0 http://modello.codehaus.org/xsd/modello-1.3.0.xsd\" xml.namespace=\"..\" xml.schemaLocation=\"..\" xsd.namespace=\"..\" xsd.targetNamespace=\"..\">|" file-management/src/main/mdo/fileset.mdo
@@ -401,10 +426,9 @@ rm -f maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency
%build
export MAVEN_OPTS="-XX:MaxPermSize=256m"
-mvn-rpmbuild \
+mvn-rpmbuild -X \
-Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
- -Dmaven.test.failure.ignore=true \
install javadoc:aggregate
%install
@@ -503,9 +527,10 @@ install -p -m 0644 maven-filtering/target/maven-filtering-%{filtering_version}-b
$RPM_BUILD_ROOT%{_javadir}/maven-shared/filtering.jar
install -pm 644 maven-reporting-api/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
-%add_to_maven_depmap org.apache.maven.shared maven-reporting-api %{reporting_api_version} JPP/maven-shared reporting-api
install -p -m 0644 maven-reporting-api/target/maven-reporting-api-%{reporting_api_version}-SNAPSHOT.jar \
$RPM_BUILD_ROOT%{_javadir}/maven-shared/reporting-api.jar
+%add_to_maven_depmap org.apache.maven.shared maven-reporting-api %{reporting_api_version} JPP/maven-shared reporting-api
+%add_to_maven_depmap org.apache.maven.reporting maven-reporting-api %{reporting_api_version} JPP/maven-shared reporting-api
install -pm 644 maven-runtime/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.maven-shared-runtime.pom
%add_to_maven_depmap org.apache.maven.shared maven-runtime %{runtime_version} JPP/maven-shared runtime
@@ -513,11 +538,14 @@ install -p -m 0644 maven-runtime/target/maven-runtime-%{runtime_version}-alpha-3
$RPM_BUILD_ROOT%{_javadir}/maven-shared/runtime.jar
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{shared_components_version}/
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -526,115 +554,99 @@ ln -s %{name}-%{shared_components_version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%update_maven_depmap
%files
-%defattr(-,root,root,-)
%dir %{_javadir}/maven-shared
%dir %{_mavenpomdir}
%{_mavenpomdir}/JPP.maven-shared-components-parent.pom
%{_mavendepmapfragdir}
%files file-management
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/file-management*.jar
%{_mavenpomdir}/JPP.maven-shared-file-management.pom
%files osgi
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/osgi*.jar
%{_mavenpomdir}/JPP.maven-shared-osgi.pom
%files ant
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/ant*.jar
%{_mavenpomdir}/JPP.maven-shared-ant.pom
%files common-artifact-filters
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/common-artifact-filters*.jar
%{_mavenpomdir}/JPP.maven-shared-common-artifact-filters.pom
%files dependency-analyzer
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/dependency-analyzer*.jar
%{_mavenpomdir}/JPP.maven-shared-dependency-analyzer.pom
%files dependency-tree
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/dependency-tree*.jar
%{_mavenpomdir}/JPP.maven-shared-dependency-tree.pom
%files downloader
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/downloader*.jar
%{_mavenpomdir}/JPP.maven-shared-downloader.pom
%files invoker
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/invoker*.jar
%{_mavenpomdir}/JPP.maven-shared-invoker.pom
%files model-converter
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/model-converter*.jar
%{_mavenpomdir}/JPP.maven-shared-model-converter.pom
%files reporting-impl
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/reporting-impl*.jar
%{_mavenpomdir}/JPP.maven-shared-reporting-impl.pom
%files repository-builder
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/repository-builder*.jar
%{_mavenpomdir}/JPP.maven-shared-repository-builder.pom
%files io
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/io*.jar
%{_mavenpomdir}/JPP.maven-shared-io.pom
%files jar
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/jar*.jar
%{_mavenpomdir}/JPP.maven-shared-jar.pom
%files monitor
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/monitor*.jar
%{_mavenpomdir}/JPP.maven-shared-monitor.pom
%files verifier
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/verifier*.jar
%{_mavenpomdir}/JPP.maven-shared-verifier.pom
%files artifact-resolver
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/artifact-resolver*.jar
%{_mavenpomdir}/JPP.maven-shared-artifact-resolver.pom
%files filtering
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/filtering*.jar
%{_mavenpomdir}/JPP.maven-shared-filtering.pom
%files reporting-api
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/reporting-api*.jar
%{_mavenpomdir}/JPP.maven-shared-reporting-api.pom
%files runtime
-%defattr(-,root,root,-)
%{_javadir}/maven-shared/runtime*.jar
%{_mavenpomdir}/JPP.maven-shared-runtime.pom
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{shared_components_version}
-%doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
%changelog
-* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-15
+* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 15-16
+- Add second groupId for reporting-api to add compatibility
+- Versionless javadocs and remove defattr macros (not needed anymore)
+- Use new maven2 compatibility packages
+- Remove old patches
+
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako(a)redhat.com> 15-15
- Require maven not maven2 now.
- Adapt to current guidelines.
12 years, 9 months
[maven2] Add new subpackages and fix few requires
by Stanislav Ochotnicky
commit 43559112903060fe4a8d38ad0f2d67c77bad60de
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jun 24 16:38:12 2011 +0200
Add new subpackages and fix few requires
maven2.spec | 130 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 104 insertions(+), 26 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index dc193bb..8b1e059 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -241,11 +241,11 @@ Group: Development/Libraries
Summary: Compatibility Maven project artifact
Requires: jpackage-utils
Requires: maven-artifact-manager
+Requires: maven-profile
+Requires: maven-plugin-registry
Requires: plexus-interpolation
Requires: plexus-utils
Requires: plexus-containers-container-default
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description -n maven-project
Maven project artifact
@@ -259,12 +259,50 @@ Requires: plexus-utils
Requires: plexus-containers-container-default
Requires: backport-util-concurrent
Requires: maven-wagon
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description -n maven-artifact-manager
Maven artifact manager artifact
+%package -n maven-profile
+Group: Development/Libraries
+Summary: Compatibility Maven profile artifact
+Requires: jpackage-utils
+Requires: plexus-utils
+Requires: plexus-interpolation
+Requires: plexus-containers-container-default
+
+%description -n maven-profile
+Maven profile artifact
+
+%package -n maven-monitor
+Group: Development/Libraries
+Summary: Compatibility Maven monitor artifact
+Requires: jpackage-utils
+
+%description -n maven-monitor
+Maven monitor artifact
+
+%package -n maven-model
+Group: Development/Libraries
+Summary: Compatibility Maven model artifact
+Requires: jpackage-utils
+Requires: plexus-utils
+
+%description -n maven-model
+Maven model artifact
+
+%package -n maven-plugin-registry
+Group: Development/Libraries
+Summary: Compatibility Maven plugin registry artifact
+Requires: jpackage-utils
+Requires: plexus-utils
+Requires: plexus-interpolation
+Requires: plexus-containers-container-default
+
+%description -n maven-plugin-registry
+Maven plugin registry artifact
+
+
%prep
%setup -q -n apache-maven-2.2.1
@@ -475,25 +513,62 @@ popd
mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
$RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+subdir="maven-plugin-registry"
+pushd $subdir
+install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
+%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
+popd
+
+mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
+ $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+
+subdir="maven-monitor"
+pushd $subdir
+install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
+%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
+popd
+
+mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
+ $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+
+subdir="maven-model"
+pushd $subdir
+install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
+%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
+%add_to_maven_depmap org.apache.maven maven-model-v3 %{version} JPP/%{name} $subdir
+popd
+
+mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
+ $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+
+subdir="maven-profile"
+pushd $subdir
+install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
+%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
+popd
+
+mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
+ $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+
for file in \
maven-script/maven-script-ant/target/maven-script-ant-%{version}.jar \
maven-script/maven-script-beanshell/target/maven-script-beanshell-%{version}.jar \
apache-maven/target/apache-maven-%{version}.jar \
- maven-profile/target/maven-profile-%{version}.jar \
maven-artifact-test/target/maven-artifact-test-%{version}.jar \
- maven-monitor/target/maven-monitor-%{version}.jar \
maven-toolchain/target/maven-toolchain-%{version}.jar \
maven-toolchain/target/original-maven-toolchain-%{version}.jar \
maven-settings/target/maven-settings-%{version}.jar \
maven-plugin-parameter-documenter/target/maven-plugin-parameter-documenter-%{version}.jar \
- maven-model/target/maven-model-%{version}.jar \
maven-artifact/target/maven-artifact-%{version}.jar \
maven-repository-metadata/target/maven-repository-metadata-%{version}.jar \
maven-plugin-api/target/maven-plugin-api-%{version}.jar \
maven-error-diagnostics/target/maven-error-diagnostics-%{version}.jar \
maven-compat/target/maven-compat-%{version}.jar \
maven-core/target/maven-core-%{version}.jar \
- maven-plugin-registry/target/maven-plugin-registry-%{version}.jar \
maven-plugin-descriptor/target/maven-plugin-descriptor-%{version}.jar; do \
FNAME=`basename $file`
@@ -541,24 +616,6 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
)
%endif
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%post -n maven-project
-%update_maven_depmap
-
-%postun -n maven-project
-%update_maven_depmap
-
-%post -n maven-artifact-manager
-%update_maven_depmap
-
-%postun -n maven-artifact-manager
-%update_maven_depmap
-
%files
%attr(0755,root,root) %{_bindir}/mvn
%attr(0755,root,root) %{_bindir}/mvn-jpp
@@ -592,9 +649,30 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%{_javadir}/%{name}/maven-artifact-manager.jar
%{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom
+%files -n maven-plugin-registry
+%{_mavendepmapfragdir}/maven-plugin-registry
+%{_javadir}/%{name}/maven-plugin-registry.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-plugin-registry.pom
+
+%files -n maven-monitor
+%{_mavendepmapfragdir}/maven-monitor
+%{_javadir}/%{name}/maven-monitor.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-monitor.pom
+
+%files -n maven-model
+%{_mavendepmapfragdir}/maven-model
+%{_javadir}/%{name}/maven-model.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-model.pom
+
+%files -n maven-profile
+%{_mavendepmapfragdir}/maven-profile
+%{_javadir}/%{name}/maven-profile.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-profile.pom
+
%changelog
* Fri Jun 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-24
+- Add few new subpackages
- Add several missing requires to new subpackages
* Fri Jun 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-23
12 years, 9 months
[maven2] Add several missing requires to new subpackages
by Stanislav Ochotnicky
commit c34d10910d26117b0bad4846a480acc737ae2eed
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jun 24 14:49:06 2011 +0200
Add several missing requires to new subpackages
maven2.spec | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/maven2.spec b/maven2.spec
index 15b79d2..dc193bb 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -231,8 +231,6 @@ Requires: maven-artifact-manager = %{version}-%{release}
BuildArch: noarch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
%description
Apache Maven is a software project management and comprehension tool. Based on
the concept of a project object model (POM), Maven can manage a project's
@@ -242,6 +240,10 @@ build, reporting and documentation from a central piece of information.
Group: Development/Libraries
Summary: Compatibility Maven project artifact
Requires: jpackage-utils
+Requires: maven-artifact-manager
+Requires: plexus-interpolation
+Requires: plexus-utils
+Requires: plexus-containers-container-default
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -253,6 +255,10 @@ Group: Development/Libraries
Summary: Compatibility Maven artifact manager artifact
Requires: jpackage-utils
Requires: plexus-classworlds
+Requires: plexus-utils
+Requires: plexus-containers-container-default
+Requires: backport-util-concurrent
+Requires: maven-wagon
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -588,6 +594,9 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%changelog
+* Fri Jun 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-24
+- Add several missing requires to new subpackages
+
* Fri Jun 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-23
- Split artifact-manager and project into subpackages
- Fix resolver to process poms and fragments from datadir
12 years, 9 months
[maven2] Split artifact-manager and project into subpackages
by Stanislav Ochotnicky
commit ed111c4f32eb1255f3045aa6df324e712205e618
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jun 24 12:10:16 2011 +0200
Split artifact-manager and project into subpackages
- Fix resolver to process poms and fragments from datadir
- No more need to update_maven_depmap after this update
maven2-2.2.1-classworlds.patch | 43 ++++++++++
maven2-2.2.1-jpp.patch | 85 ++++++++++++++++----
maven2-JPackageRepositoryLayout.java | 53 ++++++++-----
maven2-MavenJPackageDepmap.java | 143 +++++++++++++++++++++++++++------
maven2.spec | 88 +++++++++++++++++++--
5 files changed, 340 insertions(+), 72 deletions(-)
---
diff --git a/maven2-2.2.1-classworlds.patch b/maven2-2.2.1-classworlds.patch
new file mode 100644
index 0000000..33534b7
--- /dev/null
+++ b/maven2-2.2.1-classworlds.patch
@@ -0,0 +1,43 @@
+From 75c19c93fe901004940bd1715861267a8387e9c0 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Fri, 24 Jun 2011 13:31:27 +0200
+Subject: [PATCH] Add plexus classworlds to pom
+
+---
+ maven-artifact-manager/pom.xml | 4 ++++
+ maven-plugin-descriptor/pom.xml | 4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/maven-artifact-manager/pom.xml b/maven-artifact-manager/pom.xml
+index 81ab2d2..270470a 100644
+--- a/maven-artifact-manager/pom.xml
++++ b/maven-artifact-manager/pom.xml
+@@ -31,6 +31,10 @@ under the License.
+
+ <dependencies>
+ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-classworlds</artifactId>
++ </dependency>
++ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-repository-metadata</artifactId>
+ </dependency>
+diff --git a/maven-plugin-descriptor/pom.xml b/maven-plugin-descriptor/pom.xml
+index 4dbbaea..2645277 100644
+--- a/maven-plugin-descriptor/pom.xml
++++ b/maven-plugin-descriptor/pom.xml
+@@ -31,6 +31,10 @@ under the License.
+
+ <dependencies>
+ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-classworlds</artifactId>
++ </dependency>
++ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+--
+1.7.5.4
+
diff --git a/maven2-2.2.1-jpp.patch b/maven2-2.2.1-jpp.patch
index 8b676f8..9a1485f 100644
--- a/maven2-2.2.1-jpp.patch
+++ b/maven2-2.2.1-jpp.patch
@@ -1,24 +1,24 @@
-From 1633026ab5ef24701ce8617db283079a185d6205 Mon Sep 17 00:00:00 2001
+From b92cdde39ab29334826a6eb9daf1c187c0ca67af Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue, 18 Jan 2011 10:40:00 +0100
Subject: [PATCH 2/7] Maven JPP mode patch
---
- .../artifact/manager/DefaultWagonManager.java | 31 ++++++++++++++++++++
+ .../artifact/manager/DefaultWagonManager.java | 31 +++++++++
.../metadata/DefaultRepositoryMetadataManager.java | 2 +-
.../artifact/resolver/DefaultArtifactResolver.java | 3 +-
- maven-artifact/pom.xml | 5 +++
- .../repository/layout/DefaultRepositoryLayout.java | 17 ++++++++++-
- .../resolver/DefaultArtifactCollector.java | 9 ++++-
- .../main/resources/META-INF/plexus/components.xml | 6 ++++
- .../apache/maven/plugin/MavenPluginCollector.java | 18 +++++++++++
- .../apache/maven/plugin/MavenPluginValidator.java | 6 ++-
- .../java/org/apache/maven/plugin/PluginUtils.java | 8 ++++-
- .../version/DefaultPluginVersionManager.java | 8 ++++-
- .../project/validation/DefaultModelValidator.java | 10 +++++-
- .../org/apache/maven/project/pom-4.0.0.xml | 22 ++++++++++++++
- pom.xml | 5 +++
- 14 files changed, 139 insertions(+), 11 deletions(-)
+ maven-artifact/pom.xml | 5 ++
+ .../repository/layout/DefaultRepositoryLayout.java | 17 +++++-
+ .../resolver/DefaultArtifactCollector.java | 9 ++-
+ .../main/resources/META-INF/plexus/components.xml | 6 ++
+ .../apache/maven/plugin/MavenPluginCollector.java | 18 +++++
+ .../apache/maven/plugin/MavenPluginValidator.java | 6 +-
+ .../java/org/apache/maven/plugin/PluginUtils.java | 8 ++-
+ .../version/DefaultPluginVersionManager.java | 8 ++-
+ .../project/validation/DefaultModelValidator.java | 10 ++-
+ .../org/apache/maven/project/pom-4.0.0.xml | 71 ++++++++++++++++++++
+ pom.xml | 5 ++
+ 14 files changed, 188 insertions(+), 11 deletions(-)
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
index 6318435..e4f8bb1 100644
@@ -336,10 +336,10 @@ index ede61f4..dba7bca 100644
if ( Artifact.SCOPE_SYSTEM.equals( d.getScope() ) )
{
diff --git a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-index 00e84c1..b0e4289 100644
+index 00e84c1..3a659aa 100644
--- a/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
+++ b/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
-@@ -32,6 +32,15 @@ under the License.
+@@ -32,6 +32,39 @@ under the License.
<enabled>false</enabled>
</snapshots>
</repository>
@@ -352,10 +352,34 @@ index 00e84c1..b0e4289 100644
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
++ <repository>
++ <id>__jpp_repo2__</id>
++ <name>JPackage Maven 3 Repository</name>
++ <layout>jpp</layout>
++ <url>file:///usr/share/maven/repository</url>
++ <snapshots>
++ <enabled>true</enabled>
++ </snapshots>
++ <releases>
++ <updatePolicy>never</updatePolicy>
++ </releases>
++ </repository>
++ <repository>
++ <id>__jpp_pom_repo__</id>
++ <name>JPackage POM Repository</name>
++ <layout>jpp</layout>
++ <url>file:///usr/share/maven-poms</url>
++ <snapshots>
++ <enabled>true</enabled>
++ </snapshots>
++ <releases>
++ <updatePolicy>never</updatePolicy>
++ </releases>
++ </repository>
</repositories>
<pluginRepositories>
-@@ -47,6 +56,19 @@ under the License.
+@@ -47,6 +80,44 @@ under the License.
<updatePolicy>never</updatePolicy>
</releases>
</pluginRepository>
@@ -371,6 +395,31 @@ index 00e84c1..b0e4289 100644
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ </pluginRepository>
++ <pluginRepository>
++ <id>__jpp_repo2__</id>
++ <name>JPackage Maven 3 Repository</name>
++ <layout>jpp</layout>
++ <url>file:///usr/share/maven/repository</url>
++ <snapshots>
++ <enabled>true</enabled>
++ </snapshots>
++ <releases>
++ <updatePolicy>never</updatePolicy>
++ </releases>
++ </pluginRepository>
++ <pluginRepository>
++ <id>__jpp_pom_repo__</id>
++ <name>JPackage POM Repository</name>
++ <layout>jpp</layout>
++ <url>file:///usr/share/maven-poms</url>
++ <snapshots>
++ <enabled>true</enabled>
++ </snapshots>
++ <releases>
++ <updatePolicy>never</updatePolicy>
++ </releases>
++ </pluginRepository>
++
+
</pluginRepositories>
@@ -392,5 +441,5 @@ index e2fde29..3fe31f5 100644
<!--start-->
</dependencyManagement>
--
-1.7.3.4
+1.7.5.4
diff --git a/maven2-JPackageRepositoryLayout.java b/maven2-JPackageRepositoryLayout.java
index b214312..530c5c3 100644
--- a/maven2-JPackageRepositoryLayout.java
+++ b/maven2-JPackageRepositoryLayout.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
+import java.io.File;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -34,8 +35,8 @@ import org.jdom.input.SAXBuilder;
import org.xml.sax.InputSource;
/**
- * Repository layout for jpackage based repositories.
- * This class resolves items for jpp style repos (i.e things located in
+ * Repository layout for jpackage based repositories.
+ * This class resolves items for jpp style repos (i.e things located in
* /usr/share/java).
*/
@@ -60,7 +61,7 @@ public class JPackageRepositoryLayout
if (!groupId.startsWith("JPP")) {
MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
Hashtable newInfo = map.getMappedInfo(groupId, artifactId, version);
-
+
groupId = (String) newInfo.get("group");
artifactId = (String) newInfo.get("artifact");
}
@@ -81,24 +82,34 @@ public class JPackageRepositoryLayout
}
private StringBuffer getPOMPath(String groupId, String artifactId) {
-
- StringBuffer path = new StringBuffer();
- String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom";
- path.append(System.getProperty("maven2.jpp.pom.path", "JPP/maven2/poms")).append("/").append(fName);
- java.io.File f;
-
- // NOTE: We are returning default_poms/ as the path for this pom
- // even though it may not exist there. This may cause an error,
- // but that is fine because if the pom is not there, there is
- // a serious problem anyways..
- f = new java.io.File(System.getProperty("maven2.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
- //System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
- if (!f.exists()) {
- path = new StringBuffer();
- path.append(System.getProperty("maven2.jpp.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName);
- }
-
- return path;
+ String checkdir;
+ String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-"
+ + artifactId + ".pom";
+ File f;
+
+ // let's try maven 2 repo first
+ checkdir = "JPP/maven2/poms/";
+ f = new File("/usr/share/maven2/repository/" + checkdir + fName);
+ if (f.exists()) {
+ return new StringBuffer(checkdir + fName);
+ }
+
+ // now maven 3 specific repository
+ checkdir = "JPP/maven/poms/";
+ f = new File("/usr/share/maven/repository/" + checkdir + fName);
+ if (f.exists()) {
+ return new StringBuffer(checkdir + fName);
+ }
+
+ // now try new path in /usr. This will be the only check after all
+ // packages are rebuilt
+ f = new File("/usr/share/maven-poms/" + fName);
+ if (f.exists()) {
+ return new StringBuffer(fName);
+ }
+
+ // final fallback to m2 default poms
+ return new StringBuffer("JPP/maven2/default_poms/" + fName);
}
public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository )
diff --git a/maven2-MavenJPackageDepmap.java b/maven2-MavenJPackageDepmap.java
index e32f919..3c78efc 100644
--- a/maven2-MavenJPackageDepmap.java
+++ b/maven2-MavenJPackageDepmap.java
@@ -7,6 +7,8 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
+import java.io.InputStream;
+import java.io.File;
import org.jdom.Document;
import org.jdom.Element;
@@ -18,23 +20,66 @@ public class MavenJPackageDepmap {
private static MavenJPackageDepmap instance;
private static Hashtable jppArtifactMap;
+ /**
+ *
+ * @author Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+ *
+ * This class is used to wrap around fragments that are mapping
+ * artifacts to jar files in our _javadir. These used to be
+ * processed in a macro after every package installation. Fragments
+ * themselves are not proper xml files (they have no root element)
+ * so we have to fix them by wrapping them in one root element.
+ */
+ private static class WrapFragmentStream extends InputStream {
+ String startTag = "<deps>";
+ String endTag = "</deps>";
+ byte fragmentContent[];
+ int position;
+
+ WrapFragmentStream(String fragmentPath) throws IOException {
+ FileInputStream fin = new FileInputStream(fragmentPath);
+ int nBytes = fin.available();
+ byte tmpContent[] = new byte[nBytes];
+ fin.read(tmpContent);
+ fin.close();
+ byte startBytes[] = startTag.getBytes();
+ byte endBytes[] = endTag.getBytes();
+ fragmentContent = new byte[nBytes + startBytes.length
+ + endBytes.length];
+ System.arraycopy(startBytes, 0, fragmentContent, 0,
+ startBytes.length);
+ System.arraycopy(tmpContent, 0, fragmentContent, startBytes.length,
+ tmpContent.length);
+ System.arraycopy(endBytes, 0, fragmentContent, startBytes.length
+ + tmpContent.length, endBytes.length);
+ position = 0;
+ }
+
+ public int read() throws IOException {
+ if (position < fragmentContent.length) {
+ return fragmentContent[position++];
+ } else {
+ return -1;
+ }
+ }
+ }
private MavenJPackageDepmap() {
jppArtifactMap = new Hashtable();
buildJppArtifactMap();
}
-
+
public static MavenJPackageDepmap getInstance() {
if (instance == null) {
instance = new MavenJPackageDepmap();
}
-
+
return instance;
}
public Hashtable getMappedInfo(Hashtable mavenDep) {
- return getMappedInfo((String) mavenDep.get("group"),
- (String) mavenDep.get("artifact"),
+ return getMappedInfo((String) mavenDep.get("group"),
+ (String) mavenDep.get("artifact"),
(String) mavenDep.get("version"));
}
@@ -52,7 +97,7 @@ public class MavenJPackageDepmap {
jppCombination = (String) jppArtifactMap.get(idToCheck);
//System.err.println("*** " + groupId+","+artifactId+","+version + " => " + jppCombination);
-
+
jppDep = new Hashtable();
if (jppCombination != null && jppCombination != "") {
@@ -90,31 +135,77 @@ public class MavenJPackageDepmap {
private static void buildJppArtifactMap() {
- if (System.getProperty("maven2.ignore.versions") != null || System.getProperty("maven2.jpp.mode") != null) {
+ try{
+ if (System.getProperty("maven2.ignore.versions") != null || System.getProperty("maven2.jpp.mode") != null) {
debug("Processing file: /usr/share/java-utils/xml/maven2-versionless-depmap.xml");
- processDepmapFile("/etc/maven/maven2-versionless-depmap.xml");
- }
+ processDepmapFile(new FileInputStream("/etc/maven/maven2-versionless-depmap.xml"));
+ }
+ }
+ catch (FileNotFoundException e) {
+ System.err.println("WARNING: Unable to find versionless map" );
+ e.printStackTrace();
+ }
+ catch (IOException e) {
+ System.err.println("WARNING: I/O exception occured when opening versionless map file");
+ e.printStackTrace();
+ }
+
+ // process fragments in etc
+ File fragmentDir = new File("/etc/maven/fragments");
+ String flist[] = fragmentDir.list();
+ if (flist != null) {
+ java.util.Arrays.sort(flist);
+ for (String fragFilename : flist) {
+ try {
+ processDepmapFile(new WrapFragmentStream("/etc/maven/fragments/" + fragFilename));
+ }
+ catch (IOException e) {
+ System.err.println("WARNING: I/O exception occured when opening etc map file" + fragFilename);
+ e.printStackTrace();
+ }
+ }
+ }
- debug("Processing file: /usr/share/java-utils/xml/maven2-depmap.xml");
- processDepmapFile("/etc/maven/maven2-depmap.xml");
+ // process fragments is usr. Once packages are rebuilt, we can skip
+ // fragments in /etc
+ fragmentDir = new File("/usr/share/maven-fragments");
+ flist = fragmentDir.list();
+ if (flist != null) {
+ java.util.Arrays.sort(flist);
+ for (String fragFilename : flist) {
+ try {
+ processDepmapFile(new WrapFragmentStream("/usr/share/maven-fragments/" + fragFilename));
+ }
+ catch (IOException e) {
+ System.err.println("WARNING: I/O exception occured when opening usr map file" + fragFilename);
+ e.printStackTrace();
+ }
+ }
+ }
- String customFileName = System.getProperty("maven2.jpp.depmap.file", null);
- if (customFileName != null) {
+ String customFileName = System.getProperty("maven2.jpp.depmap.file", null);
+ try {
+ if (customFileName != null) {
debug("Processing file: " + customFileName);
- processDepmapFile(customFileName);
- }
+ processDepmapFile(new FileInputStream(customFileName));
+ }
+ }
+ catch (FileNotFoundException e) {
+ System.err.println("ERROR: Unable to find custom map file: " + customFileName);
+ e.printStackTrace();
+ }
+ catch (IOException e) {
+ System.err.println("ERROR: I/O exception occured when opening map file");
+ e.printStackTrace();
+ }
}
- private static void processDepmapFile(String fileName) {
-
+ private static void processDepmapFile(InputStream file) {
+
Document mapDocument;
try {
- mapDocument = (new SAXBuilder()).build(new InputSource(new FileInputStream(fileName)));
- } catch (FileNotFoundException fnfe) {
- System.err.println("ERROR: Unable to find map file: " + fileName);
- fnfe.printStackTrace();
- return;
+ mapDocument = (new SAXBuilder()).build(new InputSource(file));
} catch (IOException ioe) {
System.err.println("ERROR: I/O exception occured when opening map file");
ioe.printStackTrace();
@@ -124,16 +215,16 @@ public class MavenJPackageDepmap {
jde.printStackTrace();
return;
}
-
+
List l = mapDocument.getRootElement().getChildren("dependency");
-
+
Iterator i = l.iterator();
while (i.hasNext()) {
Element depElement = (Element) i.next();
Element mElem = depElement.getChild("maven");
Element jppElem = depElement.getChild("jpp");
-
+
String mG = mElem.getChildText("groupId");
String mA = mElem.getChildText("artifactId");
String mV = mElem.getChildText("version");
diff --git a/maven2.spec b/maven2.spec
index 03f03b7..15b79d2 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -59,6 +59,7 @@ Patch3: %{name}-%{version}-enable-bootstrap-repo.patch
Patch4: %{name}-%{version}-unshade.patch
Patch5: %{name}-%{version}-default-resolver-pool-size.patch
Patch6: %{name}-%{version}-strip-jackrabbit-dep.patch
+Patch7: %{name}-%{version}-classworlds.patch
BuildRequires: java-devel >= 1.6.0
BuildRequires: classworlds
@@ -146,6 +147,9 @@ BuildRequires: jakarta-oro
BuildRequires: regexp
BuildRequires: slf4j
BuildRequires: velocity
+BuildRequires: maven
+# this is only to temp fix problems in other packages
+BuildRequires: maven2
%endif
Requires: classworlds
@@ -221,6 +225,8 @@ Requires: jakarta-oro
Requires: regexp
Requires: slf4j
Requires: velocity
+Requires: maven-project = %{version}-%{release}
+Requires: maven-artifact-manager = %{version}-%{release}
%endif
BuildArch: noarch
@@ -232,6 +238,27 @@ Apache Maven is a software project management and comprehension tool. Based on
the concept of a project object model (POM), Maven can manage a project's
build, reporting and documentation from a central piece of information.
+%package -n maven-project
+Group: Development/Libraries
+Summary: Compatibility Maven project artifact
+Requires: jpackage-utils
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+%description -n maven-project
+Maven project artifact
+
+%package -n maven-artifact-manager
+Group: Development/Libraries
+Summary: Compatibility Maven artifact manager artifact
+Requires: jpackage-utils
+Requires: plexus-classworlds
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+%description -n maven-artifact-manager
+Maven artifact manager artifact
+
%prep
%setup -q -n apache-maven-2.2.1
@@ -284,6 +311,8 @@ cp %{SOURCE102} maven-artifact/src/main/java/org/apache/maven/artifact/repositor
# remove unneeded jackrabbit dependency
%patch6 -p1 -b .strip-jackrabbit-dep
+%patch7 -p1 -b .classworlds
+
# test case is incorrectly assuming that target executed by antcall
# can propagate references to its parent (stopped working with ant 1.8)
rm maven-script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java
@@ -313,7 +342,7 @@ ant -Dmaven.repo.local=$M2_REPO/cache
# FIXME: These tests fail when building with maven for an unknown reason
rm -f maven-core/src/test/java/org/apache/maven/WagonSelectorTest.java
rm -f maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
-mvn-jpp -P all-models -Dmaven.repo.local=$M2_REPO/cache -Dmaven2.jpp.depmap.file=%{SOURCE103} install
+mvn-rpmbuild -Dmaven.test.skip=true -P all-models -Dmaven.repo.local=$M2_REPO/cache -Dmaven.local.depmap.file=%{SOURCE103} install
%endif
%install
@@ -419,17 +448,36 @@ install -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_javadir}/%{name}/empty-dep.jar
# Individual jars #
###################
+# artifact-manager and project go into separate fragments
+subdir="maven-artifact-manager"
+pushd $subdir
+install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
+%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
+popd
+
+mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
+ $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+
+subdir="maven-project"
+pushd $subdir
+install -m 644 target/$subdir-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$subdir.jar
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$subdir.pom
+%add_to_maven_depmap org.apache.maven $subdir %{version} JPP/%{name} $subdir
+popd
+
+mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} \
+ $RPM_BUILD_ROOT%{_mavendepmapfragdir}/$subdir
+
for file in \
maven-script/maven-script-ant/target/maven-script-ant-%{version}.jar \
maven-script/maven-script-beanshell/target/maven-script-beanshell-%{version}.jar \
apache-maven/target/apache-maven-%{version}.jar \
maven-profile/target/maven-profile-%{version}.jar \
- maven-artifact-manager/target/maven-artifact-manager-%{version}.jar \
maven-artifact-test/target/maven-artifact-test-%{version}.jar \
maven-monitor/target/maven-monitor-%{version}.jar \
maven-toolchain/target/maven-toolchain-%{version}.jar \
maven-toolchain/target/original-maven-toolchain-%{version}.jar \
- maven-project/target/maven-project-%{version}.jar \
maven-settings/target/maven-settings-%{version}.jar \
maven-plugin-parameter-documenter/target/maven-plugin-parameter-documenter-%{version}.jar \
maven-model/target/maven-model-%{version}.jar \
@@ -493,11 +541,19 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
%postun
%update_maven_depmap
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post -n maven-project
+%update_maven_depmap
+
+%postun -n maven-project
+%update_maven_depmap
+
+%post -n maven-artifact-manager
+%update_maven_depmap
+
+%postun -n maven-artifact-manager
+%update_maven_depmap
%files
-%defattr(-,root,root,-)
%attr(0755,root,root) %{_bindir}/mvn
%attr(0755,root,root) %{_bindir}/mvn-jpp
%dir %{_datadir}/%{name}
@@ -509,6 +565,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/conf
%{_datadir}/%{name}/lib
%{_datadir}/%{name}/poms
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom
+%exclude %{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
%{_datadir}/%{name}/repository
%{_mavendepmapfragdir}
%{_javadir}/%{name}
@@ -518,7 +576,23 @@ rm -rf $RPM_BUILD_ROOT
%endif
%doc
+%files -n maven-project
+%{_mavendepmapfragdir}/maven-project
+%{_javadir}/%{name}/maven-project.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-project.pom
+
+%files -n maven-artifact-manager
+%{_mavendepmapfragdir}/maven-artifact-manager
+%{_javadir}/%{name}/maven-artifact-manager.jar
+%{_datadir}/%{name}/poms/JPP.%{name}-maven-artifact-manager.pom
+
+
%changelog
+* Fri Jun 24 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-23
+- Split artifact-manager and project into subpackages
+- Fix resolver to process poms and fragments from datadir
+- No more need to update_maven_depmap after this update
+
* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-22
- Fix jpp script to limit maven2.jpp.mode scope
12 years, 9 months