Merge changes of #13 from master.

x-stream · Jun 23, 2015 · b17db76 · b17db76
1 parent 7990e34
commit b17db76
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 48 deletions.
diff --git a/pom.xml b/pom.xml
@@ -97,6 +97,7 @@
       <properties>
         <version.java.source>1.3</version.java.source>
         <version.java.target>1.3</version.java.target>
+        <version.plugin.maven.enforcer>1.0-beta-1</version.plugin.maven.enforcer>
         <link.javadoc.javase>http://docs.oracle.com/javase/1.4.2/docs/api/</link.javadoc.javase>
         <!-- repeat Hibernate version dependencies, JDK intervals in activation is not supported with M2.0.x -->
         <version.hsqldb>1.8.0.10</version.hsqldb>
@@ -396,6 +397,13 @@
         <version>${version.xerces.impl}</version>
       </dependency>
 
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>${version.javax.activation}</version>
+        <scope>provided</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
@@ -804,6 +812,7 @@
     <version.dom4j>1.6.1</version.dom4j>
     <version.hsqldb>2.2.8</version.hsqldb>
     <version.javaassist>3.12.1.GA</version.javaassist>
+    <version.javax.activation>1.1.1</version.javax.activation>
     <version.jmock>1.0.1</version.jmock>
     <version.joda-time>1.6</version.joda-time>
     <version.junit>3.8.1</version.junit>

diff --git a/xstream-distribution/src/content/changes.html b/xstream-distribution/src/content/changes.html
@@ -36,6 +36,8 @@ <h2>Minor changes</h2>
 
     <ul>
     	<li>GH:#5: Support null values for JavaBean properties.</li>
+    	<li>GH:#13: Own converter for javax.activation.ActivationDataFlavor, because ExternalizableConverter cannot handle
+    	a type that violates the Java specification.</li>
     	<li>JIRA:XSTR-769: Synthetic fields with references to outer class use compiler dependent names.</li>
     	<li>JIRA:XSTR-771: UUID is an immutable type by default.</li>
     </ul>

diff --git a/xstream-distribution/src/content/converters.html b/xstream-distribution/src/content/converters.html
@@ -743,6 +743,31 @@
                 <td>normal</td>
             </tr>
 
+            <!-- .................................................................................................. -->
+            <tr>
+                <td colspan="5" class="headerRow"><h1 id="java.awt.font">java.awt.font</h1></td>
+            </tr>
+            <tr>
+                <th>Converter</th>
+                <th>Supported types</th>
+                <th>Example</th>
+                <th>Notes</th>
+                <th>Prio</th>
+            </tr>
+            <tr>
+                <td><a href="javadoc/com/thoughtworks/xstream/converters/extended/ActivationDataFlavorConverter.html">ActivationDataFlavorConverter</a></td>
+                <td>javax.activation.ActivationDataFlavor</td>
+                <td class="example">
+                    &lt;activation-data-flavor&gt;<br/>
+                    &nbsp;&nbsp;&lt;mimeType&gt;application/x-junit&lt;/mimeType&gt;<br/>
+                    &nbsp;&nbsp;&lt;humanRepresentableName&gt;JUnit&lt;/humanRepresentableName&gt;<br/>
+                    &nbsp;&nbsp;&lt;representationClass&gt;java.io.InputStream&lt;/representationClass&gt;<br/>
+                    &lt;/activation-data-flavor&gt;
+                </td>
+                <td>Available under Java 1.6 or greater. Only automatically registered if runtime has AWT support.<br/>
+                <td>normal</td>
+            </tr>
+
             <!-- .................................................................................................. -->
             <tr>
                 <td colspan="5" class="headerRow"><h1 id="javax.swing">javax.swing</h1></td>

diff --git a/xstream/pom.xml b/xstream/pom.xml
@@ -102,6 +102,11 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
+
     <!-- test-scoped -->
     <dependency>
       <groupId>junit</groupId>