[Jpackage-commits] rpms/free/jakarta-commons-configuration commons-configuration-1.4-build_xml.patch, 1.2, 1.3 commons-configuration-1.4-jpp-depmap.xml, 1.2, NONE commons-configuration-1.4-pom.patch, 1.1, NONE commons-configuration-1.4-settings.xml, 1.1, NONE commons-configuration-1.4.pom, NONE, 1.1 jakarta-commons-configuration.spec, 1.4, 1.5

jpackage jpackage at ryu.zarb.org
Thu Feb 5 08:58:56 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/jakarta-commons-configuration
In directory ryu.zarb.org:/tmp/izobJpzZcr/rpms/free/jakarta-commons-configuration

Modified Files:
	commons-configuration-1.4-build_xml.patch 
	jakarta-commons-configuration.spec 
Added Files:
	commons-configuration-1.4.pom 
Removed Files:
	commons-configuration-1.4-jpp-depmap.xml 
	commons-configuration-1.4-pom.patch 
	commons-configuration-1.4-settings.xml 
Log Message:
1.4-3.jpp6

--- commons-configuration-1.4-jpp-depmap.xml DELETED ---

--- commons-configuration-1.4-pom.patch DELETED ---

Index: jakarta-commons-configuration.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jakarta-commons-configuration/jakarta-commons-configuration.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** jakarta-commons-configuration.spec	2 Jul 2008 09:55:35 -0000	1.4
--- jakarta-commons-configuration.spec	5 Feb 2009 07:58:54 -0000	1.5
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2007, JPackage Project
  # All rights reserved.
  #
***************
*** 31,46 ****
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
- # If you don't want to build with maven, and use straight ant instead,
- # give rpmbuild option '--without maven'
- 
- %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
- %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
- 
- %define section   free
  %define base_name commons-configuration
  
  Name:           jakarta-commons-configuration
  Version:        1.4
! Release:        2%{dist}
  Epoch:          0
  Summary:        Commons Configuration Package
--- 31,39 ----
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define base_name commons-configuration
  
  Name:           jakarta-commons-configuration
  Version:        1.4
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Commons Configuration Package
***************
*** 50,88 ****
  URL:            http://commons.apache.org/configuration/
  Source0:        http://www.apache.org/dist/commons/configuration/source/%{base_name}-%{version}-src.tar.gz
! #Source1:        pom-maven2jpp-depcat.xsl
! #Source2:        pom-maven2jpp-newdepmap.xsl
! #Source3:        pom-maven2jpp-mapdeps.xsl
! Source4:        %{base_name}-%{version}-jpp-depmap.xml
! Source5:        %{base_name}-%{version}-settings.xml
  Patch0:         commons-configuration-1.4-build_xml.patch
- Patch1:         commons-configuration-1.4-pom.patch
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! #Distribution:   JPackage
! #Vendor:         JPackage Project
  
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  junit
! BuildRequires:  junit-addons
! BuildRequires:  ant >= 0:1.6.5
! %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.7
! BuildRequires:  maven2-plugin-antrun
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-idea
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven-surefire-plugin
! %endif
! BuildRequires:  dbunit
! BuildRequires:  hsqldb
! BuildRequires:  mockobjects >= 0:0.09-17
! BuildRequires:  mockobjects-jdk1.4-j2ee1.4 >= 0:0.09-17
  BuildRequires:  xalan-j2
  #
--- 43,61 ----
  URL:            http://commons.apache.org/configuration/
  Source0:        http://www.apache.org/dist/commons/configuration/source/%{base_name}-%{version}-src.tar.gz
! Source1:        http://repo1.maven.org/maven2/commons-configuration/commons-configuration/1.4/commons-configuration-1.4.pom
! 
  Patch0:         commons-configuration-1.4-build_xml.patch
  
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! 
! BuildRequires:  java-devel
! BuildRequires:  jpackage-utils >= 0:1.7.2
  BuildRequires:  junit
! BuildRequires:  ant >= 0:1.6
! 
  BuildRequires:  xalan-j2
  #
***************
*** 96,102 ****
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  jakarta-commons-pool
! BuildRequires:  servlet_2_4_api
  BuildRequires:  xerces-j2
