[Jpackage-commits] dist/plexus-containers/devel plexus-containers.spec, 1.22, 1.23

jpackage jpackage at ryu.zarb.org
Tue Dec 14 20:31:48 CET 2010


Update of /home/projects/jpackage/cvs/dist/plexus-containers/devel
In directory ryu.zarb.org:/tmp/cvs-serv6215

Modified Files:
	plexus-containers.spec 
Log Message:
1.5.1-2 depmap plexus-component-metadata

Index: plexus-containers.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-containers/devel/plexus-containers.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** plexus-containers.spec	14 Dec 2010 16:28:21 -0000	1.22
--- plexus-containers.spec	14 Dec 2010 19:31:46 -0000	1.23
***************
*** 42,46 ****
  Name:           %{parent}-%{subname}
  Version:        1.5.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Containers for Plexus
--- 42,46 ----
  Name:           %{parent}-%{subname}
  Version:        1.5.1
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Containers for Plexus
***************
*** 70,85 ****
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
- BuildRequires:  maven2-plugin-invoker
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-resources
- BuildRequires:  maven2-common-poms >= 1.0
  BuildRequires:  maven-surefire-maven-plugin
  BuildRequires:  maven-surefire-provider-junit
  BuildRequires:  maven-doxia
  BuildRequires:  maven-doxia-sitetools
! BuildRequires:  maven-plugin-tools
  BuildRequires:  maven-release
- BuildRequires:  apache-commons-parent
  %else
  BuildRequires:  ant >= 0:1.7.1
--- 70,82 ----
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
  BuildRequires:  maven2-plugin-jar
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven-surefire-maven-plugin
  BuildRequires:  maven-surefire-provider-junit
  BuildRequires:  maven-doxia
  BuildRequires:  maven-doxia-sitetools
! BuildRequires:  maven2-common-poms >= 1.0
  BuildRequires:  maven-release
  %else
  BuildRequires:  ant >= 0:1.7.1
***************
*** 87,96 ****
  BuildRequires:  junit
  %endif
- BuildRequires:  google-collections08
  BuildRequires:  plexus-classworlds >= 0:2.2.2
- BuildRequires:  plexus-cli
  BuildRequires:  plexus-utils
  BuildRequires:  qdox >= 0:1.9.2
- BuildRequires:  xbean >= 0:3.4
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
--- 84,90 ----
***************
*** 100,109 ****
  
  Requires:  java >= 0:1.6.0
- Requires:  google-collections08
  Requires:  plexus-classworlds >= 0:2.2.2
- Requires:  plexus-cli
  Requires:  plexus-utils
  Requires:  qdox >= 0:1.9.2
- Requires:  xbean >= 0:3.4
  
  Requires(post):    jpackage-utils >= 0:1.7.5
--- 94,100 ----
***************
*** 191,203 ****
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven2.jpp.depmap.file=%{SOURCE4} \
-         -Dmaven.test.failure.ignore=true \
-         install 
- 
-     mvn-jpp \
-         -e -s $(pwd)/settings.xml \
-         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-         -Dmaven2.jpp.depmap.file=%{SOURCE4} \
          -Daggregate=true \
!         javadoc:aggregate
  
  %else
--- 182,187 ----
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven2.jpp.depmap.file=%{SOURCE4} \
          -Daggregate=true \
!         install javadoc:javadoc
  
  %else
***************
*** 246,250 ****
  %add_to_maven_depmap org.codehaus.plexus containers-component-annotations  %{namedversion} JPP/%{parent} containers-component-annotations
  %add_to_maven_depmap org.codehaus.plexus containers-component-metadata  %{namedversion} JPP/%{parent} containers-component-metadata
! %add_to_maven_depmap org.codehaus.plexus containers-component-javadoc  %{namedversion} JPP/%{parent} containers-component-javadoc
  %add_to_maven_depmap org.codehaus.plexus plexus-component-javadoc  %{namedversion} JPP/%{parent} containers-component-javadoc
  %add_to_maven_depmap org.codehaus.plexus plexus-javadoc  %{namedversion} JPP/%{parent} containers-component-javadoc
--- 230,234 ----
  %add_to_maven_depmap org.codehaus.plexus containers-component-annotations  %{namedversion} JPP/%{parent} containers-component-annotations
  %add_to_maven_depmap org.codehaus.plexus containers-component-metadata  %{namedversion} JPP/%{parent} containers-component-metadata
! %add_to_maven_depmap org.codehaus.plexus plexus-component-metadata  %{namedversion} JPP/%{parent} containers-component-metadata
  %add_to_maven_depmap org.codehaus.plexus plexus-component-javadoc  %{namedversion} JPP/%{parent} containers-component-javadoc
  %add_to_maven_depmap org.codehaus.plexus plexus-javadoc  %{namedversion} JPP/%{parent} containers-component-javadoc
***************
*** 378,381 ****
--- 362,368 ----
  
  %changelog
+ * Tue Dec 07 2010 Ralph Apel <r.apel at r-apel.de> 1.5.1-2
+ - Depmap plexus-component-metadata
+ 
  * Tue Dec 07 2010 Ralph Apel <r.apel at r-apel.de> 1.5.1-1
  - 1.5.1




More information about the JPackage-commits mailing list