[Jpackage-commits] rpms/free/maven maven-1.1-MavenUtilsTest.java, 1.2, 1.2.2.1 maven-plugins-r565288.patch, 1.2, 1.2.2.1 maven-plugins-sandbox-r565288.patch, 1.2, 1.2.2.1 maven.spec, 1.2, 1.2.2.1

jpackage jpackage at ryu.zarb.org
Sun Feb 8 13:57:56 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/maven
In directory ryu.zarb.org:/tmp/kUKKrtr4mF/rpms/free/maven

Modified Files:
      Tag: JPACKAGE-5_0
	maven-1.1-MavenUtilsTest.java maven-plugins-r565288.patch 
	maven-plugins-sandbox-r565288.patch maven.spec 
Log Message:
1.1-6.jpp5

Index: maven-plugins-sandbox-r565288.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven/maven-plugins-sandbox-r565288.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** maven-plugins-sandbox-r565288.patch	5 Aug 2008 10:59:48 -0000	1.2
--- maven-plugins-sandbox-r565288.patch	8 Feb 2009 12:57:54 -0000	1.2.2.1
***************
*** 369,373 ****
         <artifactId>castor</artifactId>
         <version>0.9.5</version>
! +      <jar>castor.jar</jar>
       </dependency>
     </dependencies>
--- 369,373 ----
         <artifactId>castor</artifactId>
         <version>0.9.5</version>
! +      <jar>castor0.jar</jar>
       </dependency>
     </dependencies>
***************
*** 411,415 ****
         <artifactId>castor</artifactId>
         <version>0.9.4.3</version>
! +      <jar>castor.jar</jar>
       </dependency>
       <dependency>
--- 411,415 ----
         <artifactId>castor</artifactId>
         <version>0.9.4.3</version>
! +      <jar>castor0.jar</jar>
       </dependency>
       <dependency>

Index: maven-plugins-r565288.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven/maven-plugins-r565288.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** maven-plugins-r565288.patch	5 Aug 2008 10:59:48 -0000	1.2
--- maven-plugins-r565288.patch	8 Feb 2009 12:57:53 -0000	1.2.2.1
***************
*** 3679,3684 ****
  -          <ant:pathelement location="${plugin.getDependencyPath('regexp:regexp')}"/>
  -          <ant:pathelement location="${plugin.getDependencyPath('commons-beanutils:commons-beanutils-core')}"/>
! +          <ant:pathelement location="${plugin.getDependencyPath('JPP:checkstyle')}"/>
! +          <ant:pathelement location="${plugin.getDependencyPath('JPP:checkstyle-optional')}"/>
  +          <ant:pathelement location="${plugin.getDependencyPath('JPP:antlr')}"/>
  +          <ant:pathelement location="${plugin.getDependencyPath('JPP:regexp')}"/>
--- 3679,3684 ----
  -          <ant:pathelement location="${plugin.getDependencyPath('regexp:regexp')}"/>
  -          <ant:pathelement location="${plugin.getDependencyPath('commons-beanutils:commons-beanutils-core')}"/>
! +          <ant:pathelement location="${plugin.getDependencyPath('JPP:checkstyle4')}"/>
! +          <ant:pathelement location="${plugin.getDependencyPath('JPP:checkstyle4-optional')}"/>
  +          <ant:pathelement location="${plugin.getDependencyPath('JPP:antlr')}"/>
  +          <ant:pathelement location="${plugin.getDependencyPath('JPP:regexp')}"/>
***************
*** 3707,3711 ****
         <artifactId>checkstyle</artifactId>
         <version>4.3</version>
! +      <jar>checkstyle.jar</jar>
         <properties>
           <classloader>root</classloader>
--- 3707,3711 ----
         <artifactId>checkstyle</artifactId>
         <version>4.3</version>
! +      <jar>checkstyle4.jar</jar>
         <properties>
           <classloader>root</classloader>
***************
*** 3717,3721 ****
         <artifactId>checkstyle-optional</artifactId>
         <version>4.3</version>
! +      <jar>checkstyle-optional.jar</jar>
         <properties>
           <classloader>root</classloader>
--- 3717,3721 ----
         <artifactId>checkstyle-optional</artifactId>
         <version>4.3</version>
! +      <jar>checkstyle4-optional.jar</jar>
         <properties>
           <classloader>root</classloader>

Index: maven.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/maven/maven.spec,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** maven.spec	5 Aug 2008 10:59:48 -0000	1.2
--- maven.spec	8 Feb 2009 12:57:54 -0000	1.2.2.1
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 42,54 ****
  %define ver_jelly_tags 1.0.1
  
  Name:           maven
  Version:        1.1
! Release:        5%{dist}
  Epoch:          0
  Summary:        Java project management and project comprehension tool
  
  Group:          Development/Build Tools
- #Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
- #Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
  License:        Apache Software License 2.0
  URL:            http://maven.apache.org/
--- 42,54 ----
  %define ver_jelly_tags 1.0.1
  
+ %define __os_install_post %{nil}
+ 
  Name:           maven
  Version:        1.1
! Release:        6%{dist}
  Epoch:          0
  Summary:        Java project management and project comprehension tool
  
  Group:          Development/Build Tools
  License:        Apache Software License 2.0
  URL:            http://maven.apache.org/
