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/24 09:16:45 UTC
[datasketches-memory] branch multi-module-experimental updated
(57b9bf9 -> f91fce6)
This is an automated email from the ASF dual-hosted git repository.
dcromberge pushed a change to branch multi-module-experimental
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git.
from 57b9bf9 Introduce maven multi-module configuration
new 545c8ec Merge master into multi-module-experimental
new f91fce6 Temporarily remove javadoc plugin
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/.toolchains.xml | 32 +++++++-
.../datasketches/memory/AllocateDirectMap.java | 6 +-
pom.xml | 90 +++++-----------------
3 files changed, 53 insertions(+), 75 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-memory] 01/02: Merge master into
multi-module-experimental
Posted by dc...@apache.org.
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
commit 545c8ecb9775e80253fa242afc0b03d602fb304e
Author: David Cromberge <da...@gmail.com>
AuthorDate: Wed Mar 24 09:14:33 2021 +0000
Merge master into multi-module-experimental
---
.github/workflows/.toolchains.xml | 32 +++++++++-
.../datasketches/memory/AllocateDirectMap.java | 6 +-
pom.xml | 72 ++++++----------------
3 files changed, 53 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml
index a7d1161..111252f 100644
--- a/.github/workflows/.toolchains.xml
+++ b/.github/workflows/.toolchains.xml
@@ -4,10 +4,40 @@
<type>jdk</type>
<provides>
<version>8</version>
- <vendor>openjdk</vendor>
+ <vendor>adoptopenjdk</vendor>
</provides>
<configuration>
<jdkHome>${JAVA_HOME}</jdkHome>
</configuration>
</toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>11</version>
+ <vendor>adoptopenjdk</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>${env.JAVA11_HOME}</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>15</version>
+ <vendor>adoptopenjdk</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>${env.JAVA15_HOME}</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>16</version>
+ <vendor>adoptopenjdk</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>${env.JAVA16_HOME}</jdkHome>
+ </configuration>
+ </toolchain>
</toolchains>
\ No newline at end of file
diff --git a/datasketches-memory-java11/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java b/datasketches-memory-java11/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
index aba9ebd..65bc516 100644
--- a/datasketches-memory-java11/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
+++ b/datasketches-memory-java11/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
@@ -41,13 +41,11 @@ import sun.nio.ch.FileChannelImpl;
* (including those > 2GB).
*
* <p>To understand how it works, reference native code for map0, unmap0:
- * <a href="http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/f940e7a48b72/src/solaris/native/
- * sun/nio/ch/FileChannelImpl.c">
+ * <a href="http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/f940e7a48b72/src/solaris/native/sun/nio/ch/FileChannelImpl.c">
* FileChannelImpl.c</a></p>
*
* <p>To understand how it works, reference native code for load0(), isLoaded0(), and force0():
- * <a href="http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/f940e7a48b72/src/solaris/native/
- * java/nio/MappedByteBuffer.c">
+ * <a href="http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/f940e7a48b72/src/solaris/native/java/nio/MappedByteBuffer.c">
* MappedByteBuffer.c</a></p>
*
* @author Roman Leventov
diff --git a/pom.xml b/pom.xml
index 1d46750..bd99efe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@ under the License.
<!-- END:UNIQUE FOR THIS JAVA COMPONENT -->
<!-- Test -->
- <testng.version>7.1.0</testng.version>
+ <testng.version>7.4.0</testng.version>
<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
@@ -121,6 +121,7 @@ under the License.
<maven-remote-resources-plugin.version>[1.7.0,)</maven-remote-resources-plugin.version> <!-- overrides parent -->
<maven-source-plugin.version>3.2.1</maven-source-plugin.version> <!-- overrides parent -->
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version> <!-- overrides parent -->
+ <maven-toolchains-plugin.version>3.0.0</maven-toolchains-plugin.version>
<!-- Apache Plugins -->
<apache-rat-plugin.version>0.13</apache-rat-plugin.version> <!-- overrides parent -->
<!-- org.jacoco Maven Plugins -->
@@ -360,6 +361,22 @@ under the License.
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>${maven-toolchains-plugin.version}</version>
+ <configuration>
+ <toolchains>
+ <jdk><version>8</version></jdk>
+ </toolchains>
+ </configuration>
+ <executions>
+ <execution>
+ <goals><goal>toolchain</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<!-- Generates code coverage report from website. -->
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
@@ -398,7 +415,7 @@ under the License.
<plugin>
<groupId>pl.project13.maven</groupId>
- <artifactId>git.commit-id-plugin</artifactId>
+ <artifactId>git-commit-id-plugin</artifactId>
<version>${git-commit-id-plugin.version}</version>
</plugin>
@@ -442,65 +459,16 @@ under the License.
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- </plugin>
- <plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
- <artifactId>git.commit-id-plugin</artifactId>
+ <artifactId>git-commit-id-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
- <!-- Ignore nuisance warning from Apache parent plugin:
- "maven-remote-resources-plugin (goal "process") is ignored by m2e".
- This also should fix the Maven warning that it can't find the lifecycle-mapping jar.
- This profile is only active when the property "m2e.version" is set,
- which is the case when building in Eclipse with m2e.
- The ignore below tells m2eclipse to skip the execution.
- -->
- <profile>
- <id>m2e</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping.version}</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <versionRange>${maven-remote-resources-plugin.version}</versionRange>
- <goals>
- <goal>process</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
<profile>
<id>strict</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-memory] 02/02: Temporarily remove javadoc plugin
Posted by dc...@apache.org.
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
commit f91fce67667d684e992a5b73b8d1d3237240dc7e
Author: David Cromberge <da...@gmail.com>
AuthorDate: Wed Mar 24 09:16:29 2021 +0000
Temporarily remove javadoc plugin
---
pom.xml | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index bd99efe..c115d66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,24 +248,6 @@ under the License.
</plugin>
<plugin>
- <!-- Extends Apache Parent pom, apache-release profile -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- <configuration>
- <docfilessubdirs>true</docfilessubdirs>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org