updating develop poms to master versions to avoid merge conflicts

[cdmlib.git] / cdmlib-remote-webapp / pom.xml

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index 0ff3400b0ef2fed1d397b2c34f81fd4e9f85a035..d9dcb6fe5d6b000098ed0b7236da7de2c3ace9c1 100755 (executable)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>4.3.0</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -16,17 +16,10 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-
   <scm>
-    <connection>
-      scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
-    </connection>
-    <developerConnection>
-      scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
-    </developerConnection>
-    <url>
-      http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-remote/
-    </url>
+    <connection>scm:git:https://dev.e-taxonomy.eu/git/cdmlib-remote-webapp.git</connection>
+    <developerConnection>scm:git:ssh://git@dev.e-taxonomy.eu/var/git/cdmlib-remote-webapp.git</developerConnection>
+    <url>https://dev.e-taxonomy.eu/gitweb/cdmlib.git/tree/HEAD:/cdmlib-remote-webapp/</url>
   </scm>
 
   <profiles>
@@ -221,7 +214,7 @@
       <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  -->
+        <version>9.4.1.v20170120</version>
         <configuration>
           <stopKey>stop</stopKey>
           <stopPort>9199</stopPort>
@@ -292,7 +285,7 @@
                     The war must be created after running the integration-tests,
                     since the SwaggerGroupsIT test populates the classes/api-docs-static/
                     folder with static swagger doc files. The are otherwise not packed
-                     into the wae file.
+                     into the war file.
                   -->
                 <phase>verify</phase>
                 <goals>