Skip to content
Snippets Groups Projects
Commit 0e749dea authored by srosse's avatar srosse
Browse files

OO-4007: update velocity, apache cxf, prefer jakarta.* apis over javax.*

parent b28db2a8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 60 deletions
pom.xml
+ 47
− 60
View file @ 0e749dea
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<org.springframework.version>5.1.6.RELEASE</org.springframework.version> <org.springframework.version>5.1.6.RELEASE</org.springframework.version>
<org.hibernate.version>5.4.2.Final</org.hibernate.version> <org.hibernate.version>5.4.2.Final</org.hibernate.version>
<com.sun.jersey.version>1.19.4</com.sun.jersey.version> <com.sun.jersey.version>1.19.4</com.sun.jersey.version>
<apache.cxf>3.3.1</apache.cxf> <apache.cxf>3.3.2</apache.cxf>
<apache.pdfbox>2.0.15</apache.pdfbox> <apache.pdfbox>2.0.15</apache.pdfbox>
<apache.poi>4.1.0</apache.poi> <apache.poi>4.1.0</apache.poi>
<apache.log4j>2.11.2</apache.log4j> <apache.log4j>2.11.2</apache.log4j>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<version.selenium>3.13.0</version.selenium> <version.selenium>3.13.0</version.selenium>
<version.drone>2.5.1</version.drone> <version.drone>2.5.1</version.drone>
<activemq.version>5.15.9</activemq.version> <activemq.version>5.15.9</activemq.version>
<qtiworks.version>1.0.15</qtiworks.version> <qtiworks.version>1.0.16</qtiworks.version>
<!-- properties for testing and Q&A --> <!-- properties for testing and Q&A -->
<!-- by default no tests are executed so far (April 2011). Use appropriate profiles and properties on the command line --> <!-- by default no tests are executed so far (April 2011). Use appropriate profiles and properties on the command line -->
...@@ -396,11 +396,23 @@ ...@@ -396,11 +396,23 @@
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${apache.cxf}</version> <version>${apache.cxf}</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId> <artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${apache.cxf}</version> <version>${apache.cxf}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
...@@ -413,9 +425,9 @@ ...@@ -413,9 +425,9 @@
<version>${apache.cxf}</version> <version>${apache.cxf}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.ws</groupId> <groupId>jakarta.xml.ws</groupId>
<artifactId>jaxws-api</artifactId> <artifactId>jakarta.xml.ws-api</artifactId>
<version>2.3.1</version> <version>2.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dom4j</groupId> <groupId>org.dom4j</groupId>
...@@ -431,6 +443,14 @@ ...@@ -431,6 +443,14 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -598,6 +618,14 @@ ...@@ -598,6 +618,14 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -2005,12 +2033,6 @@ ...@@ -2005,12 +2033,6 @@
<groupId>org.openolat.qtiworks</groupId> <groupId>org.openolat.qtiworks</groupId>
<artifactId>qtiworks-jqtiplus</artifactId> <artifactId>qtiworks-jqtiplus</artifactId>
<version>${qtiworks.version}</version> <version>${qtiworks.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openolat.qtiworks</groupId> <groupId>org.openolat.qtiworks</groupId>
...@@ -2018,34 +2040,16 @@ ...@@ -2018,34 +2040,16 @@
<version>${qtiworks.version}</version> <version>${qtiworks.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openolat.qtiworks</groupId> <groupId>org.openolat.qtiworks</groupId>
<artifactId>qtiworks-mathassess</artifactId> <artifactId>qtiworks-mathassess</artifactId>
<version>${qtiworks.version}</version> <version>${qtiworks.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openolat.qtiworks</groupId> <groupId>org.openolat.qtiworks</groupId>
<artifactId>qtiworks-mathassess-glue</artifactId> <artifactId>qtiworks-mathassess-glue</artifactId>
<version>${qtiworks.version}</version> <version>${qtiworks.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openolat.qtiworks</groupId> <groupId>org.openolat.qtiworks</groupId>
...@@ -2053,24 +2057,12 @@ ...@@ -2053,24 +2057,12 @@
<version>${qtiworks.version}</version> <version>${qtiworks.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openolat.qtiworks</groupId> <groupId>org.openolat.qtiworks</groupId>
<artifactId>qtiworks-samples</artifactId> <artifactId>qtiworks-samples</artifactId>
<version>${qtiworks.version}</version> <version>${qtiworks.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openolat.qtiworks</groupId> <groupId>org.openolat.qtiworks</groupId>
...@@ -2078,12 +2070,6 @@ ...@@ -2078,12 +2070,6 @@
<version>${qtiworks.version}</version> <version>${qtiworks.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- End dependency to qtiworks --> <!-- End dependency to qtiworks -->
<dependency> <dependency>
...@@ -2173,9 +2159,9 @@ ...@@ -2173,9 +2159,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.ws</groupId> <groupId>jakarta.xml.ws</groupId>
<artifactId>jaxws-api</artifactId> <artifactId>jakarta.xml.ws-api</artifactId>
<version>2.3.1</version> <version>2.3.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- core dependencies --> <!-- core dependencies -->
...@@ -2320,6 +2306,14 @@ ...@@ -2320,6 +2306,14 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -2343,7 +2337,7 @@ ...@@ -2343,7 +2337,7 @@
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId> <artifactId>velocity-engine-core</artifactId>
<version>2.0</version> <version>2.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
...@@ -2399,15 +2393,8 @@ ...@@ -2399,15 +2393,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId> <artifactId>jakarta.mail</artifactId>
<version>1.6.2</version> <version>1.6.3</version>
<!-- fxdiff: FXOLAT-243 included in JDK 1.6 -->
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.neemsoft</groupId> <groupId>com.neemsoft</groupId>
......
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