From d72650e70cc710d45bcb84de4fa05275ee278b0e Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Mon, 19 Jun 2017 16:57:45 +0100
Subject: [PATCH 1/8] build: Require a minimum of Java 1.6

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 008ebd8e..b54faba8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.2</version>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
         </configuration>
       </plugin>
       <plugin>
@@ -232,7 +232,7 @@
     <profile>
       <id>pre-java8</id>
       <activation>
-        <jdk>[1.5,1.8)</jdk>
+        <jdk>[1.6,1.8)</jdk>
       </activation>
       <build>
         <plugins>

From b59cc4ae0237b3086a2521ba233e1d2b3e020f17 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Mon, 19 Jun 2017 16:58:05 +0100
Subject: [PATCH 2/8] build: Update maven and plugin versions

---
 pom.xml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index b54faba8..e4567d8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
   <prerequisites>
-    <maven>2.2.1</maven>
+    <maven>3.0.5</maven>
   </prerequisites>
   <groupId>com.github.jai-imageio</groupId>  
     <artifactId>jai-imageio-jpeg2000</artifactId>
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.6.1</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -52,7 +52,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.4</version>
+        <version>3.0.1</version>
         <executions>
           <execution>
             <goals>
@@ -65,7 +65,7 @@
       <plugin> 
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
+        <version>3.0.2</version>
         <executions>
           <execution>
             <goals>
@@ -94,7 +94,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18.1</version>
+        <version>2.20</version>
         <configuration>
           <skip>false</skip>
           <systemProperties>
@@ -108,7 +108,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.3</version>
         <configuration>
           <releaseProfiles>release</releaseProfiles>
         </configuration>
@@ -116,7 +116,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>2.6.1</version>
+        <version>3.0.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -131,18 +131,18 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
+        <version>3.0.2</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.6</version>
       </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
-        <version>2.3.7</version>
+        <version>3.3.0</version>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
@@ -164,13 +164,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+	<groupId>org.codehaus.mojo</groupId>
+	<artifactId>versions-maven-plugin</artifactId>
+	<version>2.4</version>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.1</version>
+          <version>2.10.4</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -272,7 +277,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.8</version>
+          <version>2.9</version>
           <reportSets>
             <reportSet>
               <reports>

From a1ac736a56a12f4afa6c3ddb7213602fcb50ab81 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Mon, 19 Jun 2017 17:01:42 +0100
Subject: [PATCH 3/8] build: maven-jar-plugin does not need default goal
 specifying

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e4567d8f..fbe471ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,6 @@
         <executions>
           <execution>
             <goals>
-              <goal>jar</goal>
               <goal>test-jar</goal>
             </goals>
           </execution>

From a48fef5b9156b0c6c43a1fb69f78651126e1028d Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Mon, 19 Jun 2017 17:02:19 +0100
Subject: [PATCH 4/8] build: Require jai-image-core 1.3.2-SNAPSHOT for
 equivalent Java9 support

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fbe471ee..334e9e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-      <jaiimageio.core.version>1.3.1</jaiimageio.core.version>
+      <jaiimageio.core.version>1.3.2-SNAPSHOT</jaiimageio.core.version>
     </properties>
 
     <name>JPEG2000 support for Java Advanced Imaging Image I/O Tools API</name>

From 6a8942787d55bbfe705463db7e9d6db1c16f826c Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Mon, 19 Jun 2017 17:12:47 +0100
Subject: [PATCH 5/8] travis: Maven plugins now require Java 7; drop Java 6
 build

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ebea2e33..41ca5604 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: java
 jdk:
   - oraclejdk7
-  - openjdk6
+  - oraclejdk8
   - openjdk7
+    #  - openjdk8

From 5de63a237c4b6d5fce36f9314fcb5afdf3e19889 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Tue, 24 Apr 2018 11:57:15 +0100
Subject: [PATCH 6/8] build: Depend on imageio core 1.4.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 334e9e07..74b80133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-      <jaiimageio.core.version>1.3.2-SNAPSHOT</jaiimageio.core.version>
+      <jaiimageio.core.version>1.4.0</jaiimageio.core.version>
     </properties>
 
     <name>JPEG2000 support for Java Advanced Imaging Image I/O Tools API</name>

From eff28bac5d03e68032661d7509053683b89413cb Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Tue, 24 Apr 2018 12:04:44 +0100
Subject: [PATCH 7/8] ci: Test on travis-supported JDKs

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 41ca5604..cff3613c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - oraclejdk7
   - oraclejdk8
+  - oraclejdk9
   - openjdk7
-    #  - openjdk8
+  - openjdk8

From 8ae475210753d09f4b2fe19b0722d39c06fdc142 Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@dundee.ac.uk>
Date: Tue, 24 Apr 2018 12:19:02 +0100
Subject: [PATCH 8/8] build: Update plugin versions

---
 pom.xml | 90 +++++++++++++++------------------------------------------
 1 file changed, 24 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index 74b80133..b23a162a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.7.0</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -93,7 +93,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20</version>
+        <version>2.21.0</version>
         <configuration>
           <skip>false</skip>
           <systemProperties>
@@ -135,13 +135,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.6</version>
+        <version>3.7</version>
       </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
-        <version>3.3.0</version>
+        <version>3.5.0</version>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
@@ -166,18 +166,28 @@
       <plugin>
 	<groupId>org.codehaus.mojo</groupId>
 	<artifactId>versions-maven-plugin</artifactId>
-	<version>2.4</version>
+	<version>2.5</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <goals>
+               <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <linksource>true</linksource>
+          <protected>true</protected>
+          <links>
+            <link>http://docs.oracle.com/javase/8/docs/api/</link>
+          </links>
+        </configuration>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.4</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
   <profiles>
@@ -203,58 +213,6 @@
         </plugins>
       </build>
     </profile>
-
-    <profile>
-      <id>java8-and-higher</id>
-      <activation>
-        <jdk>[1.8,</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-              <linksource>true</linksource>
-              <protected>true</protected>
-              <links>
-                <link>http://docs.oracle.com/javase/8/docs/api/</link>
-              </links>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>pre-java8</id>
-      <activation>
-        <jdk>[1.6,1.8)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <!-- Override config without doclint option -->
-              <linksource>true</linksource>
-              <protected>true</protected>
-              <links>
-                <link>http://docs.oracle.com/javase/7/docs/api/</link>
-              </links>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
     <dependencies>