diff --git a/pom.xml b/pom.xml index 3e24907c67d1b97942ec2c0df7d6309e19ffd73e..c9eebd2d5d77f0e3435b14c2e84577c6914393f8 100755 --- a/pom.xml +++ b/pom.xml @@ -14,26 +14,26 @@ <dependency> <groupId>javax</groupId> <artifactId>javaee-web-api</artifactId> - <version>7.0</version> + <version>8.0</version> <type>jar</type> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jaxrs</artifactId> - <version>3.0.9.Final</version> + <version>3.6.3.Final</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.4.1</version> + <version>2.9.8</version> <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.4.1</version> + <version>2.9.8</version> <scope>provided</scope> </dependency> <dependency> @@ -49,7 +49,7 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-client</artifactId> - <version>3.0.9.Final</version> + <version>3.6.3.Final</version> <scope>provided</scope> </dependency> <dependency> @@ -71,8 +71,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>10</source> + <target>10</target> </configuration> </plugin> <plugin> diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml index 11baf8dbd89bffdd89da35ba783651b91fa6e31e..e4433d6de375fad552e41bd5c95ec2bb2b0d3474 100755 --- a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml +++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -23,5 +23,8 @@ along with VIPSCore. If not, see <http://www.nibio.no/licenses/>. <module name="com.fasterxml.jackson.core.jackson-core" /> <module name="com.fasterxml.jackson.core.jackson-databind" /> </dependencies> + <exclusions> + <module name="org.jboss.resteasy.resteasy-json-binding-provider"/> + </exclusions> </deployment> </jboss-deployment-structure>