cleanup

[cdmlib.git] / cdmlib-test / pom.xml

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index eff76b17a8fdf6fb8e5fb200821dd7cc8466c9ed..033f3d731896b0c7c9a441fb01d59fd5f21a9425 100644 (file)
--- a/cdmlib-test/pom.xml
+++ b/cdmlib-test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.27.0</version>
+    <version>5.36.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -19,20 +19,20 @@
             <executions>
               <execution>
                   <!-- Generate DDL for test -->
-                  <!-- Alternatives: http://jpdigital.github.io/hibernate5-ddl-maven-plugin/usage.html, 
+                  <!-- Alternatives: https://jpdigital.github.io/hibernate5-ddl-maven-plugin/usage.html, 
                                      https://webdev.jhuep.com/~jcs/ejava-javaee/coursedocs/content/html/jpa-entitymgrex-dbschemagen.html -->
                   <!-- manual execution of the below ant task:  -->
                   <!-- mvn antrun:run@generate-ddl-create       -->
                   <id>generate-ddl-create</id>
                   <phase>process-classes</phase>
                   <goals>
-                      <goal>run</goal>
+                  <!--    <goal>run</goal>  -->
                   </goals>
                   <configuration>
                       <target>
                           <delete file="${project.build.outputDirectory}/dbscripts/001-cdm.h2.sql" />
                           <!-- copy template file -->
-                          <copy file="${basedir}/src/main/resources/dbscripts/001-cdm.h2.sql" tofile="${project.build.outputDirectory}/dbscripts/001-cdm.h2.sql" />
+                          <copy file="${basedir}/src/main/resources/dbscripts/001-cdm.h2.template.sql" tofile="${project.build.outputDirectory}/dbscripts/001-cdm.h2.sql" />
                                 <!-- for directory shortcuts: https://stackoverflow.com/questions/13354531/maven-project-build-directory   but a short cut to /src/main/resources did not work for me -->
                           <!-- run DdlCreator -->
                           <java classname="eu.etaxonomy.cdm.test.unitils.DdlCreator" fork="false" failonerror="true" classpathref="maven.compile.classpath" /> 
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.2</version>
         <executions>
           <execution>
             <goals>
@@ -54,6 +54,41 @@
         </executions>
       </plugin>
     </plugins>
+    <pluginManagement>
+       <plugins>
+               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+               <plugin>
+                       <groupId>org.eclipse.m2e</groupId>
+                       <artifactId>lifecycle-mapping</artifactId>
+                       <version>1.0.0</version>
+                       <configuration>
+                               <lifecycleMappingMetadata>
+                                       <pluginExecutions>
+                                               <pluginExecution>
+                                                       <pluginExecutionFilter>
+                                                               <groupId>
+                                                                       org.apache.maven.plugins
+                                                               </groupId>
+                                                               <artifactId>
+                                                                       maven-antrun-plugin
+                                                               </artifactId>
+                                                               <versionRange>
+                                                                       [3.0.0,)
+                                                               </versionRange>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                       </pluginExecutionFilter>
+                                                       <action>
+                                                               <ignore />
+                                                       </action>
+                                               </pluginExecution>
+                                       </pluginExecutions>
+                               </lifecycleMappingMetadata>
+                       </configuration>
+               </plugin>
+       </plugins>
+    </pluginManagement>
   </build>
   <dependencies>
     <dependency>
@@ -65,6 +100,13 @@
         <groupId>org.unitils</groupId>
         <artifactId>unitils-core</artifactId>
         <scope>compile</scope>
+        <exclusions>
+          <exclusion>
+            <!-- we use jcl-over-slf4j instead-->
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>org.unitils</groupId>
@@ -136,6 +178,7 @@
 
     <!-- ******* DATABASES DRIVER ******* -->
 
+    <!-- for other databases see also #6025 -->
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
@@ -160,6 +203,18 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <!-- has overlaps with jakarta-activation -->
+          <groupId>javax.activation</groupId>
+          <artifactId>javax.activation-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <!-- we use jakarta.xml.bind-api instead -->
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>eu.etaxonomy</groupId>