[Jpackage-commits] dist/maven-model/JPP-6 maven-model-3.0.2-pom.patch, 1.1, 1.2 maven-model.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Sun Dec 5 20:16:57 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven-model/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv11931

Modified Files:
	maven-model-3.0.2-pom.patch maven-model.spec 
Log Message:
3.0.2-7

Index: maven-model.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-model/JPP-6/maven-model.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-model.spec	16 Sep 2010 06:15:19 -0000	1.1
--- maven-model.spec	5 Dec 2010 19:16:55 -0000	1.2
***************
*** 39,43 ****
  Name:           maven-model
  Version:        3.0.2
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Maven Model
--- 39,43 ----
  Name:           maven-model
  Version:        3.0.2
! Release:        7%{?dist}
  Epoch:          0
  Summary:        Maven Model
***************
*** 54,62 ****
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  %if %{with_maven}
! BuildRequires:  maven
! BuildRequires:  maven-plugin-modello
  %endif
  BuildRequires:  stax_1_0_api
--- 54,71 ----
  
  BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
  %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.8
! BuildRequires:  maven2-default-skin
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-project-info-reports
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-site
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  modello-maven-plugin
  %endif
  BuildRequires:  stax_1_0_api
***************
*** 64,75 ****
  BuildRequires:  dom4j
  BuildRequires:  jdom
! BuildRequires:  modello >= 0:1.0-0.a15
  BuildRequires:  plexus-classworlds
! BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils
  BuildRequires:  stax-utils
  
! Requires(post):    jpackage-utils >= 0:5.0.0
! Requires(postun):  jpackage-utils >= 0:5.0.0
  
  Requires:  java >= 0:1.6.0
--- 73,85 ----
  BuildRequires:  dom4j
  BuildRequires:  jdom
! BuildRequires:  modello >= 0:1.3
! BuildRequires:  plexus-build-api
  BuildRequires:  plexus-classworlds
! BuildRequires:  plexus-containers-container-default
  BuildRequires:  plexus-utils
  BuildRequires:  stax-utils
  
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  Requires:  java >= 0:1.6.0
***************
*** 128,131 ****
--- 138,142 ----
  modello/core \
  modello/plugin-dom4j \
+ modello/plugin-java \
  modello/plugin-jdom \
  modello/plugin-stax \
***************
*** 133,167 ****
  modello/plugin-xpp3 \
  modello/plugin-xsd \
  plexus/classworlds \
! plexus/container-default \
  plexus/utils \
  stax-utils \
  )
  
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo java target/generated-sources 4.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xsd  target/generated-sources 4.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo jdom-writer target/generated-sources 4.0.0 false
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xpp3-reader target/generated-sources 4.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xpp3-writer target/generated-sources 4.0.0 false
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo dom4j-reader target/generated-sources 4.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo dom4j-writer target/generated-sources 4.0.0 false
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo stax-reader target/generated-sources 4.0.0 false
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo stax-writer target/generated-sources 4.0.0 false
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo java target/generated-sources 3.0.0 true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xsd  target/generated-sources 3.0.0 true
! #java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo jdom-writer  target/generated-sources 3.0.0 true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xpp3-reader target/generated-sources 3.0.0 true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xpp3-writer target/generated-sources 3.0.0 true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo dom4j-reader target/generated-sources 3.0.0 true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo dom4j-writer target/generated-sources 3.0.0 true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo stax-reader target/generated-sources 3.0.0 true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo stax-writer target/generated-sources 3.0.0 true
  
  
--- 144,179 ----
  modello/plugin-xpp3 \
  modello/plugin-xsd \
+ plexus-build-api \
  plexus/classworlds \
