Author: tv
Date: Fri Apr  6 12:46:42 2018
New Revision: 1828517

URL: http://svn.apache.org/viewvc?rev=1828517&view=rev
Log:
- Introduce dependency management to keep dependency versions consistent
- Update dependencies commons-collections, commons-dbcp2, commons-jcs-core etc

Modified:
    db/torque/torque4/trunk/pom.xml
    db/torque/torque4/trunk/torque-ant-tasks/pom.xml
    db/torque/torque4/trunk/torque-generator/pom.xml
    
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java
    db/torque/torque4/trunk/torque-maven-plugin/pom.xml
    db/torque/torque4/trunk/torque-runtime/pom.xml
    db/torque/torque4/trunk/torque-templates/pom.xml
    db/torque/torque4/trunk/torque-test/pom.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties

Modified: db/torque/torque4/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Fri Apr  6 12:46:42 2018
@@ -310,6 +310,124 @@
     <url>http://svn.apache.org/viewvc/db/torque/torque4/trunk</url>
   </scm>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-configuration</groupId>
+        <artifactId>commons-configuration</artifactId>
+        <version>1.10</version>
+      </dependency>
+  
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.9.3</version>
+      </dependency>
+  
+      <dependency>
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
+        <version>1.4</version>
+      </dependency>
+  
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-dbcp2</artifactId>
+        <version>2.2.0</version>
+      </dependency>
+  
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-jcs-core</artifactId>
+        <version>2.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.6</version>
+      </dependency>
+  
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.2</version>
+      </dependency>
+  
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.2</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>1.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.8.1</version>
+        <scope>test</scope>
+      </dependency>
+  
+      <dependency>
+        <groupId>junit-addons</groupId>
+        <artifactId>junit-addons</artifactId>
+        <version>1.4</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-all</artifactId>
+        <version>1.9.0</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.avalon.framework</groupId>
+        <artifactId>avalon-framework-api</artifactId>
+        <version>4.3.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.avalon.framework</groupId>
+        <artifactId>avalon-framework-impl</artifactId>
+        <version>4.3.1</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.fulcrum</groupId>
+        <artifactId>fulcrum-testcontainer</artifactId>
+        <version>1.0.7</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.fulcrum</groupId>
+        <artifactId>fulcrum-yaafi</artifactId>
+        <version>1.0.6</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  
   <build>
     <plugins>
       <plugin>

Modified: db/torque/torque4/trunk/torque-ant-tasks/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/pom.xml?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/pom.xml Fri Apr  6 12:46:42 2018
@@ -53,19 +53,16 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit-addons</groupId>
       <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>1.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Fri Apr  6 12:46:42 2018
@@ -52,32 +52,26 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils-core</artifactId>
-      <version>1.8.3</version>
+      <artifactId>commons-beanutils</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>1.4</version>
     </dependency>
     <dependency>
       <groupId>commons-jxpath</groupId>
@@ -114,13 +108,11 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit-addons</groupId>
       <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -132,7 +124,6 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/PackageResourcesTest.java
 Fri Apr  6 12:46:42 2018
@@ -61,7 +61,7 @@ public class PackageResourcesTest
             {
                 foundCommonsCollections = true;
             }
-            if (name.contains("commons-beanutils-core"))
+            if (name.contains("commons-beanutils"))
             {
                 foundCommonsBeanutils = true;
             }
@@ -113,7 +113,7 @@ public class PackageResourcesTest
             {
                 foundCommonsCollections = true;
             }
-            if (name.contains("commons-beanutils-core"))
+            if (name.contains("commons-beanutils"))
             {
                 foundCommonsBeanutils = true;
             }

Modified: db/torque/torque4/trunk/torque-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/pom.xml?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-plugin/pom.xml Fri Apr  6 12:46:42 2018
@@ -72,19 +72,16 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit-addons</groupId>
       <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>1.3.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Fri Apr  6 12:46:42 2018
@@ -41,80 +41,67 @@
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
-      <version>1.10</version>
     </dependency>
 
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>1.4</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-dbcp2</artifactId>
-      <version>2.1.1</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
     </dependency>
 
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.2</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-jcs-core</artifactId>
-      <version>2.0-beta-2</version>
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
-      <version>4.3.1</version>
-      <type>jar</type>
       <optional>true</optional>
     </dependency>
 
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
       <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-testcontainer</artifactId>
