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 2021/03/23 19:42:21 UTC
[datasketches-memory] branch master updated (46a54aa -> d14bcd0)
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git.
from 46a54aa Trying to eliminate plugin not found warnings.
new 5f12210 Fix some problems in POM
new 2b1997e Update GitHub Actions toolchains.
new d14bcd0 Pom update.
The 3 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 +++++++-
pom.xml | 92 +++++++---------------
.../datasketches/memory/AllocateDirectMap.java | 6 +-
3 files changed, 61 insertions(+), 69 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-memory] 03/03: Pom update.
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit d14bcd00788c480fa04649d134a399640641a910
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Tue Mar 23 12:39:41 2021 -0700
Pom update.
I have given up trying to suppress a nuisance warning issued from the
Apache Parent POM. So I removed all the cruft that I had added to try to
suppress it.
---
pom.xml | 61 +++----------------------------------------------------------
1 file changed, 3 insertions(+), 58 deletions(-)
diff --git a/pom.xml b/pom.xml
index c53795b..3dab772 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>
@@ -403,14 +403,8 @@ under the License.
</plugin>
<plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping.version}</version>
- </plugin>
-
- <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>
@@ -454,65 +448,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/03: Update GitHub Actions toolchains.
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 2b1997e09706b47cd9c752d0eb24d7c51f79f9b6
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Tue Mar 23 08:59:30 2021 -0700
Update GitHub Actions toolchains.
---
.github/workflows/.toolchains.xml | 32 +++++++++++++++++++++-
pom.xml | 17 ++++++++++++
.../datasketches/memory/AllocateDirectMap.java | 6 ++--
3 files changed, 50 insertions(+), 5 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/pom.xml b/pom.xml
index bd84fe5..c53795b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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 -->
@@ -358,6 +359,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>
diff --git a/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java b/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
index 0dbe16a..cc73064 100644
--- a/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
+++ b/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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[datasketches-memory] 01/03: Fix some problems in POM
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit 5f1221041a6a044ec95229f17e6c82a203847efc
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Mon Mar 22 13:43:11 2021 -0700
Fix some problems in POM
---
pom.xml | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 446e689..bd84fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,6 @@ under the License.
<!-- org.jacoco Maven Plugins -->
<jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
<!-- org.eluder Maven Plugins -->
- <coveralls-repo-token></coveralls-repo-token>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<!-- other -->
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
@@ -384,23 +383,20 @@ under the License.
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${coveralls-maven-plugin.version}</version>
- <configuration>
- <repoToken>${coveralls-repo-token}</repoToken>
- </configuration>
</plugin>
-
+
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>${lifecycle-mapping.version}</version>
</plugin>
-
+
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git.commit-id-plugin</artifactId>
<version>${git-commit-id-plugin.version}</version>
</plugin>
-
+
</plugins>
</pluginManagement>
<plugins>
@@ -455,10 +451,10 @@ under the License.
</plugins>
</build>
<profiles>
- <!-- Ignore nuisance warning from Apache parent plugin:
+ <!-- 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,
+ 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.
-->
@@ -615,10 +611,16 @@ under the License.
<Build-OS>${os.name} ${os.arch} ${os.version}</Build-OS>
<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
<GroupId-ArtifactId>${project.groupId}:${project.artifactId}</GroupId-ArtifactId>
+ <!-- these properties are generated by the git-commit-id-plugin during initialize -->
+ <!--suppress UnresolvedMavenProperty -->
<git-branch>${git.branch}</git-branch>
+ <!--suppress UnresolvedMavenProperty -->
<git-commit-id>${git.commit.id.full}</git-commit-id>
+ <!--suppress UnresolvedMavenProperty -->
<git-commit-time>${git.commit.time}</git-commit-time>
+ <!--suppress UnresolvedMavenProperty -->
<git-commit-user-email>${git.commit.user.email}</git-commit-user-email>
+ <!--suppress UnresolvedMavenProperty -->
<git-commit-tag>${git.tags}</git-commit-tag>
</manifestEntries>
</archive>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org