From b37f311cacca3f5a97caa6f165a0e3d5b4eb2b2f Mon Sep 17 00:00:00 2001
From: David Cromberge <dcromberge@apache.org>
Date: Wed, 25 May 2022 17:18:22 +0100
Subject: [PATCH 1/5] Update datasketches memory to 2.1.0

This is a minimal update that updates the
Datasketches-Memory dependency and removes
Github Actions matrix testing for unsupported Java
versions.
---
 .github/workflows/.toolchains.xml | 42 ++++++++++++++++++++++++++++++-
 .github/workflows/maven.yml       |  2 +-
 pom.xml                           |  2 +-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml
index a7d116112..70b6e51af 100644
--- a/.github/workflows/.toolchains.xml
+++ b/.github/workflows/.toolchains.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF8"?>
 <toolchains>
+    <toolchain>
+        <type>jdk</type>
+        <provides>
+            <version>1.8</version>
+            <vendor>openjdk</vendor>
+        </provides>
+        <configuration>
+            <jdkHome>${env.JAVA8_HOME}</jdkHome>
+        </configuration>
+    </toolchain>
     <toolchain>
         <type>jdk</type>
         <provides>
@@ -7,7 +17,37 @@
             <vendor>openjdk</vendor>
         </provides>
         <configuration>
-            <jdkHome>${JAVA_HOME}</jdkHome>
+            <jdkHome>${env.JAVA8_HOME}</jdkHome>
+        </configuration>
+    </toolchain>
+    <toolchain>
+        <type>jdk</type>
+        <provides>
+            <version>11</version>
+            <vendor>openjdk</vendor>
+        </provides>
+        <configuration>
+            <jdkHome>${env.JAVA11_HOME}</jdkHome>
+        </configuration>
+    </toolchain>
+    <toolchain>
+        <type>jdk</type>
+        <provides>
+            <version>12</version>
+            <vendor>openjdk</vendor>
+        </provides>
+        <configuration>
+            <jdkHome>${env.JAVA12_HOME}</jdkHome>
+        </configuration>
+    </toolchain>
+    <toolchain>
+        <type>jdk</type>
+        <provides>
+            <version>13</version>
+            <vendor>openjdk</vendor>
+        </provides>
+        <configuration>
+            <jdkHome>${env.JAVA13_HOME}</jdkHome>
         </configuration>
     </toolchain>
 </toolchains>
\ No newline at end of file
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5160c5797..680be82b7 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -17,7 +17,7 @@ jobs:
         strategy:
           fail-fast: false
           matrix:
-              jdk: [ 8,9,10,11,12,13 ]
+              jdk: [ 8,11,12,13 ]
 
         env:
           JDK_VERSION: ${{ matrix.jdk }}
diff --git a/pom.xml b/pom.xml
index 19d6aa95b..b8914e314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@ under the License.
 
   <properties>
     <!-- UNIQUE FOR THIS JAVA COMPONENT -->
-    <datasketches-memory.version>2.0.0</datasketches-memory.version>
+    <datasketches-memory.version>2.1.0</datasketches-memory.version>
     <!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
 
     <!-- Test -->

From 1e0c1c2004243438e230542fc26fdacfb229fcc6 Mon Sep 17 00:00:00 2001
From: David Cromberge <dcromberge@apache.org>
Date: Thu, 26 May 2022 15:25:06 +0100
Subject: [PATCH 2/5] Update java version activation string

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

diff --git a/pom.xml b/pom.xml
index b8914e314..76ce059fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,7 +227,7 @@ under the License.
               <configuration>
                 <rules>
                   <requireJavaVersion>
-                    <version>[1.8,1.9),[8,14)</version>
+                    <version>[1.8,1.9),[8],[11,14)</version>
                   </requireJavaVersion>
                   <requireMavenVersion>
                     <version>[${maven.version},)</version>
@@ -659,9 +659,9 @@ under the License.
     </profile>
 
     <profile>
-      <id>java9plus</id>
+      <id>java11plus</id>
       <activation>
-        <jdk>[9,14)</jdk>
+        <jdk>[11,14)</jdk>
       </activation>
       <build>
         <pluginManagement>

From 06c54f9cf158a96b73bc73537d5c84fbae2e6784 Mon Sep 17 00:00:00 2001
From: David Cromberge <dcromberge@apache.org>
Date: Thu, 26 May 2022 16:07:45 +0100
Subject: [PATCH 3/5] Experimental: remove toolchains

