You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by mi...@apache.org on 2013/02/12 17:36:59 UTC
svn commit: r1445248 - in /tika/trunk: tika-parent/pom.xml
tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java
tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java
Author: mikemccand
Date: Tue Feb 12 16:36:59 2013
New Revision: 1445248
URL: http://svn.apache.org/r1445248
Log:
change Tika to accept Java 1.6 source and write Java 1.6 bytecode
Modified:
tika/trunk/tika-parent/pom.xml
tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java
Modified: tika/trunk/tika-parent/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parent/pom.xml?rev=1445248&r1=1445247&r2=1445248&view=diff
==============================================================================
--- tika/trunk/tika-parent/pom.xml (original)
+++ tika/trunk/tika-parent/pom.xml Tue Feb 12 16:36:59 2013
@@ -249,8 +249,8 @@
</dependencyManagement>
<properties>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
</properties>
Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java?rev=1445248&r1=1445247&r2=1445248&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/CSVMessageBodyWriter.java Tue Feb 12 16:36:59 2013
@@ -48,7 +48,7 @@ public class CSVMessageBodyWriter implem
return -1;
}
- // @Override -- not until Java 1.6
+ @Override
public void writeTo(Metadata metadata, Class<?> type, Type genericType, Annotation[] annotations,
MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException,
WebApplicationException {
Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java?rev=1445248&r1=1445247&r2=1445248&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/JSONMessageBodyWriter.java Tue Feb 12 16:36:59 2013
@@ -48,7 +48,7 @@ public class JSONMessageBodyWriter imple
return -1;
}
- // @Override -- not until Java 1.6
+ @Override
public void writeTo(Metadata metadata, Class<?> type, Type genericType, Annotation[] annotations,
MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException,
WebApplicationException {