[xstream-scm] [2276] trunk: Make compilable with Oracle compiler.

[joehni]

Title: [2276] trunk: Make compilable with Oracle compiler.

Revision

2276

Author

joehni

Date

2014-03-12 18:19:40 -0500 (Wed, 12 Mar 2014)

Log Message

Make compilable with Oracle compiler.

Modified Paths

• trunk/pom.xml
• trunk/xstream/pom.xml
• trunk/xstream/src/java/com/thoughtworks/xstream/converters/enums/EnumSingleValueConverter.java

Property Changed

trunk/

Diff

Property changes: trunk

Modified: svn:mergeinfo

+ /branches/v-1.4.x:2169,2179,2181,2183,2193,2253-2256,2261-2266,2268-2272

Modified: trunk/pom.xml (2275 => 2276)

--- trunk/pom.xml	2014-03-12 23:18:31 UTC (rev 2275)
+++ trunk/pom.xml	2014-03-12 23:19:40 UTC (rev 2276)
@@ -668,7 +668,7 @@
     <version.plugin.maven.antrun>1.1</version.plugin.maven.antrun>
     <version.plugin.maven.assembly>2.1</version.plugin.maven.assembly>
     <version.plugin.maven.clean>2.2</version.plugin.maven.clean>
-    <version.plugin.maven.compiler>2.1</version.plugin.maven.compiler><!-- JDK 1.4 compatible -->
+    <version.plugin.maven.compiler>3.1</version.plugin.maven.compiler>
     <version.plugin.maven.dependency>2.1</version.plugin.maven.dependency>
     <version.plugin.maven.deploy>2.3</version.plugin.maven.deploy>
     <version.plugin.maven.install>2.2</version.plugin.maven.install>

Modified: trunk/xstream/pom.xml (2275 => 2276)

--- trunk/xstream/pom.xml	2014-03-12 23:18:31 UTC (rev 2275)
+++ trunk/xstream/pom.xml	2014-03-12 23:19:40 UTC (rev 2276)
@@ -226,6 +226,9 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
+              <compilerArgs>
+                <arg>-XDignore.symbol.file</arg>
+              </compilerArgs>
               <testExcludes>
                 <exclude>**/extended/*17Test*</exclude>
               </testExcludes>

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/enums/EnumSingleValueConverter.java (2275 => 2276)

--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/enums/EnumSingleValueConverter.java	2014-03-12 23:18:31 UTC (rev 2275)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/enums/EnumSingleValueConverter.java	2014-03-12 23:19:40 UTC (rev 2276)
@@ -24,7 +24,7 @@
     private final Class<T> enumType;
 
     public EnumSingleValueConverter(final Class<T> type) {
-        if (!Enum.class.isAssignableFrom(type) && type != Enum.class) {
+        if (!Enum.class.isAssignableFrom(type) && !Enum.class.equals(type)) {
             throw new IllegalArgumentException("Converter can only handle defined enums");
         }
         enumType = type;

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email