! Requires:  java >= 0:1.5.0
  Requires:  jakarta-commons-beanutils >= 0:1.7.0
  Requires:  jakarta-commons-codec
--- 69,76 ----
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  jakarta-commons-pool
! BuildRequires:  servletapi5
  BuildRequires:  xerces-j2
! BuildRequires:  xml-commons-apis
! 
  Requires:  jakarta-commons-beanutils >= 0:1.7.0
  Requires:  jakarta-commons-codec
***************
*** 108,122 ****
  Requires:  jakarta-commons-logging
  Requires:  jakarta-commons-pool
! Requires:  servlet_2_4_api
  Requires:  xerces-j2
  %if %{gcj_support}
- BuildRequires:    gnu-crypto
  BuildRequires:    java-gcj-compat-devel
  Requires(post):   java-gcj-compat
  Requires(postun): java-gcj-compat
  %endif
- Requires(post):   jpackage-utils >= 0:1.7.5
- Requires(postun): jpackage-utils >= 0:1.7.5
  
  
  %description
--- 82,96 ----
  Requires:  jakarta-commons-logging
  Requires:  jakarta-commons-pool
! Requires:  servletapi5
  Requires:  xerces-j2
+ Requires:  xml-commons-apis 
  %if %{gcj_support}
  BuildRequires:    java-gcj-compat-devel
  Requires(post):   java-gcj-compat
  Requires(postun): java-gcj-compat
  %endif
  
+ Requires(post):   jpackage-utils >= 1.7.2
+ Requires(postun): jpackage-utils >= 1.7.2
  
  %description
***************
*** 145,178 ****
  %prep
  %setup -q -n %{base_name}-%{version}-src
! %patch0 -b .sav0
! %patch1 -b .sav1
  
  %build
- export JAVA_HOME=%{_jvmdir}/java-1.5.0
- %if %{with_maven}
- cp %{SOURCE5} maven2-settings.xml
- 
- sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
- sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" maven2-settings.xml
- sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
- sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" maven2-settings.xml
- sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" maven2-settings.xml
- 
- 
- mkdir external_repo
- ln -s %{_javadir} external_repo/JPP
- 
- export M2SETTINGS=$(pwd)/maven2-settings.xml
- export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
- mvn-jpp -e \
-         -s ${M2SETTINGS} \
-         -Dmaven.test.failure.ignore=true \
-         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-         -Dmaven2.jpp.depmap.file=%{SOURCE4} \
-         install javadoc:javadoc
- 
- %else
  export CLASSPATH=$(build-classpath \
! servlet_2_4_api \
  commons-beanutils \
  commons-codec \
--- 119,127 ----
  %prep
  %setup -q -n %{base_name}-%{version}-src
! %patch0 -b .sav
  
  %build
  export CLASSPATH=$(build-classpath \
! servletapi5 \
  commons-beanutils \
  commons-codec \
***************
*** 183,194 ****
  commons-lang \
  commons-pool \
- junit-addons \
- dbunit \
  hsqldb \
! mockobjects-core \
! mockobjects-jdk1.4-j2ee1.4 \
  ):target/classes:target/test-classes:target/conf
  ant -Dbuild.sysclasspath=only jar javadoc
- %endif
  
  %install
--- 132,139 ----
  commons-lang \
  commons-pool \
  hsqldb \
! commons-logging \
  ):target/classes:target/test-classes:target/conf
  ant -Dbuild.sysclasspath=only jar javadoc
  
  %install
