You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by dc...@apache.org on 2021/03/27 20:37:28 UTC
[datasketches-memory] branch multi-module-experimental updated:
Target java 11
This is an automated email from the ASF dual-hosted git repository.
dcromberge pushed a commit to branch multi-module-experimental
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/multi-module-experimental by this push:
new 9e7c796 Target java 11
9e7c796 is described below
commit 9e7c7968a7b5ae7198dfd6e028d006bf1fe1c9bf
Author: David Cromberge <da...@gmail.com>
AuthorDate: Sat Mar 27 20:37:16 2021 +0000
Target java 11
---
.github/workflows/.toolchains.xml | 10 ++++++++++
.../pom.xml | 10 +++++-----
.../src/main/java/module-info.java | 0
.../java/org/apache/datasketches/memory/CleanerWrapper.java | 0
.../java/org/apache/datasketches/memory/NioBitsFields.java | 0
.../src/main/javadoc/overview.html | 0
.../org/apache/datasketches/memory/AllocateDirectTest.java | 0
datasketches-memory-multirelease/src/assembly/mrjar.xml | 6 +++---
pom.xml | 4 ++--
9 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml
index 111252f..982260d 100644
--- a/.github/workflows/.toolchains.xml
+++ b/.github/workflows/.toolchains.xml
@@ -13,6 +13,16 @@
<toolchain>
<type>jdk</type>
<provides>
+ <version>9</version>
+ <vendor>adoptopenjdk</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>${env.JAVA9_HOME}</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
<version>11</version>
<vendor>adoptopenjdk</vendor>
</provides>
diff --git a/datasketches-memory-java11/pom.xml b/datasketches-memory-java9/pom.xml
similarity index 94%
rename from datasketches-memory-java11/pom.xml
rename to datasketches-memory-java9/pom.xml
index ee92c7d..3440597 100644
--- a/datasketches-memory-java11/pom.xml
+++ b/datasketches-memory-java9/pom.xml
@@ -28,7 +28,7 @@
<version>1.4.0-SNAPSHOT</version>
</parent>
- <artifactId>datasketches-memory-java11</artifactId>
+ <artifactId>datasketches-memory-java9</artifactId>
<name>${project.artifactId}</name>
<properties>
@@ -57,8 +57,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <source>11</source>
- <target>11</target>
+ <source>9</source>
+ <target>9</target>
<compilerArgs>
<arg>--add-exports</arg>
<arg>java.base/sun.nio.ch=org.apache.datasketches.memory</arg>
@@ -66,7 +66,7 @@
<arg>java.base/jdk.internal.ref=org.apache.datasketches.memory</arg>
</compilerArgs>
<jdkToolchain>
- <version>11</version>
+ <version>9</version>
</jdkToolchain>
</configuration>
</plugin>
@@ -87,7 +87,7 @@
--add-opens java.base/sun.nio.ch=ALL-UNNAMED
</argLine>
<jdkToolchain>
- <version>11</version>
+ <version>9</version>
</jdkToolchain>
</configuration>
</plugin>
diff --git a/datasketches-memory-java11/src/main/java/module-info.java b/datasketches-memory-java9/src/main/java/module-info.java
similarity index 100%
rename from datasketches-memory-java11/src/main/java/module-info.java
rename to datasketches-memory-java9/src/main/java/module-info.java
diff --git a/datasketches-memory-java11/src/main/java/org/apache/datasketches/memory/CleanerWrapper.java b/datasketches-memory-java9/src/main/java/org/apache/datasketches/memory/CleanerWrapper.java
similarity index 100%
rename from datasketches-memory-java11/src/main/java/org/apache/datasketches/memory/CleanerWrapper.java
rename to datasketches-memory-java9/src/main/java/org/apache/datasketches/memory/CleanerWrapper.java
diff --git a/datasketches-memory-java11/src/main/java/org/apache/datasketches/memory/NioBitsFields.java b/datasketches-memory-java9/src/main/java/org/apache/datasketches/memory/NioBitsFields.java
similarity index 100%
rename from datasketches-memory-java11/src/main/java/org/apache/datasketches/memory/NioBitsFields.java
rename to datasketches-memory-java9/src/main/java/org/apache/datasketches/memory/NioBitsFields.java
diff --git a/datasketches-memory-java11/src/main/javadoc/overview.html b/datasketches-memory-java9/src/main/javadoc/overview.html
similarity index 100%
rename from datasketches-memory-java11/src/main/javadoc/overview.html
rename to datasketches-memory-java9/src/main/javadoc/overview.html
diff --git a/datasketches-memory-java11/src/test/java/org/apache/datasketches/memory/AllocateDirectTest.java b/datasketches-memory-java9/src/test/java/org/apache/datasketches/memory/AllocateDirectTest.java
similarity index 100%
rename from datasketches-memory-java11/src/test/java/org/apache/datasketches/memory/AllocateDirectTest.java
rename to datasketches-memory-java9/src/test/java/org/apache/datasketches/memory/AllocateDirectTest.java
diff --git a/datasketches-memory-multirelease/src/assembly/mrjar.xml b/datasketches-memory-multirelease/src/assembly/mrjar.xml
index 8618753..1b5d650 100644
--- a/datasketches-memory-multirelease/src/assembly/mrjar.xml
+++ b/datasketches-memory-multirelease/src/assembly/mrjar.xml
@@ -39,10 +39,10 @@
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
- <include>org.apache.datasketches:datasketches-memory-java11</include>
+ <include>org.apache.datasketches:datasketches-memory-java9</include>
</includes>
<binaries>
- <outputDirectory>META-INF/versions/11</outputDirectory>
+ <outputDirectory>META-INF/versions/9</outputDirectory>
<unpack>true</unpack>
<includeDependencies>false</includeDependencies>
<unpackOptions>
@@ -55,7 +55,7 @@
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
- <include>org.apache.datasketches:datasketches-memory-java11</include>
+ <include>org.apache.datasketches:datasketches-memory-java9</include>
</includes>
<binaries>
<unpack>true</unpack>
diff --git a/pom.xml b/pom.xml
index c115d66..a067128 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@ under the License.
<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
- <java.version>11</java.version>
+ <java.version>9</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8</argLine>
@@ -641,7 +641,7 @@ under the License.
<modules>
<module>datasketches-memory-base</module>
- <module>datasketches-memory-java11</module>
+ <module>datasketches-memory-java9</module>
<module>datasketches-memory-multirelease</module>
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org