From 040c6ecd27cc82716d11ed130b7956dfeb525653 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Thu, 29 Jan 2015 15:38:43 +0100
Subject: [PATCH] Fixed module dependency
---
pom.xml | 25 -------------------
.../WEB-INF/jboss-deployment-structure.xml | 4 +--
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index a9d14e3..04cb5ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,31 +68,6 @@
<artifactId>cors-filter</artifactId>
<version>1.7.1</version>
</dependency>
- <!--dependency>
- <groupId>no.bioforsk.vips.model.</groupId>
- <artifactId>NaerstadModel</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>no.bioforsk.vips.model</groupId>
- <artifactId>AppleScabModel</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>no.bioforsk.vips.model</groupId>
- <artifactId>OatFloweringModel</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>no.bioforsk.vips</groupId>
- <artifactId>GrassDryingModel</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>no.bioforsk.vips</groupId>
- <artifactId>GenericPathogenPlantInfectionModel</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency-->
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 557a618..2b4e62f 100644
--- a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -22,8 +22,8 @@ along with VIPSCore. If not, see <http://www.bioforsk.no/licenses/>.
<dependencies>
<module name="no.bioforsk.vips.modelcontainer"/>
<module name="no.bioforsk.vips.VIPSCommon" export="true"/>
- <module name="org.codehaus.jackson.jackson-core-asl" />
- <module name="org.codehaus.jackson.jackson-mapper-asl" />
+ <module name="com.fasterxml.jackson.core.jackson-core" />
+ <module name="com.fasterxml.jackson.core.jackson-databind" />
</dependencies>
</deployment>
</jboss-deployment-structure>
--
GitLab