***************
*** 134,137 ****
--- 134,138 ----
  BuildRequires:  plexus-containers-container-default 
  BuildRequires:  plexus-utils >= 0:1.0.3
+ BuildRequires:  qname_1_1_api
  BuildRequires:  stax-utils
  BuildRequires:  werkz >= 1.0-0.b10.5jpp
***************
*** 444,449 ****
  Group:          Development/Build Tools
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! BuildRequires:  castor >= 0:0.9.5
! Requires:  castor >= 0:0.9.5
  Provides:  maven-plugin-castor = %{epoch}:%{version}-%{release}
  
--- 445,450 ----
  Group:          Development/Build Tools
  Requires:       %{name} = %{epoch}:%{version}-%{release}
! BuildRequires:  castor0 >= 0:0.9.5
! Requires:  castor0 >= 0:0.9.5
  Provides:  maven-plugin-castor = %{epoch}:%{version}-%{release}
  
***************
*** 508,519 ****
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  BuildRequires:  antlr >= 0:2.7.6
! BuildRequires:  checkstyle >= 0:4.3
! BuildRequires:  checkstyle-optional >= 0:4.3
  BuildRequires:  jakarta-commons-beanutils >= 0:1.7.0
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  regexp >= 0:1.3
  Requires:  antlr >= 0:2.7.6
! Requires:  checkstyle >= 0:4.3
! Requires:  checkstyle-optional >= 0:4.3
  Requires:  jakarta-commons-beanutils >= 0:1.7.0
  Requires:  regexp >= 0:1.3
--- 509,520 ----
  Requires:       %{name} = %{epoch}:%{version}-%{release}
  BuildRequires:  antlr >= 0:2.7.6
! BuildRequires:  checkstyle4 >= 0:4.4
! BuildRequires:  checkstyle4-optional >= 0:4.4
  BuildRequires:  jakarta-commons-beanutils >= 0:1.7.0
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  regexp >= 0:1.3
  Requires:  antlr >= 0:2.7.6
! Requires:  checkstyle4 >= 0:4.4
! Requires:  checkstyle4-optional >= 0:4.4
  Requires:  jakarta-commons-beanutils >= 0:1.7.0
  Requires:  regexp >= 0:1.3
***************
*** 1213,1216 ****
--- 1214,1218 ----
  BuildRequires:  xmlgraphics-batik-rasterizer >= 0:1.6
  BuildRequires:  fop >= 0:0.20.5
+ BuildRequires:  fop < 0:0.93
  BuildRequires:  xalan-j2 >= 0:2.7.0
  BuildRequires:  xerces-j2 >= 0:2.7.1
***************
*** 1223,1226 ****
--- 1225,1229 ----
  Requires:  xmlgraphics-batik-rasterizer >= 0:1.6
  Requires:  fop >= 0:0.20.5
+ Requires:  fop < 0:0.93
  Requires:  xalan-j2 >= 0:2.7.0
  Requires:  xerces-j2 >= 0:2.7.1
***************
*** 1637,1643 ****
  ##BuildRequires:  bcel >= 0:5.1
  ##BuildRequires:  bsf
! ##BuildRequires:  castor >= 0:0.9.5
! ##BuildRequires:  checkstyle >= 0:4.3
! ##BuildRequires:  checkstyle-optional >= 0:4.3
  ##BuildRequires:  classworlds >= 0:1.1
  ##BuildRequires:  cpptasks >= 0:1.0
--- 1640,1646 ----
  ##BuildRequires:  bcel >= 0:5.1
  ##BuildRequires:  bsf
! ##BuildRequires:  castor0 >= 0:0.9.5
! ##BuildRequires:  checkstyle4 >= 0:4.4
! ##BuildRequires:  checkstyle4-optional >= 0:4.4
  ##BuildRequires:  classworlds >= 0:1.1
  ##BuildRequires:  cpptasks >= 0:1.0
***************
*** 1647,1650 ****
--- 1650,1654 ----
  ##BuildRequires:  excalibur-avalon-logkit >= 0:2.2.1
  ##BuildRequires:  fop >= 0:0.20.5
+ ##BuildRequires:  fop < 0:0.93
  ##BuildRequires:  forehead >= 0:1.0.b4
  ##BuildRequires:  gnu-getopt >= 0:1.0.12
***************
*** 1903,1907 ****
  echo "maven.get.jars.baseUrl = file:"$(pwd)/repository >> project.properties
  
! ant -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -f build-bootstrap.xml
  
  # plugins-sandbox
--- 1907,1913 ----
  echo "maven.get.jars.baseUrl = file:"$(pwd)/repository >> project.properties
  
! ant -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser \
!     -Dmaven.bootstrap.test.plugins=false \
!     -f build-bootstrap.xml
  
  # plugins-sandbox
***************
*** 2716,2719 ****
--- 2722,2730 ----
  
  %changelog
+ * Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.1-6.jpp5
+ - Replace (B)R checkstyle* by checkstyle4*
+ - Replace (B)R castor by castor0
+ - BR qname_1_1_api
+ 
  * Tue Aug 05 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.1-5.jpp5
  - BR commons-cli10





More information about the JPackage-commits mailing list