You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2023/03/04 01:23:20 UTC
[datasketches-memory] 01/01: Creating java17 module, step 1.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch integrateJava17_v3
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit b08228b1fed7ea94470f52d91514c3a8783aad71
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Fri Mar 3 17:23:05 2023 -0800
Creating java17 module, step 1.
---
datasketches-memory-java11/pom.xml | 102 +++++++++++++++--------------------
datasketches-memory-java17/pom.xml | 107 +++++++++++++++++++++++++++++++++++++
datasketches-memory-java8/pom.xml | 2 +
pom.xml | 16 ++----
4 files changed, 156 insertions(+), 71 deletions(-)
diff --git a/datasketches-memory-java11/pom.xml b/datasketches-memory-java11/pom.xml
index b65e075..e6446b3 100644
--- a/datasketches-memory-java11/pom.xml
+++ b/datasketches-memory-java11/pom.xml
@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -34,11 +35,33 @@
<properties>
<java.version>11</java.version>
+ <testng.version>7.7.1</testng.version>
<jdk-toolchain.version>11</jdk-toolchain.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- Used for UTF8 testing -->
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- Used for xxHash testing -->
+ <groupId>net.openhft</groupId>
+ <artifactId>zero-allocation-hashing</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
@@ -57,45 +80,4 @@
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>assemble-mr-jar</id>
- <activation>
- <property>
- <name>!unsetDefaultProfile</name>
- </property>
- </activation>
- <properties>
- <assembly.script.path>${maven.multiModuleProjectDirectory}/tools/scripts/package-multi-release-jar.sh</assembly.script.path>
- <assembly.java.home>${env.JAVA_HOME}</assembly.java.home>
- <assembly.git.tag>${project.version}</assembly.git.tag>
- <assembly.base.dir>${maven.multiModuleProjectDirectory}</assembly.base.dir>
- </properties>
- <build>
- <defaultGoal>exec:exec</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <!-- The trailing comment on the line below ignores an eclipse warning. The version is required for dependency updates. -->
- <version>${maven-exec-plugin.version}</version><!--$NO-MVN-MAN-VER$-->
- <executions>
- <execution>
- <id>package-mr-jar</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <executable>bash</executable>
- <commandlineArgs>${assembly.script.path} ${assembly.java.home} ${assembly.git.tag} ${assembly.base.dir}</commandlineArgs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git a/datasketches-memory-java17/pom.xml b/datasketches-memory-java17/pom.xml
new file mode 100644
index 0000000..165ac15
--- /dev/null
+++ b/datasketches-memory-java17/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.datasketches</groupId>
+ <artifactId>datasketches-memory-root</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>datasketches-memory-java17</artifactId>
+ <name>${project.artifactId}</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <java.version>17</java.version>
+ <testng.version>7.7.1</testng.version>
+ <jdk-toolchain.version>17</jdk-toolchain.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- Used for UTF8 testing -->
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- Used for xxHash testing -->
+ <groupId>net.openhft</groupId>
+ <artifactId>zero-allocation-hashing</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>assemble-mr-jar</id>
+ <activation>
+ <property>
+ <name>!unsetDefaultProfile</name>
+ </property>
+ </activation>
+ <properties>
+ <assembly.script.path>${maven.multiModuleProjectDirectory}/tools/scripts/package-multi-release-jar.sh</assembly.script.path>
+ <assembly.java.home>${env.JAVA_HOME}</assembly.java.home>
+ <assembly.git.tag>${project.version}</assembly.git.tag>
+ <assembly.base.dir>${maven.multiModuleProjectDirectory}</assembly.base.dir>
+ </properties>
+ <build>
+ <defaultGoal>exec:exec</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <!-- The trailing comment on the line below ignores an eclipse warning. The version is required for dependency updates. -->
+ <version>${maven-exec-plugin.version}</version><!--$NO-MVN-MAN-VER$-->
+ <executions>
+ <execution>
+ <id>package-mr-jar</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <executable>bash</executable>
+ <commandlineArgs>${assembly.script.path} ${assembly.java.home} ${assembly.git.tag} ${assembly.base.dir}</commandlineArgs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
diff --git a/datasketches-memory-java8/pom.xml b/datasketches-memory-java8/pom.xml
index 6fad9b2..11786da 100644
--- a/datasketches-memory-java8/pom.xml
+++ b/datasketches-memory-java8/pom.xml
@@ -34,6 +34,7 @@
<properties>
<java.version>1.8</java.version>
+ <testng.version>7.5</testng.version>
<jdk-toolchain.version>8</jdk-toolchain.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -45,6 +46,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
+ <version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 40be1a9..cf270ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,18 +88,17 @@ under the License.
from this root module as a parent; so that there is no runtime dependency on the parent project (root module).
As a result, some properties from this POM (including the version) are duplicated in the datasketches-memory
module for inclusion in the assembled artifacts. For more information, see:
- https://maven.apache.org/guides/introduction/introduction-to-the-pom.html#Project_Aggregation -->
-
+ https://maven.apache.org/guides/introduction/introduction-to-the-pom.html#Project_Aggregation
+ -->
<properties>
<!-- UNIQUE FOR THIS JAVA COMPONENT -->
<protobuf-java.version>4.0.0-rc-2</protobuf-java.version>
<!-- Used for UTF8 testing -->
<zero-allocation-hashing.version>0.15</zero-allocation-hashing.version>
- <!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
-
<!-- Test -->
- <testng.version>7.4.0</testng.version>
+ <testng.version>7.5</testng.version>
+ <!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
@@ -173,12 +172,6 @@ under the License.
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<!-- Used for UTF8 testing -->
<groupId>com.google.protobuf</groupId>
@@ -538,6 +531,7 @@ under the License.
<modules>
<module>datasketches-memory-java8</module>
<module>datasketches-memory-java11</module>
+ <module>datasketches-memory-java17</module>
</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org