diff --git a/pom.xml b/pom.xml index 416b1901f9684c43607396cf76241014dc89b148..187642f91a487065551202269d3dbe16d3c8b0ac 100644 --- a/pom.xml +++ b/pom.xml @@ -28,12 +28,24 @@ <artifactId>resteasy-jaxrs</artifactId> <version>3.0.2.Final</version> <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>1.9.12</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.9.12</version> + <scope>provided</scope> </dependency> <dependency> <groupId>no.bioforsk.vips.common</groupId> <artifactId>VIPSCommon</artifactId> <version>1.0-SNAPSHOT</version> - <!--scope>provided</scope--> + <scope>provided</scope> </dependency> <dependency> <groupId>com.thetransactioncompany</groupId> @@ -43,7 +55,8 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-client</artifactId> - <version>3.0.2.Final</version> + <version>3.0.9.Final</version> + <scope>provided</scope> </dependency> </dependencies> diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml new file mode 100644 index 0000000000000000000000000000000000000000..7ae9c099ffa36cf64b6ea60a5e1ba4e956e2315f --- /dev/null +++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. + +This file is part of VIPSCore. +VIPSCore is free software: you can redistribute it and/or modify +it under the terms of the Bioforsk Open Source License as published by +Bioforsk, either version 1 of the License, or (at your option) any +later version. + +VIPSCore is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +Bioforsk Open Source License for more details. + +You should have received a copy of the Bioforsk Open Source License +along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>. + +--> +<jboss-deployment-structure> + <deployment> + <dependencies> + <module name="no.bioforsk.vips.VIPSCommon" export="true"/> + <module name="org.codehaus.jackson.jackson-core-asl" /> + <module name="org.codehaus.jackson.jackson-mapper-asl" /> + </dependencies> + </deployment> +</jboss-deployment-structure>