[Jpackage-commits] dist/maven2/JPP-6 maven2.spec,1.24,1.25

jpackage jpackage at ryu.zarb.org
Sat Dec 4 16:26:24 CET 2010


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

Modified Files:
	maven2.spec 
Log Message:
revert

Index: maven2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/maven2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** maven2.spec	4 Dec 2010 15:20:43 -0000	1.24
--- maven2.spec	4 Dec 2010 15:26:22 -0000	1.25
***************
*** 198,203 ****
  BuildRequires:    maven-doxia >= 1.0
  BuildRequires:    maven-plugin-tools
- BuildRequires:    modello >= 1.3
- #BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
  BuildRequires:    nekohtml >= 0.9.3
  BuildRequires:    oro >= 2.0.8
--- 198,201 ----
***************
*** 216,221 ****
  BuildRequires:    saxon-scripts
  BuildRequires:    saxpath
! BuildRequires:    velocity14
! BuildRequires:    velocity > 1.4
  BuildRequires:    xerces-j2 >= 2.7.1
  BuildRequires:    xalan-j2 >= 2.6.0
--- 214,218 ----
  BuildRequires:    saxon-scripts
  BuildRequires:    saxpath
! BuildRequires:    velocity >= 1.4
  BuildRequires:    xerces-j2 >= 2.7.1
  BuildRequires:    xalan-j2 >= 2.6.0
***************
*** 248,251 ****
--- 245,249 ----
  BuildRequires:    maven-scm-test >= 0:1.0-0.b3.2
  BuildRequires:    maven-shared-common-artifact-filters
+ BuildRequires:    maven-shared-dependency-analyzer
  BuildRequires:    maven-shared-dependency-tree
  BuildRequires:    maven-shared-downloader
***************
*** 256,270 ****
  BuildRequires:    maven-shared-invoker
  BuildRequires:    maven-shared-jar
- BuildRequires:    maven-shared-dependency-analyzer
  BuildRequires:    maven-shared-model-converter
  BuildRequires:    maven-shared-plugin-tools-api
  BuildRequires:    maven-shared-plugin-tools-beanshell
  BuildRequires:    maven-shared-plugin-tools-java
- BuildRequires:    maven-shared-verifier
- BuildRequires:    maven-shared-plugin-testing-tools
  BuildRequires:    maven-shared-reporting-impl
  BuildRequires:    maven-surefire >= 2.0
  BuildRequires:    maven-surefire-provider-junit
  BuildRequires:    maven-surefire-booter >= 2.0
  BuildRequires:    plexus-digest
  BuildRequires:    plexus-maven-plugin >= 1.3.5
--- 254,269 ----
  BuildRequires:    maven-shared-invoker
  BuildRequires:    maven-shared-jar
  BuildRequires:    maven-shared-model-converter
+ BuildRequires:    maven-shared-plugin-testing-tools
  BuildRequires:    maven-shared-plugin-tools-api
  BuildRequires:    maven-shared-plugin-tools-beanshell
  BuildRequires:    maven-shared-plugin-tools-java
  BuildRequires:    maven-shared-reporting-impl
+ BuildRequires:    maven-shared-verifier
  BuildRequires:    maven-surefire >= 2.0
  BuildRequires:    maven-surefire-provider-junit
  BuildRequires:    maven-surefire-booter >= 2.0
+ BuildRequires:    modello >= 1.0-0.a8.3
+ BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
  BuildRequires:    plexus-digest
  BuildRequires:    plexus-maven-plugin >= 1.3.5
***************
*** 1165,1168 ****
--- 1164,1168 ----
  
  %prep
+ #rpm -ql maven-surefire
  
  %setup -q -c -n %{name}
***************
*** 1275,1298 ****
  rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
  
- # extract jars iff in bootstrap mode
- %if %with bootstrap
  # extract poms and jars (if any)
  tar xzf %{SOURCE3}
! rm m2_repo/repository/JPP/maven2/poms/JPP.modello*.pom
  tar xzf %{SOURCE4}
- rm -rf m2_repo/repository/JPP/modello/*
- cp $(build-classpath modello/plugin-converters) m2_repo/repository/JPP/modello/
- cp $(build-classpath modello/plugin-dom4j) m2_repo/repository/JPP/modello/
- cp $(build-classpath modello/plugin-java) m2_repo/repository/JPP/modello/
- cp $(build-classpath modello/plugin-jdom) m2_repo/repository/JPP/modello/
- cp $(build-classpath modello/plugin-stax) m2_repo/repository/JPP/modello/
- cp $(build-classpath modello/plugin-xdoc) m2_repo/repository/JPP/modello/
- cp $(build-classpath modello/plugin-xpp3) m2_repo/repository/JPP/modello/
- cp $(build-classpath modello/plugin-xsd) m2_repo/repository/JPP/modello/
  cp $(build-classpath plexus/utils) m2_repo/repository/JPP/plexus/
  %endif
  
  # Copy model-v3
- mkdir -p m2_repo/repository/JPP/maven2/
  cp -p %{SOURCE10} m2_repo/repository/JPP/maven2/model-v3.jar
  
--- 1275,1288 ----
  rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
  
  # extract poms and jars (if any)
  tar xzf %{SOURCE3}
! 
! # extract jars iff in bootstrap mode
! %if %with bootstrap
  tar xzf %{SOURCE4}
  cp $(build-classpath plexus/utils) m2_repo/repository/JPP/plexus/
  %endif
  
  # Copy model-v3
  cp -p %{SOURCE10} m2_repo/repository/JPP/maven2/model-v3.jar
  




More information about the JPackage-commits mailing list