[Jpackage-commits] dist/cargo/JPP-6 cargo-jpp-depmap.xml, 1.4, 1.5 cargo.spec, 1.26, 1.27

jpackage jpackage at ryu.zarb.org
Sun Dec 5 15:47:27 CET 2010


Update of /home/projects/jpackage/cvs/dist/cargo/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv18214

Modified Files:
	cargo-jpp-depmap.xml cargo.spec 
Log Message:
Adapt to modello-1.3

Index: cargo.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/cargo/JPP-6/cargo.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -C 2 -d -r1.26 -r1.27
*** cargo.spec	9 Jan 2010 15:52:29 -0000	1.26
--- cargo.spec	5 Dec 2010 14:47:25 -0000	1.27
***************
*** 1,3 ****
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 45,49 ****
  Name:           cargo
  Version:        1.0
! Release:	3%{?dist}
  Epoch:          0
  Summary:        Cargo container wrapper
--- 45,49 ----
  Name:           cargo
  Version:        1.0
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Cargo container wrapper
***************
*** 75,84 ****
  Patch8:         cargo-extensions-no-maven.patch
  Patch9:         cargo-extensions-no-maven2-archetypes.patch
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
  Requires:       ant >= 0:1.6
! Requires:       jakarta-commons-codec
! Requires:       jakarta-commons-vfs
! Requires:       java >= 0:1.5.0
  Requires:       javamail
  Requires:       jdom
--- 75,84 ----
  Patch8:         cargo-extensions-no-maven.patch
  Patch9:         cargo-extensions-no-maven2-archetypes.patch
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  Requires:       ant >= 0:1.6
! Requires:       apache-commons-codec
! Requires:       apache-commons-vfs
! Requires:       java >= 0:1.6.0
  Requires:       javamail
  Requires:       jdom
***************
*** 102,113 ****
  BuildRequires:  geronimo-servlet-2.4-api
  BuildRequires:  gnu-trove
! BuildRequires:  java-devel >= 0:1.5.0
! BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  jetty6
  BuildRequires:  jetty6-core
  BuildRequires:  jmock
  BuildRequires:  junit
! BuildRequires:  jakarta-commons-codec
! BuildRequires:  jakarta-commons-vfs
  BuildRequires:  jdom
  BuildRequires:  jline
--- 102,113 ----
  BuildRequires:  geronimo-servlet-2.4-api
  BuildRequires:  gnu-trove
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  jetty6
  BuildRequires:  jetty6-core
  BuildRequires:  jmock
  BuildRequires:  junit
! BuildRequires:  apache-commons-codec
! BuildRequires:  apache-commons-vfs
  BuildRequires:  jdom
  BuildRequires:  jline
***************
*** 200,206 ****
  mkdir -p pom
  cp -p %{SOURCE4} pom/pom.xml
! mkdir -p .m2/repository/JPP/maven2/default_poms/
  cp -p %{SOURCE4} \
!     .m2/repository/JPP/maven2/default_poms/org.codehaus.cargo-cargo-parent.pom
  cp -p %{SOURCE5} settings.xml
  
--- 200,209 ----
  mkdir -p pom
  cp -p %{SOURCE4} pom/pom.xml
! mkdir -p .m2/repository/org/codehaus/cargo/cargo-parent/2/
  cp -p %{SOURCE4} \
!     .m2/repository/org/codehaus/cargo/cargo-parent/2/cargo-parent-2.pom
! mkdir -p .m2/repository/org/codehaus/cargo/cargo-parent/4.1/
! cp -p %{SOURCE4} \
!     .m2/repository/org/codehaus/cargo/cargo-parent/4.1/cargo-parent-4.1.pom
  cp -p %{SOURCE5} settings.xml
  
***************
*** 217,221 ****
  %patch7 -b .sav7
  %patch8 -b .sav8
! %patch9 -b .sav9
  
  %if %with maven
--- 220,224 ----
  %patch7 -b .sav7
  %patch8 -b .sav8
! #%patch9 -b .sav9
  
  %if %with maven
***************
*** 554,559 ****
  
  %changelog
! * Sat Jan 09 2010 Will Tatam <will.tatam at red61.com> 1.0-3
! - Auto rebuild for JPackage 6 in centos5 mock
  
  * Tue Oct 06 2009 David Walluck <dwalluck at redhat.com> 0:1.0-2
--- 557,562 ----
  
  %changelog
! * Mon Nov 29 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0-3
! - Adapt to modello-1.3
  
  * Tue Oct 06 2009 David Walluck <dwalluck at redhat.com> 0:1.0-2

Index: cargo-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/cargo/JPP-6/cargo-jpp-depmap.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cargo-jpp-depmap.xml	5 Oct 2009 20:49:28 -0000	1.4
--- cargo-jpp-depmap.xml	5 Dec 2010 14:47:25 -0000	1.5
***************
*** 169,171 ****
--- 169,197 ----
          </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>
+ 
+         <dependency>
+                 <maven>
+                         <groupId>com.thoughtworks.qdox</groupId>
+                         <artifactId>qdox</artifactId>
+                         <version>1.6.3</version>
+                 </maven>
+                 <jpp>
+                         <groupId>JPP</groupId>
+                         <artifactId>qdox</artifactId>
+                         <version>1.6.1</version>
+                 </jpp>
+         </dependency>
+ 
  </dependencies>




More information about the JPackage-commits mailing list