***************
*** 201,213 ****
  ln -s %{base_name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{base_name}.jar
! install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %if %{with_maven}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %else
! cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! %endif
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  %if %{gcj_support}
- export CLASSPATH=$(build-classpath gnu-crypto)
  %{_bindir}/aot-compile-rpm
  %endif
--- 146,159 ----
  ln -s %{base_name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{base_name}.jar
! 
! install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! 
! # Install pom
! install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap commons-configuration commons-configuration %{version} JPP %{name}
! 
  %if %{gcj_support}
  %{_bindir}/aot-compile-rpm
  %endif
***************
*** 216,230 ****
  rm -rf $RPM_BUILD_ROOT
  
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-   rm -f %{_javadocdir}/%{name}
- fi
- 
- %if %{gcj_support}
  %post
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 162,168 ----
  rm -rf $RPM_BUILD_ROOT
  
  %post
+ %update_maven_depmap
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 233,238 ****
  %endif
  
- %if %{gcj_support}
  %postun
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 171,177 ----
  %endif
  
  %postun
+ %update_maven_depmap
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 243,246 ****
--- 182,187 ----
  %files
  %defattr(-,root,root,-)
+ %{_datadir}/maven2
+ %{_mavendepmapfragdir}
  %doc LICENSE.txt
  %{_javadir}/*.jar
***************
*** 252,267 ****
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  
  %changelog
! * Wed Jul 02 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.4-2.jpp5
! - Build with maven2 by default
! - Adapt to restructured mockobjects and BR >= 0:0.09-17
! - Add pom and depmap frag
  
  * Mon Aug 13 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4-1jpp
  - Upgrade to 1.4
  
  * Thu May 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-3jpp
--- 193,209 ----
  %files javadoc
  %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}
  
  
  %changelog
! * Thu Feb 05 2009 Yong Yang <yyang at redhat.com> - 0:1.4-3
! - Fix release tag
! 
! * Wed Jan 14 2009 Yong Yang <yyang at redhat.com> - 0:1.4-2jpp
! - Import from dbhole's maven 2.0.8 packages, initial building
  
  * Mon Aug 13 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.4-1jpp
  - Upgrade to 1.4
+ - Add pom file
  
  * Thu May 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-3jpp

--- commons-configuration-1.4-settings.xml DELETED ---

--- NEW FILE: commons-configuration-1.4.pom ---
<?xml version="1.0" encoding="UTF-8"?><project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>commons-configuration</groupId>
  <artifactId>commons-configuration</artifactId>
  <name>Commons Configuration</name>
  <version>1.4</version>
  <description>Tools to assist in the reading of configuration/preferences files in
    various formats</description>
  <url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
  <issueManagement>
    <url>http://issues.apache.org/jira/browse/CONFIGURATION</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>commons-dev at jakarta.apache.org</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2001</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>Commons Dev List</name>
      <subscribe>commons-dev-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-dev-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
    </mailingList>
    <mailingList>
      <name>Commons User List</name>
      <subscribe>commons-user-subscribe at jakarta.apache.org</subscribe>
      <unsubscribe>commons-user-unsubscribe at jakarta.apache.org</unsubscribe>
      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>dlr</id>
      <name>Daniel Rall</name>
      <email>dlr at finemaltcoding.com</email>
      <organization>CollabNet, Inc.</organization>
    </developer>
    <developer>
      <id>jvanzyl</id>
      <name>Jason van Zyl</name>
      <email>jason at zenplex.com</email>
      <organization>Zenplex</organization>
    </developer>
    <developer>
      <id>mpoeschl</id>
      <name>Martin Poeschl</name>
      <email>mpoeschl at marmot.at</email>
      <organization>tucana.at</organization>
    </developer>
    <developer>
      <id>dion</id>
      <name>dIon Gillard</name>
      <email>dion at multitask.com.au</email>
      <organization>Multitask Consulting</organization>
    </developer>
    <developer>
      <id>henning</id>
      <name>Henning P. Schmiedehausen</name>
      <email>hps at intermeta.de</email>
      <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste mbH</organization>
      <timezone>2</timezone>
    </developer>
    <developer>
      <id>epugh</id>
      <name>Eric Pugh</name>
      <email>epugh at upstate.com</email>
      <organization>upstate.com</organization>
    </developer>
    <developer>
      <id>bdunbar</id>
      <name>Brian E. Dunbar</name>
      <email>bdunbar at dunbarconsulting.org</email>
      <organization>dunbarconsulting.org</organization>
    </developer>
    <developer>
      <id>ebourg</id>
      <name>Emmanuel Bourg</name>
      <email>smanux at lfjr.net</email>
    </developer>
    <developer>
      <id>oheger</id>
      <name>Oliver Heger</name>
      <email>oheger at apache.org</email>
      <organization>Agfa HealthCare</organization>
      <timezone>+1</timezone>
    </developer>
  </developers>
  <contributors>
    <contributor>
      <name>J?rg Schaible</name>
      <email>joerg.schaible at gmx.de</email>
      <organization>Elsag-Solutions AG</organization>
      <timezone>+1</timezone>
    </contributor>
    <contributor>
      <name>Konstantin Shaposhnikov</name>
      <email>ksh at scand.com</email>
      <organization>scand.com</organization>
    </contributor>
    <contributor>
      <name>Jamie M. Guillemette</name>
      <email>JMGuillemette at gmail.com</email>
      <organization>TD Bank</organization>
    </contributor>
    <contributor>
      <name>Jorge Ferrer</name>
      <email>jorge.ferrer at gmail.com</email>
      <organization></organization>
    </contributor>
    <contributor>
      <name>Gabriele Garuglieri</name>
      <email>gabriele.garuglieri at infoblu.it</email>
      <organization>Infoblu S.p.A</organization>
    </contributor>
    <contributor>
      <name>Nicolas De Loof</name>
      <email>nicolas.deloof at gmail.com</email>
      <organization>capgemini</organization>
    </contributor>
  </contributors>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>/LICENSE.txt</url>
    </license>
  </licenses>
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</connection>
    <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/${pom.artifactId.substring(8)}/trunk</url>
  </scm>
  <organization>
    <name>The Apache Software Foundation</name>
    <url>http://jakarta.apache.org</url>
  </organization>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <testSourceDirectory>src/test</testSourceDirectory>
    <resources>
      <resource>
        <directory>conf</directory>
        <includes>
          <include>digesterRules.xml</include>
          <include>properties.dtd</include>
        </includes>
      </resource>
      <resource>
        <targetPath>META-INF</targetPath>
        <directory>${basedir}</directory>
        <includes>
          <include>NOTICE.txt</include>
        </includes>
      </resource>
    </resources>
    <testResources>
      <testResource>
        <directory>conf</directory>
        <includes>
          <include>*.xml</include>
        </includes>
      </testResource>
      <testResource>
        <directory>conf</directory>
        <includes>
          <include>testClasspath.properties</include>
          <include>testdb.script</include>
          <include>*.properties</include>
          <include>*.dtd</include>
        </includes>
      </testResource>
      <testResource>
        <targetPath>org/apache/commons/configuration</targetPath>
        <directory>conf</directory>
        <includes>
          <include>test.properties</include>
          <include>include.properties</include>
        </includes>
      </testResource>
      <testResource>
        <targetPath>config</targetPath>
        <directory>conf/config</directory>
        <includes>
          <include>**/*.properties</include>
        </includes>
      </testResource>
    </testResources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <includes>
            <include>**/*Test*.java</include>
          </includes>
          <excludes>
            <exclude>**/TestBasePropertiesConfiguration.java</exclude>
            <exclude>**/NonStringTestHolder.java</exclude>
            <exclude>**/TestAbstractConfiguration.java</exclude>
            <exclude>**/AbstractXPathTest.java</exclude>
            <exclude>**/AbstractCombinerTest.java</exclude>
            <exclude>**/AbstractTestConfigurationEvents.java</exclude>
            <exclude>**/AbstractTestFileConfigurationEvents.java</exclude>
          </excludes>
        </configuration>
      </plugin>
      <plugin>
        <groupId>maven-plugins</groupId>
        <artifactId>maven-tasks-plugin</artifactId>
        <version>1.1.0</version>
        <configuration />
      </plugin>
      <plugin>
        <groupId>maven-plugins</groupId>
        <artifactId>maven-findbugs-plugin</artifactId>
        <version>0.8.4</version>
        <configuration />
      </plugin>
      <plugin>
        <groupId>maven-plugins</groupId>
        <artifactId>maven-cobertura-plugin</artifactId>
        <version>1.2</version>
        <configuration />
      </plugin>
      <plugin>
        <artifactId>maven-changes-plugin</artifactId>
        <version>1.6</version>
        <configuration>
          <comment><strong>Site Only</strong> - v1.6 (minimum)
              required for building the site documentation.</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-xdoc-plugin</artifactId>
        <version>1.9.2</version>
        <configuration>
          <comment><strong>Site Only</strong> - v1.9.2 (minimum)
              required for building the site documentation.</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-scm-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-jdiff-plugin</artifactId>
        <version>1.5</version>
        <configuration>
          <comment><strong>Site Only</strong> - v1.5 (minimum)</comment>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>commons-collections</groupId>
      <artifactId>commons-collections</artifactId>
      <version>3.2</version>
    </dependency>
    <dependency>
      <groupId>commons-lang</groupId>
      <artifactId>commons-lang</artifactId>
      <version>2.3</version>
    </dependency>
    <dependency>
      <groupId>commons-logging</groupId>
      <artifactId>commons-logging-api</artifactId>
      <version>1.0.4</version>
    </dependency>
    <dependency>
      <groupId>commons-digester</groupId>
      <artifactId>commons-digester</artifactId>
      <version>1.8</version>
    </dependency>
    <dependency>
      <groupId>commons-beanutils</groupId>
      <artifactId>commons-beanutils-core</artifactId>
      <version>1.7.0</version>
    </dependency>
    <dependency>
      <groupId>commons-codec</groupId>
      <artifactId>commons-codec</artifactId>
      <version>1.3</version>
    </dependency>
    <dependency>
      <groupId>commons-jxpath</groupId>
      <artifactId>commons-jxpath</artifactId>
      <version>1.2</version>
    </dependency>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xerces</artifactId>
      <version>2.2.1</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>xalan</groupId>
      <artifactId>xalan</artifactId>
      <version>2.7.0</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>xml-apis</groupId>
      <artifactId>xml-apis</artifactId>
      <version>1.0.b2</version>
      <scope>provided</scope>
    </dependency>
    <dependency>
      <groupId>servletapi</groupId>
      <artifactId>servletapi</artifactId>
      <version>2.4</version>
      <optional>true</optional>
    </dependency>
    <dependency>
      <groupId>commons-dbcp</groupId>
      <artifactId>commons-dbcp</artifactId>
      <version>1.2.2</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>commons-pool</groupId>
      <artifactId>commons-pool</artifactId>
      <version>1.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>hsqldb</groupId>
      <artifactId>hsqldb</artifactId>
      <version>1.7.2.2</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>dbunit</groupId>
      <artifactId>dbunit</artifactId>
      <version>2.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>3.8.1</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>junit-addons</groupId>
      <artifactId>junit-addons</artifactId>
      <version>1.4</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>mockobjects</groupId>
      <artifactId>mockobjects-core</artifactId>
      <version>0.09</version>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>mockobjects</groupId>
      <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
      <version>0.09</version>
      <scope>test</scope>
    </dependency>
  </dependencies>
  <distributionManagement>
    <repository>
      <id>default</id>
      <name>Default Repository</name>
      <url>www.apache.org//www/www.apache.org/dist/java-repository/</url>
    </repository>
    <site>
      <id>default</id>
      <name>Default Site</name>
      <url>scp://people.apache.org//www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/</url>
    </site>
    <status>converted</status>
  </distributionManagement>
</project>
Index: commons-configuration-1.4-build_xml.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jakarta-commons-configuration/commons-configuration-1.4-build_xml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** commons-configuration-1.4-build_xml.patch	2 Jul 2008 09:55:35 -0000	1.2
--- commons-configuration-1.4-build_xml.patch	5 Feb 2009 07:58:54 -0000	1.3
***************
*** 1,5 ****
! --- build.xml.sav	2007-08-12 17:31:35.000000000 +0200
! +++ build.xml	2007-08-12 17:32:08.000000000 +0200
! @@ -101,9 +101,9 @@
       <mkdir dir="${classesdir}/META-INF"/>
       <copy file="LICENSE.txt" todir="${metadir}"/>
--- 1,11 ----
! diff -up ./build.xml.sav ./build.xml
! --- ./build.xml.sav	2008-04-09 17:21:25.000000000 -0400
! +++ ./build.xml	2008-04-09 17:24:18.000000000 -0400
! @@ -97,13 +97,13 @@
!      </copy>
!    </target>
!  
! -  <target name="jar" description="o Create the jar" depends="compile,test">
! +  <target name="jar" description="o Create the jar" depends="compile">
       <mkdir dir="${classesdir}/META-INF"/>
       <copy file="LICENSE.txt" todir="${metadir}"/>




More information about the JPackage-commits mailing list