[Jpackage-commits] dist/maven22/devel maven2-2.2.1-classworlds.patch, NONE, 1.1 maven22.spec, 1.10, 1.11

David Walluck david at ryu.zarb.org
Sat Oct 15 11:36:34 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven22/devel
In directory ryu.zarb.org:/tmp/cvs-serv14452

Modified Files:
	maven22.spec 
Added Files:
	maven2-2.2.1-classworlds.patch 
Log Message:
- add maven2-2.2.1-classworlds.patch

Index: maven22.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven22/devel/maven22.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** maven22.spec	15 Oct 2011 08:47:07 -0000	1.10
--- maven22.spec	15 Oct 2011 09:36:31 -0000	1.11
***************
*** 1,3 ****
! %global bootstrap 1
  %global __jar_repack 0
  %global majmin 22
--- 1,3 ----
! %global bootstrap 0
  %global __jar_repack 0
  %global majmin 22
***************
*** 5,9 ****
  Name:           maven%{majmin}
  Version:        2.2.1
! Release:        23.3%{?dist}
  Epoch:          0
  Summary:        Java project management and project comprehension tool
--- 5,9 ----
  Name:           maven%{majmin}
  Version:        2.2.1
! Release:        23.4%{?dist}
  Epoch:          0
  Summary:        Java project management and project comprehension tool
***************
*** 317,321 ****
  %{ant} -Dmaven.repo.local=$M2_REPO/cache
  %else
! %{_bindir}/mvn%{majmin}-jpp -X -e -P all-models -Dmaven.repo.local=$M2_REPO/cache -Dmaven2.jpp.depmap.file=%{SOURCE103} install
  %endif
  
--- 317,321 ----
  %{ant} -Dmaven.repo.local=$M2_REPO/cache
  %else
! %{_bindir}/mvn%{majmin}-jpp -e -P all-models -Dmaven.repo.local=$M2_REPO/cache -Dmaven2.jpp.depmap.file=%{SOURCE103} install
  %endif
  
***************
*** 483,488 ****
--- 483,490 ----
  
  (cd %{buildroot}%{_datadir}/%{name}/boot
+ %if %{bootstrap}
    # FIXME: how does this get here?
    %{__rm} classworlds-1.1.jar
+ %endif
    %{__ln_s} `build-classpath classworlds` classworlds.jar
  )
***************
*** 490,496 ****
  %if ! %{bootstrap}
  (cd %{buildroot}%{_datadir}/%{name}/lib
!   for i in backport-util-concurrent jsch commons-cli commons-httpclient commons-codec nekohtml maven-shared/reporting-api maven-doxia/logging-api maven-doxia/sink-api \
! maven-wagon/file maven-wagon/http maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external plexus-container-default \
! plexus/interactivity-api plexus-interpolation plexus-utils slf4j/slf4j-api slf4j/slf4j-nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2; do
      file=`build-classpath ${i} 2>/dev/null`
      test -f ${file} || exit 1
--- 492,499 ----
  %if ! %{bootstrap}
  (cd %{buildroot}%{_datadir}/%{name}/lib
!   # FIXME: add back maven-doxia/logging-api which is in 1.1+
!   for i in backport-util-concurrent jsch commons-cli commons-httpclient commons-codec nekohtml maven-reporting-api maven-doxia/sink-api \
! maven-wagon/wagon-file maven-wagon/wagon-http maven-wagon/wagon-http-lightweight maven-wagon/wagon-http-shared maven-wagon/wagon-provider-api maven-wagon/wagon-ssh maven-wagon/wagon-ssh-common maven-wagon/wagon-ssh-external plexus/container-default \
! plexus/interactivity-api plexus-interpolation plexus/utils slf4j/slf4j-api slf4j/slf4j-nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2; do
      file=`build-classpath ${i} 2>/dev/null`
      test -f ${file} || exit 1
***************
*** 579,600 ****
  %{_datadir}/%{name}/lib/commons-httpclient.jar
  %{_datadir}/%{name}/lib/jsch.jar
  %{_datadir}/%{name}/lib/maven-doxia-logging-api.jar
! %{_datadir}/%{name}/lib/maven-doxia-sink-api.jar
! %{_datadir}/%{name}/lib/maven-shared-reporting-api.jar
! %{_datadir}/%{name}/lib/maven-wagon-file.jar
! %{_datadir}/%{name}/lib/maven-wagon-http-lightweight.jar
! %{_datadir}/%{name}/lib/maven-wagon-http-shared.jar
! %{_datadir}/%{name}/lib/maven-wagon-http.jar
! %{_datadir}/%{name}/lib/maven-wagon-provider-api.jar
! %{_datadir}/%{name}/lib/maven-wagon-ssh-common.jar
! %{_datadir}/%{name}/lib/maven-wagon-ssh-external.jar
! %{_datadir}/%{name}/lib/maven-wagon-ssh.jar
  %{_datadir}/%{name}/lib/nekohtml.jar
! %{_datadir}/%{name}/lib/plexus-container-default.jar
! %{_datadir}/%{name}/lib/plexus-interactivity-api.jar
  %{_datadir}/%{name}/lib/plexus-interpolation.jar
  %{_datadir}/%{name}/lib/plexus-cipher.jar
  %{_datadir}/%{name}/lib/plexus-sec-dispatcher.jar
! %{_datadir}/%{name}/lib/plexus-utils.jar
  %{_datadir}/%{name}/lib/slf4j-api.jar
  %{_datadir}/%{name}/lib/slf4j-nop.jar
--- 582,606 ----
  %{_datadir}/%{name}/lib/commons-httpclient.jar
  %{_datadir}/%{name}/lib/jsch.jar
+ # FIXME: only in 1.1+
+ %if 0
  %{_datadir}/%{name}/lib/maven-doxia-logging-api.jar
! %endif
! %{_datadir}/%{name}/lib/sink-api.jar
! %{_datadir}/%{name}/lib/maven-reporting-api.jar
! %{_datadir}/%{name}/lib/wagon-file.jar
! %{_datadir}/%{name}/lib/wagon-http-lightweight.jar
! %{_datadir}/%{name}/lib/wagon-http-shared.jar
! %{_datadir}/%{name}/lib/wagon-http.jar
! %{_datadir}/%{name}/lib/wagon-provider-api.jar
! %{_datadir}/%{name}/lib/wagon-ssh-common.jar
! %{_datadir}/%{name}/lib/wagon-ssh-external.jar
! %{_datadir}/%{name}/lib/wagon-ssh.jar
  %{_datadir}/%{name}/lib/nekohtml.jar
! %{_datadir}/%{name}/lib/container-default.jar
! %{_datadir}/%{name}/lib/interactivity-api.jar
  %{_datadir}/%{name}/lib/plexus-interpolation.jar
  %{_datadir}/%{name}/lib/plexus-cipher.jar
  %{_datadir}/%{name}/lib/plexus-sec-dispatcher.jar
! %{_datadir}/%{name}/lib/utils.jar
  %{_datadir}/%{name}/lib/slf4j-api.jar
  %{_datadir}/%{name}/lib/slf4j-nop.jar

--- NEW FILE: maven2-2.2.1-classworlds.patch ---
>From 75c19c93fe901004940bd1715861267a8387e9c0 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky at 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





More information about the JPackage-commits mailing list