updating poms for 5.39.0-SNAPSHOT development

[cdm-vaadin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 573956b1175f7dfb57ba166dc0aa089319f0b1ad..02dcade160afa3ceb762ba9a2781619efb48750a 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-vaadin</artifactId>
   <packaging>war</packaging>
-  <version>5.29.0-SNAPSHOT</version>
+  <version>5.39.0-SNAPSHOT</version>
   <name>Vaadin Web Application</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -13,7 +13,7 @@
     <vaadin-spring.version>1.2.0</vaadin-spring.version>
     <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
     <vaadin-spring-addon-eventbus.version>2.0.0.RELEASE</vaadin-spring-addon-eventbus.version>
-    <cdmlib.version>5.29.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>5.39.0-SNAPSHOT</cdmlib.version>
     <unitils.version>3.4.2</unitils.version>
     <spring-boot.version>1.3.1.RELEASE</spring-boot.version>
     <!-- has spring 4.2.4-RELEASE as dependency --> 
@@ -32,7 +32,7 @@
     <!-- the cdm internal repository -->
     <repository>
       <id>EditRepository</id>
-      <url>https://cybertaxonomy.eu/mavenrepo/</url>
+      <url>https://cybertaxonomy.org/mavenrepo/</url>
     </repository>
     <!-- current spring source repositories -->
     <repository>
@@ -101,11 +101,16 @@
         <!-- Try updating in cdmlib to 20090211 -->
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
-        <version>20211205</version>
+        <version>20220320</version>
       </dependency>
     
     
     
+    
+    
+    
+    
+    
         <!-- 
       <dependency>
             updating to same version as in vaadin-server 7.7.28 due to https://vaadin.com/security/2021-10-27 
@@ -140,7 +145,7 @@
       <uniqueVersion>false</uniqueVersion>
       <id>cybertaxonomy.eu</id>
       <name>Edit Maven Repository</name>
-      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+      <url>scpexe://cybertaxonomy.org/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
       <layout>default</layout>
     </repository>
   </distributionManagement>
@@ -229,7 +234,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M5</version>
+        <version>3.0.0-M7</version>
         <configuration>
           <argLine>-Xms256m -Xmx512m</argLine>
         </configuration>
@@ -390,9 +395,12 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>ch.dvbern.oss.maven.jgitflow</groupId>
+        <!-- groupId>ch.dvbern.oss.maven.jgitflow</groupId>
+        <artifactId>jgitflow-maven-plugin</artifactId>
+        <version>1.0-m8</version>  -->
+        <groupId>external.atlassian.jgitflow</groupId>
         <artifactId>jgitflow-maven-plugin</artifactId>
-        <version>1.0-m8</version>
+        <version>1.0-m6</version>
         <configuration>
           <pushHotfixes>true</pushHotfixes>
           <pushReleases>true</pushReleases>
@@ -414,7 +422,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>enforce</id>
@@ -422,9 +430,9 @@
               <fail>false</fail>
               <skip>false</skip>
               <rules>
-                <dependencyConvergence/>
+                <dependencyConvergence />
                 <requireMavenVersion>
-                  <version>[3.6.0,)</version>
+                  <version>[3.6.3,)</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -433,6 +441,11 @@
             
             
             
+            
+            
+            
+            
+ 
               <!-- Binds by default to the lifecycle phase: validate -->
             </goals>
           </execution>
@@ -509,7 +522,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore/>
+                    <ignore />
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -537,6 +550,11 @@
     
     
     
+    
+    
+    
+    
+    
       <!-- 
         vaadin-server dependency jsoup upgraded due to https://vaadin.com/security/2021-10-27
         further updating of vaadin 7 is no longer possible without purchasing the pro license 
@@ -653,7 +671,7 @@
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
     </dependency>
-    <dependency>
+    <!--    <dependency>
       <groupId>org.springmodules</groupId>
       <artifactId>spring-modules-cache</artifactId>
       <version>0.7</version>
@@ -668,7 +686,7 @@
         </exclusion>
       </exclusions>
       <scope>test</scope>
-    </dependency>
+    </dependency>  -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>