ref #9204 upgrade and remove further libraries in taxeditor (including commons-lang...

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

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index 1bbbd0b27d40dc4e51ccb822b13a4d3aed2e75a6..e7663d8533f899e2490d7cb57eb9eaefaf5f3fd9 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.3.0-SNAPSHOT</version>
+    <version>5.18.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
@@ -53,14 +53,14 @@
             </goals>
             <configuration>
               <includeArtifactIds>
-                log4j,javax.servlet-api,jetty-all
+                log4j,javax.servlet-api,jetty-server,jetty-util,jetty-webapp,jetty-xml,jetty-servlet,jetty-http,jetty-io,jetty-security
               </includeArtifactIds>
               <outputDirectory>
                 ${basedir}/lib
               </outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
-              <excludeTransitive>true</excludeTransitive>
+              <excludeTransitive>false</excludeTransitive>
             </configuration>
           </execution>
           <execution>
@@ -86,7 +86,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <id>update-snapshot-jar-names</id>
@@ -153,12 +152,22 @@
     <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
+        <version>4.0.1</version>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-server</artifactId>
+        <version>${jetty-version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>${jetty-version}</version>
     </dependency>
     <dependency>
-        <groupId>org.eclipse.jetty.aggregate</groupId>
-        <artifactId>jetty-all</artifactId>
-        <version>9.2.9.v20150224</version>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp</artifactId>
+        <version>${jetty-version}</version>
     </dependency>
   </dependencies>
 </project>