[Jpackage-commits] rpms/devel/maven-plugin-tools maven-plugin-tools-model-pom.patch, 1.1, 1.2 maven-plugin-tools-plugin-plugin-pom.patch, 1.1, 1.2 maven-plugin-tools.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Sat Dec 4 14:29:50 CET 2010


Update of /home/projects/jpackage/cvs/rpms/devel/maven-plugin-tools
In directory ryu.zarb.org:/tmp/h9Dws7BXO7/rpms/devel/maven-plugin-tools

Modified Files:
	maven-plugin-tools-model-pom.patch 
	maven-plugin-tools-plugin-plugin-pom.patch 
	maven-plugin-tools.spec 
Log Message:
2.4.3-2.jpp6

Index: maven-plugin-tools-plugin-plugin-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/devel/maven-plugin-tools/maven-plugin-tools-plugin-plugin-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-plugin-tools-plugin-plugin-pom.patch	3 Oct 2010 16:25:49 -0000	1.1
--- maven-plugin-tools-plugin-plugin-pom.patch	4 Dec 2010 13:29:48 -0000	1.2
***************
*** 1,4 ****
! --- maven-plugin-plugin/pom.xml.sav1	2008-08-14 13:35:08.000000000 +0200
! +++ maven-plugin-plugin/pom.xml	2010-10-02 20:29:41.000000000 +0200
  @@ -218,6 +218,7 @@
         </plugins>
--- 1,4 ----
! --- maven-plugin-plugin/pom.xml.sav2	2008-08-14 13:35:08.000000000 +0200
! +++ maven-plugin-plugin/pom.xml	2010-12-04 13:31:42.000000000 +0100
  @@ -218,6 +218,7 @@
         </plugins>
***************
*** 22,27 ****
             <version>1.0.0</version>
  -          <models>
!              <model>src/main/mdo/pluginRequirements.mdo</model>
  -          </models>
           </configuration>
         </plugin>
--- 22,28 ----
             <version>1.0.0</version>
  -          <models>
! -            <model>src/main/mdo/pluginRequirements.mdo</model>
  -          </models>
+ +            <models><model>src/main/mdo/pluginRequirements.mdo</model></models>
           </configuration>
         </plugin>

Index: maven-plugin-tools.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/devel/maven-plugin-tools/maven-plugin-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-plugin-tools.spec	3 Oct 2010 16:25:49 -0000	1.1
--- maven-plugin-tools.spec	4 Dec 2010 13:29:48 -0000	1.2
***************
*** 33,37 ****
  Name:           maven-plugin-tools
  Version:        2.4.3
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Maven Plugin Tools
--- 33,37 ----
  Name:           maven-plugin-tools
  Version:        2.4.3
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Maven Plugin Tools
***************
*** 191,222 ****
--- 191,230 ----
                  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}.pom
  %add_to_maven_depmap org.apache.maven.plugin-tools %{name} %{version} JPP/%{name} %{name}
+ %add_to_maven_depmap org.apache.maven %{name} %{version} JPP/%{name} %{name}
   
  install -pm 644 maven-plugin-tools-ant/pom.xml \
                  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-ant.pom
  %add_to_maven_depmap org.apache.maven.plugin-tools %{name}-ant %{version} JPP/%{name} ant
+ %add_to_maven_depmap org.apache.maven %{name}-ant %{version} JPP/%{name} ant
  
  install -pm 644 maven-plugin-tools-api/pom.xml \
                  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-api.pom
  %add_to_maven_depmap org.apache.maven.plugin-tools %{name}-api %{version} JPP/%{name} api
+ %add_to_maven_depmap org.apache.maven %{name}-api %{version} JPP/%{name} api
  
  install -pm 644 maven-plugin-tools-beanshell/pom.xml \
                  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-beanshell.pom
  %add_to_maven_depmap org.apache.maven.plugin-tools %{name}-beanshell %{version} JPP/%{name} beanshell
+ %add_to_maven_depmap org.apache.maven %{name}-beanshell %{version} JPP/%{name} beanshell
  
  install -pm 644 maven-plugin-tools-java/pom.xml \
                  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-java.pom
  %add_to_maven_depmap org.apache.maven.plugin-tools %{name}-java %{version} JPP/%{name} java
+ %add_to_maven_depmap org.apache.maven %{name}-java %{version} JPP/%{name} java
  
  install -pm 644 maven-plugin-tools-javadoc/pom.xml \
                  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-javadoc.pom
  %add_to_maven_depmap org.apache.maven.plugin-tools %{name}-javadoc %{version} JPP/%{name} javadoc
+ %add_to_maven_depmap org.apache.maven %{name}-javadoc %{version} JPP/%{name} javadoc
  
  install -pm 644 maven-plugin-tools-model/pom.xml \
                  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-model.pom
  %add_to_maven_depmap org.apache.maven.plugin-tools %{name}-model %{version} JPP/%{name} model
+ %add_to_maven_depmap org.apache.maven %{name}-model %{version} JPP/%{name} model
  
  install -pm 644 maven-plugin-plugin/pom.xml \
                  $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-plugin-plugin.pom
  %add_to_maven_depmap org.apache.maven.plugins maven-plugin-plugin %{version} JPP/%{name} plugin-plugin
+ %add_to_maven_depmap org.apache.maven.plugins maven-plugin-plugin %{version} JPP/%{name} plugin-plugin
  
  # javadoc
***************
*** 269,272 ****
--- 277,284 ----
  
  %changelog
+ * Sat Dec 04 2010 Ralph Apel <r.apel at r-apel.de> - 0:2.4.3-2
+ - Add alternative depmaps
+ - Fix for modello-1.3
+ 
  * Sat Oct 02 2010 Ralph Apel <r.apel at r-apel.de> - 0:2.4.3-1
  - 2.4.3 adding maven-plugin-tools-javadoc

Index: maven-plugin-tools-model-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/devel/maven-plugin-tools/maven-plugin-tools-model-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-plugin-tools-model-pom.patch	3 Oct 2010 16:25:49 -0000	1.1
--- maven-plugin-tools-model-pom.patch	4 Dec 2010 13:29:48 -0000	1.2
***************
*** 1,4 ****
! --- maven-plugin-tools-model/pom.xml.sav	2010-10-02 20:21:02.000000000 +0200
! +++ maven-plugin-tools-model/pom.xml	2010-10-02 20:21:32.000000000 +0200
  @@ -64,9 +64,7 @@
           <artifactId>modello-maven-plugin</artifactId>
--- 1,4 ----
! --- maven-plugin-tools-model/pom.xml.sav1	2008-08-14 13:35:08.000000000 +0200
! +++ maven-plugin-tools-model/pom.xml	2010-12-04 13:30:33.000000000 +0100
  @@ -64,9 +64,7 @@
           <artifactId>modello-maven-plugin</artifactId>
***************
*** 6,11 ****
           <configuration>
  -          <models>
!              <model>src/main/mdo/plugin-metadata.mdo</model>
  -          </models>
             <version>1.0.0</version>
           </configuration>
--- 6,12 ----
           <configuration>
  -          <models>
! -            <model>src/main/mdo/plugin-metadata.mdo</model>
  -          </models>
+ +            <models><model>src/main/mdo/plugin-metadata.mdo</model></models>
             <version>1.0.0</version>
           </configuration>




More information about the JPackage-commits mailing list