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 2022/12/12 22:36:47 UTC
[datasketches-memory] branch IntegrateJava17_v2 updated: Configure the pom files to force the and to the current config.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch IntegrateJava17_v2
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/IntegrateJava17_v2 by this push:
new b6e2d15 Configure the pom files to force the <sourceDirectory> and <testSourceDirectory> to the current config.
b6e2d15 is described below
commit b6e2d155760b0791cfa6b7a8a7b5782b050df0a7
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Mon Dec 12 14:36:30 2022 -0800
Configure the pom files to force the <sourceDirectory> and
<testSourceDirectory> to the current config.
This will prevent Eclipse from artificially creating the default
conventions.
---
datasketches-memory-java11/pom.xml | 186 +++++++++++++++---------------
datasketches-memory-java17/pom.xml | 225 +++++++++++++++++++------------------
datasketches-memory-java8/pom.xml | 39 ++++---
3 files changed, 232 insertions(+), 218 deletions(-)
diff --git a/datasketches-memory-java11/pom.xml b/datasketches-memory-java11/pom.xml
index b65e075..0161df2 100644
--- a/datasketches-memory-java11/pom.xml
+++ b/datasketches-memory-java11/pom.xml
@@ -1,101 +1,105 @@
<?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
- <modelVersion>4.0.0</modelVersion>
+ http://www.apache.org/licenses/LICENSE-2.0
- <parent>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-root</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- </parent>
+ 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">
- <artifactId>datasketches-memory-java11</artifactId>
- <name>${project.artifactId}</name>
- <packaging>jar</packaging>
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <java.version>11</java.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>
+ <parent>
+ <groupId>org.apache.datasketches</groupId>
+ <artifactId>datasketches-memory-root</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
- <configuration>
- <compilerArgs>
- <arg>--add-exports</arg>
- <arg>java.base/jdk.internal.ref=org.apache.datasketches.memory</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <artifactId>datasketches-memory-java11</artifactId>
+ <name>${project.artifactId}</name>
+ <packaging>jar</packaging>
- <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>
+ <properties>
+ <java.version>11</java.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>
+
+ <build>
+ <sourceDirectory>${project.basedir}/src/main/java11</sourceDirectory>
+ <testSourceDirectory></testSourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <configuration>
+ <compilerArgs>
+ <arg>--add-exports</arg>
+ <arg>java.base/jdk.internal.ref=org.apache.datasketches.memory</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </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
index 2f1e980..ddf40bc 100644
--- a/datasketches-memory-java17/pom.xml
+++ b/datasketches-memory-java17/pom.xml
@@ -1,124 +1,129 @@
<?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.
- -->
+ 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">
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-root</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- </parent>
+ <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>
+ <artifactId>datasketches-memory-java17</artifactId>
+ <name>${project.artifactId}</name>
+ <packaging>jar</packaging>
- <properties>
- <java.version>17</java.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>
+ <properties>
+ <java.version>17</java.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>
- <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>
- <version>${zero-allocation-hashing.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <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>
+ <version>${zero-allocation-hashing.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
- <configuration>
- <compilerArgs>
- <arg>--add-exports</arg>
- <arg>java.base/jdk.internal.ref=org.apache.datasketches.memory</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <build>
+ <sourceDirectory>${project.basedir}/src/main/java17</sourceDirectory>
+ <testSourceDirectory>${project.basedir}/src/test/java17</testSourceDirectory>
+ <testResources>
+ <directory>${project.basedir}/src/test/resources</directory>
+ </testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <configuration>
+ <compilerArgs>
+ <arg>--add-exports</arg>
+ <arg>java.base/jdk.internal.ref=org.apache.datasketches.memory</arg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </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>
+ <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-java8/pom.xml b/datasketches-memory-java8/pom.xml
index 4c50d71..45c44ec 100644
--- a/datasketches-memory-java8/pom.xml
+++ b/datasketches-memory-java8/pom.xml
@@ -1,22 +1,22 @@
<?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.
- -->
+ 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">
@@ -63,6 +63,11 @@
</dependencies>
<build>
+ <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+ <testResources>
+ <directory>${project.basedir}/src/test/resources</directory>
+ </testResources>
<pluginManagement>
<plugins>
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org