commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1562962 - in /commons/proper/dbcp/trunk: build.xml pom.xml src/assembly/ src/java/ src/main/assembly/ src/main/java/ src/test/java/ src/test/java/org/ src/test/org/
Date Thu, 30 Jan 2014 21:09:46 GMT
Author: sebb
Date: Thu Jan 30 21:09:46 2014
New Revision: 1562962

URL: http://svn.apache.org/r1562962
Log:
Standardise Maven layout

Added:
    commons/proper/dbcp/trunk/src/main/assembly/
      - copied from r1537527, commons/proper/dbcp/trunk/src/assembly/
    commons/proper/dbcp/trunk/src/main/java/
      - copied from r1562944, commons/proper/dbcp/trunk/src/java/
    commons/proper/dbcp/trunk/src/test/java/
    commons/proper/dbcp/trunk/src/test/java/org/
      - copied from r1562957, commons/proper/dbcp/trunk/src/test/org/
Removed:
    commons/proper/dbcp/trunk/src/assembly/
    commons/proper/dbcp/trunk/src/java/
    commons/proper/dbcp/trunk/src/test/org/
Modified:
    commons/proper/dbcp/trunk/build.xml
    commons/proper/dbcp/trunk/pom.xml

Modified: commons/proper/dbcp/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.xml?rev=1562962&r1=1562961&r2=1562962&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/build.xml (original)
+++ commons/proper/dbcp/trunk/build.xml Thu Jan 30 21:09:46 2014
@@ -55,17 +55,17 @@
    	  <property name="dist.jar" value="${dist.dir}/${name}-${version}.jar"/>
    	
    	  <property name="src.dir" value="${basedir}/src"/>
-   	  <property name="src.java.dir" value="${src.dir}/java"/>
+   	  <property name="src.java.dir" value="${src.dir}/main/java"/>
       <property name="src.resource.dir" value="${src.dir}/main/resources"/>
-   	  <property name="src.test.dir" value="${src.dir}/test"/>
+   	  <property name="src.test.dir" value="${src.dir}/test/java"/>
    	  <property name="javac.source" value="1.7" />
 
       <property name="test.failonerror" value="true" /> 
       <property name="test.runner" value="junit.textui.TestRunner" /> 
      
       <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
-      <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy;
2001-2011 Apache Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."/>
-      <property name="javadoc.overview" value="${basedir}/src/java/org/apache/commons/dbcp/overview.html"/>
+      <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy;
2001-2013 Apache Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."/>
+      <property name="javadoc.overview" value="${basedir}/src/main/java/org/apache/commons/dbcp/overview.html"/>
 
       <property name="javac.optimize" value="false"/>
       <property name="javac.debug" value="true"/>

Modified: commons/proper/dbcp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=1562962&r1=1562961&r2=1562962&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Thu Jan 30 21:09:46 2014
@@ -221,8 +221,6 @@
   </properties> 
 
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -260,8 +258,8 @@
           <artifactId>maven-assembly-plugin</artifactId>
           <configuration>
             <descriptors>
-              <descriptor>src/assembly/bin.xml</descriptor>
-              <descriptor>src/assembly/src.xml</descriptor>
+              <descriptor>src/main/assembly/bin.xml</descriptor>
+              <descriptor>src/main/assembly/src.xml</descriptor>
             </descriptors>
             <tarLongFileMode>gnu</tarLongFileMode>
           </configuration>



Mime
View raw message