Verified Commit 1d6f40ad authored by Matthias Neugebauer's avatar Matthias Neugebauer
Browse files

Fix pom for 8.x

parent 8899e75b
......@@ -28,10 +28,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
......
......@@ -29,8 +29,8 @@
<artifactId>java-jwt</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
......@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
<artifactId>javax.persistence</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
......@@ -52,10 +52,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
......
......@@ -21,7 +21,8 @@
<!-- library version specifications -->
<opencast.version>[6.6,9.0)</opencast.version>
<aws.version>1.11.469_1</aws.version>
<aws.version>1.11.49_1</aws.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version>
<commons-codec.version>1.12</commons-codec.version>
<commons-collections.version>4.3</commons-collections.version>
<commons-compress.version>1.19</commons-compress.version>
......@@ -29,23 +30,23 @@
<commons-fileupload.version>1.4</commons-fileupload.version>
<commons-lang3.version>3.8.1</commons-lang3.version>
<commons-text.version>1.7</commons-text.version>
<cxf.version>3.3.3</cxf.version>
<eclipselink.version>2.7.5</eclipselink.version>
<cxf.version>3.2.6</cxf.version>
<eclipselink.version>2.7.3</eclipselink.version>
<functional.version>1.4.2</functional.version>
<guava.version>23.0</guava.version>
<httpcomponents-httpclient.version>4.5.10</httpcomponents-httpclient.version>
<httpcomponents-httpcore.version>4.4.12</httpcomponents-httpcore.version>
<httpcomponents-httpclient.version>4.5.7</httpcomponents-httpclient.version>
<httpcomponents-httpcore.version>4.4.11</httpcomponents-httpcore.version>
<jackson.version>2.10.0</jackson.version>
<jersey.version>2.29.1</jersey.version>
<jdk.version>1.8</jdk.version>
<joda-time.version>2.10.1</joda-time.version>
<json-simple.version>1.1.1</json-simple.version>
<karaf.version>4.2.7</karaf.version>
<mina.version>2.1.3</mina.version>
<karaf.version>4.2.2</karaf.version>
<mina.version>2.1.0</mina.version>
<node.version>v10.16.0</node.version>
<npm.version>6.9.0</npm.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<osgi.core.version>5.0.0</osgi.core.version>
<osgi.enterprise.version>5.0.0</osgi.enterprise.version>
<querydsl.version>3.7.4</querydsl.version>
<spring.version>3.1.4.RELEASE</spring.version>
<spring-security.version>3.1.7.RELEASE</spring-security.version>
......@@ -78,7 +79,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.7.0</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
......@@ -89,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.0.0-M1</version>
<executions>
<execution>
<id>enforce-maven</id>
......@@ -143,7 +144,6 @@
<java.util.logging.config.file>${basedir}/conf/services/java.util.logging.properties</java.util.logging.config.file>
<logj4.configuration>${basedir}/docs/log4j/log4j.properties</logj4.configuration>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
<java.locale.providers>COMPAT</java.locale.providers> <!-- Date formats changed with java 9 -->
</systemPropertyVariables>
</configuration>
</plugin>
......@@ -156,7 +156,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.29</version>
<version>8.21</version>
</dependency>
</dependencies>
<configuration>
......@@ -194,6 +194,30 @@
<check/>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-artifact</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>${project.packaging}</type>
</artifactItem>
</artifactItems>
<outputDirectory>${collection.basedir}/target</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
......@@ -290,7 +314,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.26.2</version>
<version>1.26.0</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
......@@ -368,7 +392,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.0</version>
<version>3.5</version>
</plugin>
<plugin>
<groupId>org.antlr</groupId>
......@@ -383,7 +407,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
......@@ -505,37 +529,7 @@
<failOnWarning>true</failOnWarning>
</configuration>
</execution>
<execution>
<id>copy-artifact</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>${project.packaging}</type>
</artifactItem>
</artifactItems>
<outputDirectory>${collection.basedir}/target</outputDirectory>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>7.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-analyzer</artifactId>
<version>1.11.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
......@@ -642,7 +636,12 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
<version>5.15.11</version>
<version>5.15.9</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>3.1.4</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
......@@ -725,31 +724,26 @@
<scope>provided</scope>
</dependency>
<!-- JSRs -->
<!-- Java 8 = JAX-B Version 2.2.8 -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.10</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
<version>2.2.10</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3-b02</version>
<exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
<version>2.2.10</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.1</version>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
......@@ -757,14 +751,14 @@
<version>1.4.7</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>2.1.6</version>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
<version>1.19.4</version>
</dependency>
<!-- JPA -->
<dependency>
......@@ -794,8 +788,8 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>jakarta.persistence</artifactId>
<version>2.2.3</version>
<artifactId>javax.persistence</artifactId>
<version>2.1.0</version>
</dependency>
<!-- CXF -->
<dependency>
......@@ -937,7 +931,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xerces</artifactId>
<version>2.12.0_1</version>
<version>2.9.1_3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
......@@ -953,7 +947,7 @@
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
<version>4.1</version>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
......@@ -972,6 +966,11 @@
<artifactId>com.springsource.org.jdom</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>com.springsource.org.apache.lucene</artifactId>
<version>2.4.1</version>
</dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
......@@ -1047,23 +1046,22 @@
<artifactId>influxdb-java</artifactId>
<version>2.15</version>
</dependency>
<!-- testing -->
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>json-path</artifactId>
<version>4.1.2</version>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>xml-path</artifactId>
<version>4.1.2</version>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>4.1.2</version>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
......@@ -1075,23 +1073,23 @@
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.5.8</version>
<version>2.3.6</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
</dependency>
<!-- testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
......@@ -1106,7 +1104,7 @@
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
<version>0.9.5.5</version>
<version>0.9.5.4</version>
</dependency>
<dependency>
<groupId>com.entwinemedia.common</groupId>
......@@ -1114,9 +1112,10 @@
<version>${functional.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xalan</artifactId>
<version>2.7.2_3</version>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
......@@ -1124,9 +1123,9 @@
<version>2.8.5</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.5.3</version>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.43</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment