[Jpackage-commits] dist/groovy15/JPP-6 groovy15-maven-tools-pom.patch, NONE, 1.1 groovy15.spec, 1.4, 1.5

jpackage jpackage at ryu.zarb.org
Thu Dec 16 15:18:08 CET 2010


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

Modified Files:
	groovy15.spec 
Added Files:
	groovy15-maven-tools-pom.patch 
Log Message:
tidy up

--- NEW FILE: groovy15-maven-tools-pom.patch ---
--- config/maven/groovy-tools.pom.sav	2010-12-16 14:33:14.000000000 +0100
+++ config/maven/groovy-tools.pom	2010-12-16 14:33:36.000000000 +0100
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>biz.aQute</groupId>
             <artifactId>bnd</artifactId>
-            <version>0.0.258</version>
+            <version>0.0.384</version>
         </dependency>
     </dependencies>
     <repositories>

Index: groovy15.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/groovy15/JPP-6/groovy15.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** groovy15.spec	15 Dec 2010 22:13:04 -0000	1.4
--- groovy15.spec	16 Dec 2010 14:18:05 -0000	1.5
***************
*** 50,53 ****
--- 50,54 ----
  Patch0:         groovy15-build-maven.patch
  Patch1:         groovy15-build.patch
+ Patch2:         groovy15-maven-tools-pom.patch
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
***************
*** 62,72 ****
  BuildRequires:  cobertura
  BuildRequires:  junit
- BuildRequires:  maven-ant-tasks
  BuildRequires:  xmlunit
  
- BuildRequires:  aqute-bndlib
  BuildRequires:  asm2 >= 0:2.2
  BuildRequires:  bsf
- BuildRequires:  cewolf
  BuildRequires:  cglib >= 0:2.1.3
  BuildRequires:  hsqldb
--- 63,70 ----
***************
*** 80,85 ****
  BuildRequires:  jakarta-oro
  BuildRequires:  jarjar
- BuildRequires:  jcommon
- BuildRequires:  jfreechart
  BuildRequires:  jline
  BuildRequires:  jmock
--- 78,81 ----
***************
*** 91,95 ****
  BuildRequires:  qdox
  BuildRequires:  servlet_2_4_api
- BuildRequires:  xmlgraphics-batik
  BuildRequires:  xpp3-minimal
  BuildRequires:  xstream
--- 87,90 ----
***************
*** 150,153 ****
--- 145,152 ----
      mv $j $j.no
  done
+ %patch0 -b .sav0
+ %patch1 -b .sav1
+ %patch2 -b .sav2
+ 
  pushd bootstrap
  ln -s $(build-classpath maven-ant-tasks)
***************
*** 164,169 ****
  mv security/GroovyJarTest.jar.no security/GroovyJarTest.jar
  
- %patch0 -b .sav0
- %patch1 -b .sav1
  
  mkdir -p target/lib/compile
--- 163,166 ----
***************
*** 183,188 ****
--- 180,192 ----
  ln -sf $(build-classpath mx4j/mx4j)
  ln -sf $(build-classpath servlet_2_4_api)
+ ln -sf $(build-classpath xpp3-minimal)
  ln -sf $(build-classpath xstream)
  popd
+ mkdir -p target/lib/examples
+ pushd target/lib/examples
+ ln -sf $(build-classpath commons-httpclient)
+ ln -sf $(build-classpath lucene1)
+ ln -sf $(build-classpath openejb1/loader)
+ popd
  mkdir -p target/lib/runtime
  pushd target/lib/runtime
***************
*** 204,207 ****
--- 208,212 ----
  ln -sf $(build-classpath mx4j/mx4j)
  ln -sf $(build-classpath servlet_2_4_api)
+ ln -sf $(build-classpath xpp3-minimal)
  ln -sf $(build-classpath xstream)
  popd
***************
*** 209,212 ****
--- 214,218 ----
  pushd target/lib/test
  ln -sf $(build-classpath ant17)
+ ln -sf $(build-classpath ant17-launcher)
  ln -sf $(build-classpath ant17/ant17-junit)
  ln -sf $(build-classpath antlr)
***************
*** 217,222 ****
  ln -sf $(build-classpath asm2/asm2-util)
  ln -sf $(build-classpath bsf)
! ln -sf $(build-classpath cglib21)
! ln -sf $(build-classpath cobertura)
  ln -sf $(build-classpath commons-cli)
  ln -sf $(build-classpath commons-logging)
--- 223,227 ----
  ln -sf $(build-classpath asm2/asm2-util)
  ln -sf $(build-classpath bsf)
! ln -sf $(build-classpath cglib21-nodep)
  ln -sf $(build-classpath commons-cli)
  ln -sf $(build-classpath commons-logging)
***************
*** 231,245 ****
  ln -sf $(build-classpath servlet_2_4_api)
  ln -sf $(build-classpath xmlunit)
  ln -sf $(build-classpath xstream)
  popd
  mkdir -p target/lib/tools
  pushd target/lib/tools
! ln -sf $(build-classpath ant17)
! ln -sf $(build-classpath ant17/ant17-junit)
  ln -sf $(build-classpath aqute-bndlib)
  ln -sf $(build-classpath jarjar)
! ln -sf $(build-classpath junit)
  popd
  
  %build
  
--- 236,261 ----
  ln -sf $(build-classpath servlet_2_4_api)
  ln -sf $(build-classpath xmlunit)
+ ln -sf $(build-classpath xpp3-minimal)
  ln -sf $(build-classpath xstream)
  popd
  mkdir -p target/lib/tools
  pushd target/lib/tools
! ln -sf $(build-classpath antlr)
! ln -sf $(build-classpath asm2/asm2)
  ln -sf $(build-classpath aqute-bndlib)
+ ln -sf $(build-classpath checkstyle4)
+ ln -sf $(build-classpath cobertura)
+ ln -sf $(build-classpath commons-beanutils)
+ ln -sf $(build-classpath commons-cli)
+ ln -sf $(build-classpath commons-collections)
+ ln -sf $(build-classpath commons-lang)
+ ln -sf $(build-classpath commons-logging)
  ln -sf $(build-classpath jarjar)
! ln -sf $(build-classpath log4j)
! ln -sf $(build-classpath oro)
! ln -sf $(build-classpath qdox161)
  popd
  
+ 
  %build
  
***************
*** 352,356 ****
  
  %changelog
! * Wed Dec 15 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.8-1
  - First JPP-6 release
  
--- 368,372 ----
  
  %changelog
! * Thu Dec 15 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.6-3
  - First JPP-6 release
  




More information about the JPackage-commits mailing list