Merge 26782bf into f02347a

apache · May 26, 2022 · 7785ac3 · 7785ac3
2 parents f02347a + 26782bf
commit 7785ac3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml
diff --git 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 }}
@@ -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
@@ -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 -->
@@ -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 -->
@@ -227,7 +226,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 +658,9 @@ under the License.
     </profile>
 
     <profile>
-      <id>java9plus</id>
+      <id>java11plus</id>
       <activation>
-        <jdk>[9,14)</jdk>
+        <jdk>[11,14)</jdk>
       </activation>
       <build>
         <pluginManagement>