This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch java-11-experimental
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/java-11-experimental by this
push:
new 71b97f1 Minor changes.
71b97f1 is described below
commit 71b97f16eaf23db06fe6928c9787f22c9f06abad
Author: Lee Rhodes <[email protected]>
AuthorDate: Wed Mar 24 15:57:32 2021 -0700
Minor changes.
---
pom.xml | 76 ++++++----------------
.../datasketches/memory/AllocateDirectMap.java | 6 +-
2 files changed, 21 insertions(+), 61 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4edab15..3c4829a 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 -->
@@ -365,6 +366,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>
@@ -409,12 +426,6 @@ 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>
<version>${git-commit-id-plugin.version}</version>
@@ -460,65 +471,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>
diff --git
a/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
b/src/main/java/org/apache/datasketches/memory/AllocateDirectMap.java
index aba9ebd..65bc516 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: [email protected]
For additional commands, e-mail: [email protected]