Merge branch 'tmp/v1.2.0' (early part) into release

hltfbk · Dec 23, 2014 · 04e6f49 · 04e6f49
2 parents 6c97b1d + 8e3ac1c
commit 04e6f49
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,8 @@
 		<module>distsim</module>
 		<module>globalgraphoptimizer</module>
 		<module>lexicalinferenceminer</module>
-                <module>alignmentedas</module> 
+        <module>alignmentedas</module> 
+        <module>tracer</module> 
 	</modules>
 
         <profiles>

diff --git a/tracer/pom.xml b/tracer/pom.xml
@@ -1,11 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   	<parent>
 		<groupId>eu.excitementproject</groupId>
 		<artifactId>eop</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>tracer</artifactId>
 	<packaging>war</packaging>
@@ -22,7 +21,7 @@
     <dependency>
 		<groupId>eu.excitementproject</groupId>
 		<artifactId>common</artifactId>
-		<version>1.1.3-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</dependency>
 
     <dependency>

diff --git a/tracer/src/main/java/eu/excitementproject/eop/tracer/server/EntailmentServiceImpl.java b/tracer/src/main/java/eu/excitementproject/eop/tracer/server/EntailmentServiceImpl.java
@@ -23,6 +23,7 @@ public EntailmentServiceImpl()  {
 	@Override
 	public String resolve(String  text,String hypothesis) throws EntailmentServiceException {
 		try {
+			@SuppressWarnings("unused")
 			org.apache.uima.jcas.JCas jcas = UimaUtils.newJcas();
 			return "Hello World";
 		} catch (UimaUtilsException e) {