centralizing dependency versions and managing libraries in lib/ through maven

diff --git a/.gitignore b/.gitignore
index 353a280dbb922b07d0c778f9947a7ec5b6a1590e..a8063308514ddeb3f0d453b097680cc729511ff4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,5 @@ eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war
 /*.patch
 /eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.core.resources.prefs
 /eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.m2e.core.prefs
+/eu.etaxonomy.taxeditor.webapp/lib/
 

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 09b3a2e08d5bdae772fe6a0de5606f0b44f2b8e8..19a421bf10f79267786ccfa69153f90d9b86a10f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -444,7 +444,7 @@
     <dependency>\r
       <groupId>com.mchange</groupId>\r
       <artifactId>c3p0</artifactId>\r
-      <version>0.9.2</version>\r
+      <version>${c3p0.version}</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.jboss.spec.javax.transaction</groupId>\r

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index bd42c10cb61f76af2809f11e6624cd075814ae99..f67047a0caca857d4ab47a25a3fc9329b5656f98 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -129,18 +129,18 @@
               this must exactly match the version as set in 
               cdmlib-parent pom.xml
             -->
-            <version>0.9.5.2</version>
+            <version>${c3p0.version}</version>
           </dependency>
           <!-- DATABASE DRIVER -->
           <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.190</version>
+            <version>${h2.version}</version>
           </dependency>
           <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.38</version>
+            <version>${mysql.version}</version>
           </dependency>
           <dependency>
               <groupId>commons-dbcp</groupId>

diff --git a/eu.etaxonomy.taxeditor.webapp/lib/c3p0-0.9.5.2.jar b/eu.etaxonomy.taxeditor.webapp/lib/c3p0-0.9.5.2.jar
deleted file mode 100644 (file)
index 579cedd..0000000
Binary files a/eu.etaxonomy.taxeditor.webapp/lib/c3p0-0.9.5.2.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.webapp/lib/javax.servlet-api-3.1.0.jar b/eu.etaxonomy.taxeditor.webapp/lib/javax.servlet-api-3.1.0.jar
deleted file mode 100644 (file)
index 6b14c3d..0000000
Binary files a/eu.etaxonomy.taxeditor.webapp/lib/javax.servlet-api-3.1.0.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.webapp/lib/jetty-all-9.2.9.v20150224.jar b/eu.etaxonomy.taxeditor.webapp/lib/jetty-all-9.2.9.v20150224.jar
deleted file mode 100644 (file)
index 2926f45..0000000
Binary files a/eu.etaxonomy.taxeditor.webapp/lib/jetty-all-9.2.9.v20150224.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.webapp/lib/log4j-1.2.17.jar b/eu.etaxonomy.taxeditor.webapp/lib/log4j-1.2.17.jar
deleted file mode 100644 (file)
index 1d425cf..0000000
Binary files a/eu.etaxonomy.taxeditor.webapp/lib/log4j-1.2.17.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.webapp/lib/mysql-connector-java-5.1.24.jar b/eu.etaxonomy.taxeditor.webapp/lib/mysql-connector-java-5.1.24.jar
deleted file mode 100644 (file)
index c640a8d..0000000
Binary files a/eu.etaxonomy.taxeditor.webapp/lib/mysql-connector-java-5.1.24.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index 7135effae979ac62b43e9312389228e486dc9e99..2e9728a2a35e749192cec66832b0156dc835a2f6 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -11,7 +11,6 @@
   <packaging>eclipse-plugin</packaging>
   <name>CDM Library Webapp Plugin</name>
   <description>CDM Library webapp as a plugin</description>
-
   <build>
     <pluginManagement>
       <plugins>
@@ -53,8 +52,8 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeArtifactIds><!--  Comma separated list of Artifact names to include -->
-                c3p0,mchange-commons-java,h2
+              <includeArtifactIds>
+                c3p0,mchange-commons-java,h2,mysql-connector-java,log4j,javax.servlet-api,jetty-all
               </includeArtifactIds>
               <outputDirectory>
                 ${basedir}/lib
@@ -126,23 +125,43 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.4.190</version>
+      <version>${h2.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>${h2.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>5.1.24</version>
     </dependency>
      <dependency>
       <groupId>com.mchange</groupId>
       <artifactId>c3p0</artifactId>
-      <!-- 
-        IMPORTANT!!!
-        this must exactly match the version as set in 
-        cdmlib-parent pom.xml
-      -->
-      <version>0.9.5.2</version>
+      <version>${c3p0.version}</version>
      </dependency>
      <dependency>
         <groupId>com.mchange</groupId>
         <artifactId>mchange-commons-java</artifactId>
-        <version>0.2.11</version>
+        <version>${mchange-commons-java.version}</version>
      </dependency>
+     <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.1.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.jetty.aggregate</groupId>
+        <artifactId>jetty-all</artifactId>
+        <version>9.2.9.v20150224</version>
+    </dependency>
   </dependencies>
 </project>
 

diff --git a/pom.xml b/pom.xml
index 2d28e140b85ba2bcd507d93cea2eb601314e04a4..898cc7e865d95a6fbb743a41dab1c0b6f939ebdb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,19 @@
     <taxeditor.version>4.0.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
+    <log4j.version>1.2.17</log4j.version>
+    <!-- data base driver related properties -->
+    <mysql.version>5.1.38</mysql.version>
+    <h2.version>1.4.190</h2.version>
+    <!-- 
+      IMPORTANT!!!
+      c3p0.version must exactly match the version as 
+      set in cdmlib-parent pom.xml
+    -->
+    <c3p0.version>0.9.5.2</c3p0.version>
+    <!-- mchange-commons-java needs to match the version as defined in the c3p0/pom.xml -->
+    <mchange-commons-java.version>0.2.11</mchange-commons-java.version>
+    
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>