Skip to content

Commit e198781

Browse files
Merge pull request #401 from apache/upgrade-datasketches-memory
Update datasketches memory to 2.1.0
2 parents f02347a + 26782bf commit e198781

3 files changed

Lines changed: 5 additions & 22 deletions

File tree

.github/workflows/.toolchains.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/maven.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
jdk: [ 8,9,10,11,12,13 ]
20+
jdk: [ 8,11,12,13 ]
2121

2222
env:
2323
JDK_VERSION: ${{ matrix.jdk }}
@@ -52,14 +52,12 @@ jobs:
5252
mvn clean test
5353
-Dmaven.javadoc.skip=true
5454
-Dgpg.skip=true
55-
--toolchains .github/workflows/.toolchains.xml
5655
5756
- name: Install Dependencies
5857
run: >
5958
mvn clean install -B -V -q
6059
-DskipTests=true
6160
-Dgpg.skip=true
62-
--toolchains .github/workflows/.toolchains.xml
6361
6462
- name: Report
6563
if: ${{ matrix.jdk == 8 && success() }}
@@ -68,4 +66,3 @@ jobs:
6866
-Dcoveralls-repo-token=${repo_token}
6967
-Dmaven.javadoc.skip=true
7068
-Dgpg.skip=true
71-
--toolchains .github/workflows/.toolchains.xml

pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ under the License.
8484

8585
<properties>
8686
<!-- UNIQUE FOR THIS JAVA COMPONENT -->
87-
<datasketches-memory.version>2.0.0</datasketches-memory.version>
87+
<datasketches-memory.version>2.1.0</datasketches-memory.version>
8888
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
8989

9090
<!-- Test -->
@@ -118,7 +118,6 @@ under the License.
118118
<maven-remote-resources-plugin.version>[1.7.0,)</maven-remote-resources-plugin.version> <!-- overrides parent -->
119119
<maven-source-plugin.version>3.2.1</maven-source-plugin.version> <!-- overrides parent -->
120120
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> <!-- overrides parent -->
121-
<maven-toolchains-plugin.version>3.0.0</maven-toolchains-plugin.version>
122121
<!-- Apache Plugins -->
123122
<apache-rat-plugin.version>0.13</apache-rat-plugin.version> <!-- overrides parent -->
124123
<!-- org.jacoco Maven Plugins -->
@@ -227,7 +226,7 @@ under the License.
227226
<configuration>
228227
<rules>
229228
<requireJavaVersion>
230-
<version>[1.8,1.9),[8,14)</version>
229+
<version>[1.8,1.9),[8],[11,14)</version>
231230
</requireJavaVersion>
232231
<requireMavenVersion>
233232
<version>[${maven.version},)</version>
@@ -659,9 +658,9 @@ under the License.
659658
</profile>
660659

661660
<profile>
662-
<id>java9plus</id>
661+
<id>java11plus</id>
663662
<activation>
664-
<jdk>[9,14)</jdk>
663+
<jdk>[11,14)</jdk>
665664
</activation>
666665
<build>
667666
<pluginManagement>

0 commit comments

Comments
 (0)