Prepare for 1.0.2 release

cowtowncoder · cowtowncoder · commit 525c9414d0c9 · 2019-09-17T20:17:09.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <groupId>com.fasterxml</groupId>
     <artifactId>oss-parent</artifactId>
-    <version>24</version>
+    <version>38</version>
   </parent>
   <groupId>com.fasterxml.util</groupId>
   <artifactId>java-merge-sort</artifactId>
   <name>java-merge-sort</name>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.0.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>Basic configurable disk-backed N-way merge sort
   </description>
@@ -37,6 +37,9 @@
   <properties>
     <javac.src.version>1.6</javac.src.version>
     <javac.target.version>1.6</javac.target.version>
+
+      <!-- 1.0.2 adds "Automatic-Module-Name" for JDK 9 -->
+      <jdk.module.name>com.fasterxml.sort</jdk.module.name>
   </properties>
 
   <dependencyManagement>
@@ -45,7 +48,7 @@
       <groupId>com.fasterxml.jackson</groupId>
       <artifactId>jackson-bom</artifactId>
       <type>pom</type>
-      <version>2.8.6</version>
+      <version>2.9.9</version>
       <scope>import</scope>
     </dependency>
    </dependencies>
@@ -56,7 +59,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
 
@@ -86,7 +89,7 @@
               <target>${version.jdk}</target>
               <encoding>UTF-8</encoding>
               <links>
-                <link>http://docs.oracle.com/javase/7/docs/api/</link>
+                <link>http://docs.oracle.com/javase/8/docs/api/</link>
               </links>
             </configuration>
 
@@ -105,10 +108,10 @@
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.3.7</version>
           <extensions>true</extensions>
           <configuration>
             <instructions>
+              <Automatic-Module-Name>${jdk.module.name}</Automatic-Module-Name>
               <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
               <Bundle-Vendor>com.fasterxml</Bundle-Vendor>
               <Import-Package>
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -14,3 +14,7 @@ Nathan Williams (nathanlws@github)
 Mathias Herberts (hbs@github)
   * Reported #14: Long lines are corrupted when read by `RawTextLineReader._readNextSlow()`
    (1.0.1)
+
+john lilley (wheezil@github)
+  * Reported, contributed fix for #16: Temp files that result from two-phase merge are not deleted
+   (1.0.2)
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -1,15 +1,21 @@
 Project: java-merge-sort
 License: Apache License 2.0
-Version: 1.0.1
-Release date: 14-Feb-2017
+Version: 1.0.2
+Release date: 2019-09-18
 
-#14: Long lines are corrupted when read by `RawTextLineReader._readNextSlow()`
- (reported by Mathias H, hbs@github)
+#16: Temp files that result from two-phase merge are not deleted
+ (reported, fix contributed by John L)
+- Add `Automatic-Module-Name` of "com.fasterxml.sort"
 
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------
 
+1.0.1 (2017-02-14)
+
+#14: Long lines are corrupted when read by `RawTextLineReader._readNextSlow()`
+ (reported by Mathias H, hbs@github)
+
 1.0.0 (04-Jun-2014)
 
 The first official non-beta release. No changes since 0.9.1.
