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/07/19 11:43:30 UTC
[datasketches-memory] 01/01: Removes profile duplication in the
memory-resources module
This is an automated email from the ASF dual-hosted git repository.
dcromberge pushed a commit to branch remove-matrix-profiles
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 75a3b6259d1f2de7aa75051ab1926d4411e70e1f
Author: David Cromberge <dc...@apache.org>
AuthorDate: Mon Jul 19 12:42:25 2021 +0100
Removes profile duplication in the memory-resources module
The ci build now passes the current matrix jdk to the
profile as a variable, where the toolchain is configured
accordingly.
---
.github/workflows/maven.yml | 4 +-
datasketches-memory-resources/pom.xml | 255 +---------------------------------
2 files changed, 9 insertions(+), 250 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 38d3b47..2b4f4cd 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -112,6 +112,7 @@ jobs:
-Dmaven.javadoc.skip=true
-Dgpg.skip=true
-Denvironment=ci
+ -Dmatrix.jdk.version=${{matrix.jdk}}
--toolchains .github/workflows/.toolchains.xml
- name: Test & Report
@@ -121,4 +122,5 @@ jobs:
-Dcoveralls-repo-token=${repo_token}
-Dmaven.javadoc.skip=true
-Dgpg.skip=true
- --toolchains .github/workflows/.toolchains.xml
+ -Dmatrix.jdk.version=${{matrix.jdk}}
+ --toolchains .github/workflows/.toolchains.xml
\ No newline at end of file
diff --git a/datasketches-memory-resources/pom.xml b/datasketches-memory-resources/pom.xml
index 44c2c79..1d235d6 100644
--- a/datasketches-memory-resources/pom.xml
+++ b/datasketches-memory-resources/pom.xml
@@ -125,9 +125,9 @@
</profile>
<profile>
- <id>java9</id>
+ <id>java9to13</id>
<activation>
- <jdk>9</jdk>
+ <jdk>[9,14)</jdk>
<property>
<name>environment</name>
<value>ci</value>
@@ -135,253 +135,10 @@
</activation>
<properties>
- <jdk-toolchain.version>9</jdk-toolchain.version>
- <java.version>9</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java8-tests</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
- <id>package-test</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
- </argLine>
- <dependenciesToScan>
- <dependency>org.apache.datasketches:datasketches-memory-java8-tests</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>java10</id>
- <activation>
- <jdk>10</jdk>
- <property>
- <name>environment</name>
- <value>ci</value>
- </property>
- </activation>
-
- <properties>
- <jdk-toolchain.version>10</jdk-toolchain.version>
- <java.version>10</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java8-tests</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
- <id>package-test</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
- </argLine>
- <dependenciesToScan>
- <dependency>org.apache.datasketches:datasketches-memory-java8-tests</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>java11</id>
- <activation>
- <jdk>11</jdk>
- <property>
- <name>environment</name>
- <value>ci</value>
- </property>
- </activation>
-
- <properties>
- <jdk-toolchain.version>11</jdk-toolchain.version>
- <java.version>11</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java8-tests</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
- <id>package-test</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
- </argLine>
- <dependenciesToScan>
- <dependency>org.apache.datasketches:datasketches-memory-java8-tests</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>java12</id>
- <activation>
- <jdk>12</jdk>
- <property>
- <name>environment</name>
- <value>ci</value>
- </property>
- </activation>
-
- <properties>
- <jdk-toolchain.version>12</jdk-toolchain.version>
- <java.version>12</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java8-tests</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
- <id>package-test</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
- </argLine>
- <dependenciesToScan>
- <dependency>org.apache.datasketches:datasketches-memory-java8-tests</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>java13</id>
- <activation>
- <jdk>13</jdk>
- <property>
- <name>environment</name>
- <value>ci</value>
- </property>
- </activation>
-
- <properties>
- <jdk-toolchain.version>13</jdk-toolchain.version>
- <java.version>13</java.version>
+ <!--suppress UnresolvedMavenProperty -->
+ <jdk-toolchain.version>${matrix.jdk.version}</jdk-toolchain.version>
+ <!--suppress UnresolvedMavenProperty -->
+ <java.version>${matrix.jdk.version}</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org