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/29 22:06:45 UTC
[datasketches-memory] branch multi-module-experimental updated:
Cleanup POMs
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
The following commit(s) were added to refs/heads/multi-module-experimental by this push:
new bf538c5 Cleanup POMs
bf538c5 is described below
commit bf538c502ca945fa33b320e4117e49bd320e29dc
Author: David Cromberge <da...@gmail.com>
AuthorDate: Mon Mar 29 23:06:31 2021 +0100
Cleanup POMs
---
datasketches-memory-base/pom.xml | 15 ++++++--------
datasketches-memory-java11/pom.xml | 24 ++++------------------
datasketches-memory-java9/pom.xml | 11 +++++-----
.../pom.xml | 10 +++++++--
.../src/assembly/mrjar.xml | 0
pom.xml | 15 ++++++++------
6 files changed, 32 insertions(+), 43 deletions(-)
diff --git a/datasketches-memory-base/pom.xml b/datasketches-memory-base/pom.xml
index a73436c..2433f87 100644
--- a/datasketches-memory-base/pom.xml
+++ b/datasketches-memory-base/pom.xml
@@ -20,7 +20,9 @@
<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
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-memory-root</artifactId>
@@ -36,18 +38,10 @@
<maven.compiler.target>8</maven.compiler.target>
</properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<pluginManagement>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -60,6 +54,7 @@
</jdkToolchain>
</configuration>
</plugin>
+
<plugin>
<!-- Extends Apache Parent pom, apache-release profile -->
<groupId>org.apache.maven.plugins</groupId>
@@ -80,6 +75,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<!-- Apache Parent pom, pluginManagement-->
<groupId>org.apache.maven.plugins</groupId>
@@ -94,6 +90,7 @@
</jdkToolchain>
</configuration>
</plugin>
+
</plugins>
</pluginManagement>
</build>
diff --git a/datasketches-memory-java11/pom.xml b/datasketches-memory-java11/pom.xml
index c97360d..0011e60 100644
--- a/datasketches-memory-java11/pom.xml
+++ b/datasketches-memory-java11/pom.xml
@@ -21,7 +21,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-memory-root</artifactId>
@@ -41,17 +43,12 @@
<artifactId>datasketches-memory-base</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -63,20 +60,7 @@
</jdkToolchain>
</configuration>
</plugin>
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <configuration>
- <trimStackTrace>false</trimStackTrace>
- <useManifestOnlyJar>false</useManifestOnlyJar>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <jdkToolchain>
- <version>11</version>
- </jdkToolchain>
- </configuration>
- </plugin>
+
</plugins>
</pluginManagement>
</build>
diff --git a/datasketches-memory-java9/pom.xml b/datasketches-memory-java9/pom.xml
index f50c05c..223b5af 100644
--- a/datasketches-memory-java9/pom.xml
+++ b/datasketches-memory-java9/pom.xml
@@ -21,7 +21,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-memory-root</artifactId>
@@ -41,17 +43,12 @@
<artifactId>datasketches-memory-base</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -68,6 +65,7 @@
</jdkToolchain>
</configuration>
</plugin>
+
<plugin>
<!-- Apache Parent pom, pluginManagement-->
<groupId>org.apache.maven.plugins</groupId>
@@ -82,6 +80,7 @@
</jdkToolchain>
</configuration>
</plugin>
+
</plugins>
</pluginManagement>
</build>
diff --git a/datasketches-memory-multirelease/pom.xml b/datasketches-memory/pom.xml
similarity index 94%
rename from datasketches-memory-multirelease/pom.xml
rename to datasketches-memory/pom.xml
index 2631571..d47575d 100644
--- a/datasketches-memory-multirelease/pom.xml
+++ b/datasketches-memory/pom.xml
@@ -21,18 +21,21 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-memory-root</artifactId>
<version>1.4.0-SNAPSHOT</version>
</parent>
- <artifactId>datasketches-memory-multirelease</artifactId>
+ <artifactId>datasketches-memory</artifactId>
<name>${project.artifactId}</name>
<build>
<plugins>
+
<plugin>
<!-- Extends Apache Parent pom, apache-release profile -->
<groupId>org.apache.maven.plugins</groupId>
@@ -50,9 +53,11 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
+ <!--suppress MavenModelInspection -->
+ <version>${maven-assembly-plugin.version}</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
@@ -75,6 +80,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
</build>
diff --git a/datasketches-memory-multirelease/src/assembly/mrjar.xml b/datasketches-memory/src/assembly/mrjar.xml
similarity index 100%
rename from datasketches-memory-multirelease/src/assembly/mrjar.xml
rename to datasketches-memory/src/assembly/mrjar.xml
diff --git a/pom.xml b/pom.xml
index 5436f40..02220f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@ under the License.
<!-- System-wide properties -->
<maven.version>3.5.0</maven.version>
- <java.version>9</java.version>
+ <java.version>8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<argLine>-Xmx4g -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8</argLine>
@@ -127,7 +127,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>
@@ -386,9 +385,6 @@ 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>
@@ -568,10 +564,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>
@@ -628,6 +630,7 @@ under the License.
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <!--suppress UnresolvedMavenProperty -->
<version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
@@ -645,7 +648,7 @@ under the License.
<module>datasketches-memory-base</module>
<module>datasketches-memory-java9</module>
<module>datasketches-memory-java11</module>
- <module>datasketches-memory-multirelease</module>
+ <module>datasketches-memory</module>
</modules>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org