This is an automated email from the ASF dual-hosted git repository. dcromberge pushed a commit to branch Jdk17_Panama_David in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 4399a07ead9e7585f3d7cf740543ca84f9776d56 Author: David Cromberge <[email protected]> AuthorDate: Mon Dec 20 20:06:26 2021 +0000 Restructure module-info.java files to include as resources in MR --- datasketches-memory-java9/pom.xml | 2 +- datasketches-memory/src/assembly/assemble-mr-jar.xml | 10 ++++++++++ .../src/main/resources/module-info-j17.java | 12 ++++++------ .../src/main/resources/module-info-j9.java | 0 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/datasketches-memory-java9/pom.xml b/datasketches-memory-java9/pom.xml index 062692f..890c09a 100644 --- a/datasketches-memory-java9/pom.xml +++ b/datasketches-memory-java9/pom.xml @@ -58,7 +58,7 @@ <configuration> <compilerArgs> <arg>--add-exports</arg> - <arg>java.base/jdk.internal.ref=org.apache.datasketches.memory</arg> + <arg>java.base/jdk.internal.ref=ALL-UNNAMED</arg> </compilerArgs> </configuration> </plugin> diff --git a/datasketches-memory/src/assembly/assemble-mr-jar.xml b/datasketches-memory/src/assembly/assemble-mr-jar.xml index 85258ee..0b9cfd5 100644 --- a/datasketches-memory/src/assembly/assemble-mr-jar.xml +++ b/datasketches-memory/src/assembly/assemble-mr-jar.xml @@ -121,6 +121,16 @@ <source>${project.basedir}/pom.xml</source> <outputDirectory>META-INF/maven/org.apache.datasketches/datasketches-memory</outputDirectory> </file> + <!-- Java 9 module-info.java --> + <file> + <source>${project.basedir}/src/main/resources/module-info-j9.java</source> + <outputDirectory>META-INF/versions/9</outputDirectory> + </file> + <!-- Java 17 module-info.java --> + <file> + <source>${project.basedir}/src/main/resources/module-info-j17.java</source> + <outputDirectory>META-INF/versions/17</outputDirectory> + </file> </files> </assembly> diff --git a/datasketches-memory-java9/src/main/java/module-info.java b/datasketches-memory/src/main/resources/module-info-j17.java similarity index 85% copy from datasketches-memory-java9/src/main/java/module-info.java copy to datasketches-memory/src/main/resources/module-info-j17.java index 990b45d..4bc2e41 100644 --- a/datasketches-memory-java9/src/main/java/module-info.java +++ b/datasketches-memory/src/main/resources/module-info-j17.java @@ -18,9 +18,9 @@ */ @SuppressWarnings("javadoc") module org.apache.datasketches.memory { - requires java.base; - requires java.logging; - requires jdk.unsupported; - - exports org.apache.datasketches.memory.internal; -} + requires java.base; + requires java.logging; + requires jdk.unsupported; + requires jdk.incubator.foreign; + exports org.apache.datasketches.memory; +} \ No newline at end of file diff --git a/datasketches-memory-java9/src/main/java/module-info.java b/datasketches-memory/src/main/resources/module-info-j9.java similarity index 100% rename from datasketches-memory-java9/src/main/java/module-info.java rename to datasketches-memory/src/main/resources/module-info-j9.java --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