-      <version>1.0.6</version>
       <scope>test</scope>
     </dependency>
     
     <dependency>
       <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-yaafi</artifactId>
-      <version>1.0.6</version>
       <scope>test</scope>
     </dependency>
     
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: db/torque/torque4/trunk/torque-templates/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/pom.xml (original)
+++ db/torque/torque4/trunk/torque-templates/pom.xml Fri Apr  6 12:46:42 2018
@@ -46,19 +46,16 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.2</version>
     </dependency>
     
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Fri Apr  6 12:46:42 2018
@@ -59,13 +59,11 @@
     <dependency>
       <artifactId>junit</artifactId>
       <groupId>junit</groupId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -76,7 +74,6 @@
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>1.4</version>
     </dependency>
 
     <!-- jndi -->
@@ -97,19 +94,16 @@
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
-      <version>4.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-testcontainer</artifactId>
-      <version>1.0.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-yaafi</artifactId>
-      <version>1.0.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -226,6 +220,7 @@
                 <sourceExclude>included*-schema.xml</sourceExclude>
                 <sourceExclude>id-table-schema.xml</sourceExclude>
               </sourceExcludes>
+              <loglevel>error</loglevel>
               <optionsFile>torque-gen.properties</optionsFile>
               <options>
                 
<torque.om.useManagers>${torque.useManagers}</torque.om.useManagers>
@@ -245,7 +240,7 @@
               <sourceDir>target/torque/test/schema</sourceDir>
               <defaultOutputDir>target/generated-sql</defaultOutputDir>
               <defaultOutputDirUsage>none</defaultOutputDirUsage>
-              <loglevel>info</loglevel>
+              <loglevel>error</loglevel>
               <sourceExcludes>
                 <sourceExclude>included*-schema.xml</sourceExclude>
               </sourceExcludes>
@@ -267,7 +262,7 @@
               <sourceDir>target/torque/test/schema</sourceDir>
               
<defaultOutputDir>target/generated-createdb-sql</defaultOutputDir>
               <defaultOutputDirUsage>none</defaultOutputDirUsage>
-              <loglevel>info</loglevel>
+              <loglevel>error</loglevel>
               <sourceExcludes>
                 <sourceExclude>ext*-schema.xml</sourceExclude>
                 <sourceExclude>included*-schema.xml</sourceExclude>
@@ -290,7 +285,7 @@
               <sourceDir>target/torque/test/schema</sourceDir>
               <defaultOutputDir>target/generated-sql</defaultOutputDir>
               <defaultOutputDirUsage>none</defaultOutputDirUsage>
-              <loglevel>info</loglevel>
+              <loglevel>error</loglevel>
               <options>
                 <torque.database>${torque.targetDatabase}</torque.database>
               </options>
@@ -313,6 +308,7 @@
               </sourceExcludes>
               <defaultOutputDir>target/generated-docs</defaultOutputDir>
               <defaultOutputDirUsage>none</defaultOutputDirUsage>
+              <loglevel>error</loglevel>
               <options>
                 <torque.database>${torque.targetDatabase}</torque.database>
                 <torque.om.package>org.apache.torque.test</torque.om.package>
@@ -929,8 +925,8 @@
         <torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
         <torque.targetDatabase>mysql</torque.targetDatabase>
         
<torque.database.url>jdbc:mysql://localhost:3306/bookstore</torque.database.url>
-        <torque.database.user>root</torque.database.user>
-        <torque.database.password />
+        <torque.database.user>torque</torque.database.user>
+        <torque.database.password>torque</torque.database.password>
         <torque.database.shutdown.url>none</torque.database.shutdown.url>
         <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
       </properties>

Modified: 
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties?rev=1828517&r1=1828516&r2=1828517&view=diff
==============================================================================
--- 
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties 
(original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties 
Fri Apr  6 12:46:42 2018
@@ -28,8 +28,8 @@ torque.database.bookstore.adapter = mysq
 torque.dsfactory.bookstore.factory = 
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
 torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
 torque.dsfactory.bookstore.connection.url = 
jdbc:mysql://localhost:3306/bookstore
-torque.dsfactory.bookstore.connection.user = root
-torque.dsfactory.bookstore.connection.password = 
+torque.dsfactory.bookstore.connection.user = torque
+torque.dsfactory.bookstore.connection.password = torque
 
 torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
 torque.dsfactory.bookstore.pool.defaultAutoCommit = false



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Reply via email to