---
 .github/workflows/.toolchains.xml | 53 -------------------------------
 .github/workflows/maven.yml       |  3 --
 pom.xml                           |  1 -
 3 files changed, 57 deletions(-)
 delete mode 100644 .github/workflows/.toolchains.xml

diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml
deleted file mode 100644
index 70b6e51af..000000000
--- a/.github/workflows/.toolchains.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<toolchains>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>1.8</version>
-            <vendor>openjdk</vendor>
-        </provides>
-        <configuration>
-            <jdkHome>${env.JAVA8_HOME}</jdkHome>
-        </configuration>
-    </toolchain>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>8</version>
-            <vendor>openjdk</vendor>
-        </provides>
-        <configuration>
-            <jdkHome>${env.JAVA8_HOME}</jdkHome>
-        </configuration>
-    </toolchain>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>11</version>
-            <vendor>openjdk</vendor>
-        </provides>
-        <configuration>
-            <jdkHome>${env.JAVA11_HOME}</jdkHome>
-        </configuration>
-    </toolchain>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>12</version>
-            <vendor>openjdk</vendor>
-        </provides>
-        <configuration>
-            <jdkHome>${env.JAVA12_HOME}</jdkHome>
-        </configuration>
-    </toolchain>
-    <toolchain>
-        <type>jdk</type>
-        <provides>
-            <version>13</version>
-            <vendor>openjdk</vendor>
-        </provides>
-        <configuration>
-            <jdkHome>${env.JAVA13_HOME}</jdkHome>
-        </configuration>
-    </toolchain>
-</toolchains>
\ No newline at end of file
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 680be82b7..773c3237a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -52,14 +52,12 @@ jobs:
               mvn clean test
               -Dmaven.javadoc.skip=true
               -Dgpg.skip=true
-              --toolchains .github/workflows/.toolchains.xml
 
         - name: Install Dependencies
           run: >
               mvn clean install -B -V -q
               -DskipTests=true
               -Dgpg.skip=true
-              --toolchains .github/workflows/.toolchains.xml
 
         - name: Report
           if: ${{ matrix.jdk == 8 && success() }}
@@ -68,4 +66,3 @@ jobs:
               -Dcoveralls-repo-token=${repo_token}
               -Dmaven.javadoc.skip=true
               -Dgpg.skip=true
-              --toolchains .github/workflows/.toolchains.xml
diff --git a/pom.xml b/pom.xml
index 76ce059fc..2ff45f3a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,6 @@ under the License.
     <maven-remote-resources-plugin.version>[1.7.0,)</maven-remote-resources-plugin.version> <!-- overrides parent -->
     <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <!-- overrides parent -->
     <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> <!-- overrides parent -->
-    <maven-toolchains-plugin.version>3.0.0</maven-toolchains-plugin.version>
     <!-- Apache Plugins -->
     <apache-rat-plugin.version>0.13</apache-rat-plugin.version> <!-- overrides parent -->
     <!-- org.jacoco Maven Plugins -->

From d7016487cc0c230a9b3501dd7db392126e3db0ff Mon Sep 17 00:00:00 2001
From: David Cromberge <dcromberge@apache.org>
Date: Thu, 26 May 2022 16:17:30 +0100
Subject: [PATCH 4/5] Intentionally break build to validate current java
 profile

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

diff --git a/pom.xml b/pom.xml
index 2ff45f3a4..4e5ce1c65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -676,7 +676,6 @@ under the License.
                 <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 <reportsDirectory>${project.build.directory}/test-output/${maven.build.timestamp}</reportsDirectory>
                 <argLine>@{argLine}
-                  --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
                   --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
                   --add-opens java.base/java.nio=ALL-UNNAMED
                   --add-opens java.base/sun.nio.ch=ALL-UNNAMED

From 26782bf5b817fe696c7f953ea67b3c5e021708b6 Mon Sep 17 00:00:00 2001
From: David Cromberge <dcromberge@apache.org>
Date: Thu, 26 May 2022 16:21:43 +0100
Subject: [PATCH 5/5] Revert "Intentionally break build to validate current
 java profile"

This reverts commit d7016487cc0c230a9b3501dd7db392126e3db0ff.
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 4e5ce1c65..2ff45f3a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -676,6 +676,7 @@ under the License.
                 <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 <reportsDirectory>${project.build.directory}/test-output/${maven.build.timestamp}</reportsDirectory>
                 <argLine>@{argLine}
+                  --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
                   --add-exports java.base/jdk.internal.ref=ALL-UNNAMED
                   --add-opens java.base/java.nio=ALL-UNNAMED
                   --add-opens java.base/sun.nio.ch=ALL-UNNAMED