Updated version in pom / project files to taxeditor version : 4.8.1 and cdmlib versio...

[taxeditor.git] / eu.etaxonomy.taxeditor.test / pom.xml

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index f67047a0caca857d4ab47a25a3fc9329b5656f98..b9617ca60d4a92f54a76ec2fdf98e29b21942fc5 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.8.1</version>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
@@ -48,37 +48,27 @@
               <removeAll />
             </filter>
           </filters>
+          <dependency-resolution>
+           <extraRequirements>
+              <requirement>
+                 <type>eclipse-feature</type>
+                 <id>eu.etaxonomy.taxeditor.feature</id>
+                 <versionRange>1.0.0</versionRange>
+              </requirement>
+           </extraRequirements>
+        </dependency-resolution>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-surefire-plugin</artifactId>
         <version>${tycho.version}</version>
-        <configuration>
-          <!-- currently we run only the non-ui unit tests so we don't the 
-            harness -->
-          <!-- <useUIHarness>true</useUIHarness> -->
-          <dependencies>
-            <!-- This will pull the feature and its dependent plugins into 
-              the classpath for the tests. Note that this requires ALL taxeditor projects 
-              to be installed. -->
-            <dependency>
-              <type>eclipse-feature</type>
-              <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
-              <!-- This is the minimum required version -->
-              <version>1.0.0</version>
-            </dependency>
-          </dependencies>
-        </configuration>
+        
       </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.1.3.v20140225</version><!-- do not update, since later versions are no longer compatible to java 7  -->
-        <!-- 
-            To see the detailed list of parameters that can be configured for a particular goal:
-            mvn jetty:help -Ddetail=true -Dgoal= goal-name
-         -->
+        <version>9.4.1.v20170120</version>
         <configuration>
           <systemProperties>
             <force>true</force>
@@ -121,46 +111,19 @@
           <daemon>true</daemon>
         </configuration>
         <dependencies>
-            <dependency>
-            <groupId>com.mchange</groupId>
-            <artifactId>c3p0</artifactId>
-            <!-- 
-              IMPORTANT!!!
-              this must exactly match the version as set in 
-              cdmlib-parent pom.xml
-            -->
-            <version>${c3p0.version}</version>
-          </dependency>
-          <!-- DATABASE DRIVER -->
-          <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
-          </dependency>
-          <dependency>
+            <!-- NOTE: This dependency requires that the  
+                EditRepository is configured as pluginRepository -->
+               <dependency>
+                       <groupId>eu.etaxonomy</groupId>
+                       <artifactId>cdmlib-db</artifactId>
+                       <version>${cdmlib.version}</version>
+               </dependency>
+                 <!-- Do we still need this? If yes, should we move it to cdmlib-db? -->
+           <dependency>
               <groupId>commons-dbcp</groupId>
               <artifactId>commons-dbcp</artifactId>
               <version>1.4</version>
           </dependency>
-<!--           <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-          </dependency> -->
-          <!--  
-          <dependency>
-            <groupId>eu.etaxonomy</groupId>
-            <artifactId>cdmlib-persistence</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-            </exclusions>
-          </dependency>
-          -->
         </dependencies>
         <executions>
           <execution>