! plexus/containers-container-default \
  plexus/utils \
  stax-utils \
  )
  
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo java target/generated-sources 4.0.0 false true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xsd  target/generated-sources 4.0.0 false true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo jdom-writer target/generated-sources 4.0.0 false true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xpp3-reader target/generated-sources 4.0.0 false true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xpp3-writer target/generated-sources 4.0.0 false true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo dom4j-reader target/generated-sources 4.0.0 false true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo dom4j-writer target/generated-sources 4.0.0 false true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo stax-reader target/generated-sources 4.0.0 false true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo stax-writer target/generated-sources 4.0.0 false true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo java target/generated-sources 3.0.0 true true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xsd  target/generated-sources 3.0.0 true true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo jdom-writer  target/generated-sources 3.0.0 true true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xpp3-reader target/generated-sources 3.0.0 true true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo xpp3-writer target/generated-sources 3.0.0 true true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo dom4j-reader target/generated-sources 3.0.0 true true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo dom4j-writer target/generated-sources 3.0.0 true true
  #
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo stax-reader target/generated-sources 3.0.0 true true
! java org.codehaus.modello.ModelloCli src/main/mdo/maven.mdo stax-writer target/generated-sources 3.0.0 true true
  
  
***************
*** 172,185 ****
  sed -e 's/org\.apache\.maven\.model/org.apache.maven.project/' src/main/mdo/maven.mdo > target/maven.mdo.m1
  #    <modello:generate model="target/maven.mdo.m1" type="java" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 java target/generated-sources 3.0.0 false
  #    <modello:generate model="target/maven.mdo.m1" type="xpp3-reader" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 xpp3-reader target/generated-sources 3.0.0 false
  #    <modello:generate model="target/maven.mdo.m1" type="xpp3-writer" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 xpp3-writer target/generated-sources 3.0.0 false
  #
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 dom4j-reader target/generated-sources 3.0.0 false
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 dom4j-writer target/generated-sources 3.0.0 false
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 stax-reader target/generated-sources 3.0.0 false
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 stax-writer target/generated-sources 3.0.0 false
  
  ant -Dbuild.sysclasspath=only jar javadoc
--- 184,197 ----
  sed -e 's/org\.apache\.maven\.model/org.apache.maven.project/' src/main/mdo/maven.mdo > target/maven.mdo.m1
  #    <modello:generate model="target/maven.mdo.m1" type="java" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 java target/generated-sources 3.0.0 false true
  #    <modello:generate model="target/maven.mdo.m1" type="xpp3-reader" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 xpp3-reader target/generated-sources 3.0.0 false true
  #    <modello:generate model="target/maven.mdo.m1" type="xpp3-writer" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 xpp3-writer target/generated-sources 3.0.0 false true
  #
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 dom4j-reader target/generated-sources 3.0.0 false true
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 dom4j-writer target/generated-sources 3.0.0 false true
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 stax-reader target/generated-sources 3.0.0 false true
! java org.codehaus.modello.ModelloCli target/maven.mdo.m1 stax-writer target/generated-sources 3.0.0 false true
  
  ant -Dbuild.sysclasspath=only jar javadoc
***************
*** 245,248 ****
--- 257,264 ----
  
  %changelog
+ * Thu Dec 02 2010 Ralph Apel <r.apel at r-apel.de> - 0:3.0.2-7
+ - Adapt to modello-1.3
+ - Fix maven2 build
+ 
  * Thu Sep 16 2010 Ralph Apel <r.apel at r-apel.de> - 0:3.0.2-6
  - Move this to free now

Index: maven-model-3.0.2-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-model/JPP-6/maven-model-3.0.2-pom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** maven-model-3.0.2-pom.patch	16 Sep 2010 06:15:19 -0000	1.1
--- maven-model-3.0.2-pom.patch	5 Dec 2010 19:16:55 -0000	1.2
***************
*** 1,4 ****
! --- pom.xml.sav	2009-10-30 16:23:29.000000000 +0100
! +++ pom.xml	2009-10-30 16:24:40.000000000 +0100
  @@ -28,6 +28,7 @@
     </parent>
--- 1,4 ----
! --- pom.xml.sav0	2007-02-28 23:50:48.000000000 +0100
! +++ pom.xml	2010-12-02 19:22:41.000000000 +0100
  @@ -28,6 +28,7 @@
     </parent>
***************
*** 9,10 ****
--- 9,19 ----
     <description>Maven Model</description>
     <build>
+ @@ -37,7 +38,7 @@
+          <artifactId>modello-maven-plugin</artifactId>
+          <configuration>
+            <version>4.0.0</version>
+ -          <model>src/main/mdo/maven.mdo</model>
+ +          <models><model>src/main/mdo/maven.mdo</model></models>
+          </configuration>
+          <executions>
+            <execution>




More information about the JPackage-commits mailing list