Make into a module for version 4.0

jfree · Feb 25, 2020 · a3cfe94 · a3cfe94
1 parent 203416b
commit a3cfe94
Show file tree

Hide file tree

Showing 28 changed files with 123 additions and 225 deletions.
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
 JFreeSVG
 ========
 
-Version 3.5, by David Gilbert, not yet released.
+Version 4.0, by David Gilbert, not yet released.
 
-(C)opyright 2013-2019, by Object Refinery Limited.  All rights reserved.
+(C)opyright 2013-2020, by Object Refinery Limited.  All rights reserved.
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jfree/jfreesvg/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.jfree/jfreesvg)
 
 
 Overview
 --------
-**JFreeSVG** is a graphics library for the Java(tm) platform that allows you to generate content in SVG format using the standard Java2D drawing API (`Graphics2D`).  JFreeSVG is light-weight, fast, and has no dependencies other than the Java runtime (1.6 or later).  
+**JFreeSVG** is a graphics library for the Java(tm) platform that allows you to generate content in SVG format using the standard Java2D drawing API (`Graphics2D`).  JFreeSVG is light-weight, fast, and has no dependencies other than the Java runtime (11 or later).  
 
 ![Sample from JFreeChart](http://www.jfree.org/jfreesvg/javadoc/doc-files/SVGTimeSeriesChartDemo1.svg)
 
@@ -36,11 +36,12 @@ JFreeSVG is published to the Central Repository.  You can include it in your pro
 
     <dependency>
         <groupId>org.jfree</groupId>
-        <artifactId>jfreesvg</artifactId>
-        <version>3.4</version>
+        <artifactId>org.jfree.svg</artifactId>
+        <version>4.0</version>
     </dependency>
 
-For developers using the Java Module System, JFreeSVG defines the automatic module name `org.jfree.jfreesvg`.
+For developers using the Java Module System, from version 4.0 JFreeSVG is 
+a modular library with the module name `org.jfree.svg`.
 
 
 Build
@@ -62,10 +63,13 @@ JFreeSVG is free software under the terms of the GNU General Public License vers
 Change History
 --------------
 
-Version 3.5 (not yet released)
+Version 4.0 (not yet released)
+- created a module for JFreeSVG: 'org.jfree.svg';
+- increased the minimum required Java version to 11;
+- changed the Maven artifact ID to match the module name;
+- removed 'graphics2d' from the package names;
 - fix drawArc() and fillArc() methods to draw pie arcs;
-- use java.util.Base64 instead of javax.xml.bind.DatatypeConverter;
-- minimum required Java version is now 1.8.
+- use java.util.Base64 instead of javax.xml.bind.DatatypeConverter.
 
 
 Version 3.4 (10 February 2019)

diff --git a/pom.xml b/pom.xml
@@ -4,8 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jfree</groupId>
-    <artifactId>jfreesvg</artifactId>
-    <version>3.5-SNAPSHOT</version>
+    <artifactId>org.jfree.svg</artifactId>
+    <version>4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>JFreeSVG</name>
@@ -52,24 +52,21 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
                     <encoding>${project.build.sourceEncoding}</encoding>               
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.1</version>
                 <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>org.jfree.jfreesvg</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
+                    <docfilessubdirs>true</docfilessubdirs>
+                    <linksource>true</linksource>
                 </configuration>
             </plugin>
         </plugins>
@@ -115,11 +112,11 @@
                     </plugin>
 
                     <plugin>
-                        <inherited>true</inherited>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
+                        <version>3.1.1</version>
                         <configuration>
+                            <docfilessubdirs>true</docfilessubdirs>
                             <linksource>true</linksource>
                         </configuration>
                         <executions>
@@ -135,7 +132,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
+                        <version>3.2.0</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>

diff --git a/src/main/java/doc-files/SVGBarChart3D.svg b/src/main/java/doc-files/SVGBarChart3D.svg
diff --git a/src/main/java/doc-files/SVGTimeSeriesChartDemo1.svg b/src/main/java/doc-files/SVGTimeSeriesChartDemo1.svg
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module org.jfree.svg {
+    requires java.desktop;
+    requires java.logging;
+    exports org.jfree.svg;
+}
diff --git a/src/main/java/org/jfree/graphics2d/ObjectUtils.java b/src/main/java/org/jfree/graphics2d/ObjectUtils.java
diff --git a/src/main/java/org/jfree/graphics2d/package-info.java b/src/main/java/org/jfree/graphics2d/package-info.java
diff --git a/src/main/java/org/jfree/graphics2d/svg/package-info.java b/src/main/java/org/jfree/graphics2d/svg/package-info.java
diff --git a/.../org/jfree/graphics2d/svg/FontMapper.java → src/main/java/org/jfree/svg/FontMapper.java b/.../org/jfree/graphics2d/svg/FontMapper.java → src/main/java/org/jfree/svg/FontMapper.java
@@ -2,7 +2,7 @@
  * JFreeSVG : an SVG library for the Java(tm) platform
  * ===================================================
  * 
- * (C)opyright 2013-2016, by Object Refinery Limited.  All rights reserved.
+ * (C)opyright 2013-2020, by Object Refinery Limited.  All rights reserved.
  *
  * Project Info:  http://www.jfree.org/jfreesvg/index.html
  * 
@@ -30,7 +30,7 @@
  * 
  */
 
-package org.jfree.graphics2d.svg;
+package org.jfree.svg;
 
 /**
  * An object that can (optionally) translate one font family name to an

diff --git a/...rg/jfree/graphics2d/svg/ImageElement.java → ...main/java/org/jfree/svg/ImageElement.java b/...rg/jfree/graphics2d/svg/ImageElement.java → ...main/java/org/jfree/svg/ImageElement.java
@@ -2,7 +2,7 @@
  * JFreeSVG : an SVG library for the Java(tm) platform
  * ===================================================
  * 
- * (C)opyright 2013-2016, by Object Refinery Limited.  All rights reserved.
+ * (C)opyright 2013-2020, by Object Refinery Limited.  All rights reserved.
  *
  * Project Info:  http://www.jfree.org/jfreesvg/index.html
  * 
@@ -30,10 +30,10 @@
  * 
  */
 
-package org.jfree.graphics2d.svg;
+package org.jfree.svg;
 
 import java.awt.Image;
-import org.jfree.graphics2d.Args;
+import org.jfree.svg.util.Args;
 
 /**
  * A {@code (String, Image)} pair that links together a reference ID and 
@@ -45,10 +45,10 @@
 public final class ImageElement {
 
     /** The filename specified in the href. */
-    private String href;
+    private final String href;
 
     /** The image. */
-    private Image image;
+    private final Image image;
 
     /**
      * Creates a new instance.

diff --git a/...org/jfree/graphics2d/svg/MeetOrSlice.java → src/main/java/org/jfree/svg/MeetOrSlice.java b/...org/jfree/graphics2d/svg/MeetOrSlice.java → src/main/java/org/jfree/svg/MeetOrSlice.java
@@ -2,7 +2,7 @@
  * JFreeSVG : an SVG library for the Java(tm) platform
  * ===================================================
  * 
- * (C)opyright 2013-2016, by Object Refinery Limited.  All rights reserved.
+ * (C)opyright 2013-2020, by Object Refinery Limited.  All rights reserved.
  *
  * Project Info:  http://www.jfree.org/jfreesvg/index.html
  * 
@@ -30,7 +30,7 @@
  * 
  */
 
-package org.jfree.graphics2d.svg;
+package org.jfree.svg;
 
 /**
  * An enumeration of the values for the {@code meetOrSlice} attribute.

diff --git a/...e/graphics2d/svg/PreserveAspectRatio.java → ...va/org/jfree/svg/PreserveAspectRatio.java b/...e/graphics2d/svg/PreserveAspectRatio.java → ...va/org/jfree/svg/PreserveAspectRatio.java
@@ -2,7 +2,7 @@
  * JFreeSVG : an SVG library for the Java(tm) platform
  * ===================================================
  * 
- * (C)opyright 2013-2016, by Object Refinery Limited.  All rights reserved.
+ * (C)opyright 2013-2020, by Object Refinery Limited.  All rights reserved.
  *
  * Project Info:  http://www.jfree.org/jfreesvg/index.html
  * 
@@ -30,7 +30,7 @@
  * 
  */
 
-package org.jfree.graphics2d.svg;
+package org.jfree.svg;
 
 /**
  * An enumeration of the values for the {@code preserveAspectRatio} attribute.