This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch update_7.0.X
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
The following commit(s) were added to refs/heads/update_7.0.X by this push:
new cb391a57 Update 7.0.X Eclipse works, Jar tests work.
cb391a57 is described below
commit cb391a57f1214b8df8ca865906e5a56573d3d3f3
Author: Lee Rhodes <[email protected]>
AuthorDate: Sat May 16 10:21:53 2026 -0700
Update 7.0.X Eclipse works, Jar tests work.
---
datasketches-memory-report/pom.xml | 95 -----------------------
pom.xml | 153 ++++++++++++++++++++++++++++---------
2 files changed, 116 insertions(+), 132 deletions(-)
diff --git a/datasketches-memory-report/pom.xml
b/datasketches-memory-report/pom.xml
deleted file mode 100644
index ec48fbbc..00000000
--- a/datasketches-memory-report/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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
- https://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory</artifactId>
- <version>7.0.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>datasketches-memory-report</artifactId>
- <name>${project.artifactId}</name>
- <packaging>pom</packaging>
-
- <properties>
- <java.version>11</java.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java11</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java17_21</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>${java.version}</version> <!-- override -->
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>report-aggregate</id>
- <phase>verify</phase>
- <goals>
- <goal>report-aggregate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <!--
<exclude>org/apache/datasketches/memory/internal/VirtualMachineMemory.class</exclude>
-->
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/pom.xml b/pom.xml
index e9b046a6..e3773ad7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,6 +151,7 @@ under the License.
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version> <!--
don't use 3.12.0 -->
<maven-release-plugin.version>3.3.1</maven-release-plugin.version>
+ <maven-resources-plugin.version>3.5.0</maven-resources-plugin.version>
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
<maven-surefire-failsafe-plugins.version>3.5.4</maven-surefire-failsafe-plugins.version>
<!-- surefire, failsafe, surefire-report -->
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
@@ -179,7 +180,7 @@ under the License.
<zero-allocation-hashing.version>2026.0</zero-allocation-hashing.version>
<maven.deploy.skip>true</maven.deploy.skip>
- <maven.javadoc.skip>true</maven.javadoc.skip>
+ <maven.javadoc.skip>false</maven.javadoc.skip> <!-- set to true for
deployment -->
</properties>
<dependencyManagement>
@@ -241,7 +242,7 @@ under the License.
and is only checks the compiler used by the Maven runtime.
In the context of toolchains this rule is useless.
See:
https://github.com/paulmoloney/maven-enforcer-toolchain-rules
- <requireJavaVersion> ... </requireJavaVersion>
+ <requireJavaVersion> </requireJavaVersion>
-->
<requireMavenVersion>
<version>[${maven.version},4.0.0)</version>
@@ -273,18 +274,28 @@ under the License.
<execution>
<id>default-jar</id>
<phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
+ <goals><goal>jar</goal></goals>
</execution>
<execution>
<id>default-test-jar</id>
<phase>package</phase>
- <goals>
- <goal>test-jar</goal>
- </goals>
+ <goals><goal>test-jar</goal></goals>
</execution>
</executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Build-Jdk-Spec>${java.specification.version}</Build-Jdk-Spec>
+ <Build-OS>${os.name} ${os.arch} ${os.version}</Build-OS>
+ <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
+ <Group-ArtifactId
>${project.groupId}:${project.artifactId}</Group-ArtifactId >
+ <git-branch>${git.branch}</git-branch>
+ <git-commit-id>${git.commit.id}</git-commit-id>
+ <git-commit-time>${git.commit.time}</git-commit-time>
+
<git-commit-user-email>${git.commit.user.email}</git-commit-user-email>
+ </manifestEntries>
+ </archive>
+ </configuration>
</plugin>
<plugin>
@@ -304,14 +315,24 @@ under the License.
<additionalJOption>-J${jvm.locale.encoding}</additionalJOption>
</additionalJOptions>
<excludePackageNames>org.apache.datasketches.memory.internal</excludePackageNames>
+ <archive>
+ <manifestEntries>
+ <Build-Jdk-Spec>${java.specification.version}</Build-Jdk-Spec>
+ <Build-OS>${os.name} ${os.arch} ${os.version}</Build-OS>
+ <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
+ <Group-ArtifactId
>${project.groupId}:${project.artifactId}</Group-ArtifactId >
+ <git-branch>${git.branch}</git-branch>
+ <git-commit-id>${git.commit.id}</git-commit-id>
+ <git-commit-time>${git.commit.time}</git-commit-time>
+
<git-commit-user-email>${git.commit.user.email}</git-commit-user-email>
+ </manifestEntries>
+ </archive>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
+ <goals><goal>jar</goal></goals>
</execution>
</executions>
</plugin>
@@ -322,6 +343,42 @@ under the License.
<version>${maven-release-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>default-resources</id>
+ <phase>process-resources</phase>
+ <goals><goal>resources</goal></goals>
+ </execution>
+ <execution>
+ <id>copy-legal-docs</id>
+ <phase>prepare-package</phase>
+ <goals><goal>copy-resources</goal></goals>
+ <configuration>
+
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DEPENDENCIES</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>DS_Store</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -330,18 +387,28 @@ under the License.
<execution>
<id>attach-sources</id>
<phase>package</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
+ <goals><goal>jar-no-fork</goal></goals>
</execution>
<execution>
<id>attach-test-sources</id>
<phase>package</phase>
- <goals>
- <goal>test-jar-no-fork</goal>
- </goals>
+ <goals><goal>test-jar-no-fork</goal></goals>
</execution>
</executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Build-Jdk-Spec>${java.specification.version}</Build-Jdk-Spec>
+ <Build-OS>${os.name} ${os.arch} ${os.version}</Build-OS>
+ <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
+ <Group-ArtifactId
>${project.groupId}:${project.artifactId}</Group-ArtifactId >
+ <git-branch>${git.branch}</git-branch>
+ <git-commit-id>${git.commit.id}</git-commit-id>
+ <git-commit-time>${git.commit.time}</git-commit-time>
+
<git-commit-user-email>${git.commit.user.email}</git-commit-user-email>
+ </manifestEntries>
+ </archive>
+ </configuration>
</plugin>
<plugin>
@@ -416,23 +483,22 @@ under the License.
</configuration>
</plugin>
- <plugin>
- <!-- Submit code coverage report to Coveralls.io. -->
- <groupId>com.github.hazendaz.maven</groupId>
- <artifactId>coveralls-maven-plugin</artifactId>
- <version>${coveralls-maven-plugin.version}</version>
- <configuration>
- <!--suppress UnresolvedMavenProperty -->
- <repoToken>${coveralls-repo-token}</repoToken>
- <!--suppress UnresolvedMavenProperty -->
-
<jacocoReports>${project.basedir}/datasketches-memory-report/target/site/jacoco-aggregate/jacoco.xml</jacocoReports>
- </configuration>
- </plugin>
-
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>${git-commit-id-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>get-the-git-infos</id>
+ <goals><goal>revision</goal></goals>
+ <phase>initialize</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+ <generateGitPropertiesFile>false</generateGitPropertiesFile>
+ <skipPoms>false</skipPoms>
+ </configuration>
</plugin>
<plugin>
@@ -473,15 +539,24 @@ under the License.
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.3.1</version>
- <configuration>
- <nonFilteredFileExtensions>
- <nonFilteredFileExtension>DS_Store</nonFilteredFileExtension>
- </nonFilteredFileExtensions>
- </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
@@ -494,6 +569,11 @@ under the License.
<artifactId>apache-rat-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>io.github.git-commit-id</groupId>
+ <artifactId>git-commit-id-maven-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>
@@ -504,7 +584,6 @@ under the License.
<modules>
<module>datasketches-memory-java11</module>
<module>datasketches-memory-java17_21</module>
- <module>datasketches-memory-report</module>
</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
