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/08/19 16:01:01 UTC

[datasketches-memory] 01/02: Plugin dependency updates

This is an automated email from the ASF dual-hosted git repository.

dcromberge pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git

commit 2fdd9ee68c4b7681f8c5f9e895d8d9cec4c42f41
Author: David Cromberge <da...@gmail.com>
AuthorDate: Thu Aug 19 16:45:51 2021 +0100

    Plugin dependency updates
---
 datasketches-memory/pom.xml | 296 +++++++++++++++++++++++++++-----------------
 pom.xml                     |   6 +-
 2 files changed, 189 insertions(+), 113 deletions(-)

diff --git a/datasketches-memory/pom.xml b/datasketches-memory/pom.xml
index 69734a0..051e07a 100644
--- a/datasketches-memory/pom.xml
+++ b/datasketches-memory/pom.xml
@@ -93,11 +93,6 @@
 
   <properties>
     <!-- UNIQUE FOR THIS JAVA COMPONENT -->
-    <maven.source.skip>true</maven.source.skip>
-    <java.version>1.8</java.version>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
-
     <protobuf-java.version>4.0.0-rc-2</protobuf-java.version>
     <!-- Used for UTF8 testing -->
     <zero-allocation-hashing.version>0.15</zero-allocation-hashing.version>
@@ -107,15 +102,27 @@
     <!-- Version 7.4.0 fails to locate jquery.min.js for reporting on debian systems -->
     <testng.version>7.1.0</testng.version>
 
-    <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> <!-- overrides parent -->
-    <git-commit-id-plugin.version>4.0.4</git-commit-id-plugin.version>
-    <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <!-- overrides parent -->
-    <!-- org.jacoco Maven Plugins -->
-    <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
+    <!-- System-wide properties -->
+    <maven.version>3.5.0</maven.version>
+    <java.version>1.8</java.version>
+    <maven.source.skip>true</maven.source.skip>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
     <!-- deploy artifacts to nexus from this module only -->
     <maven.deploy.skip>false</maven.deploy.skip>
     <maven.install.skip>false</maven.install.skip>
     <maven.javadoc.skip>true</maven.javadoc.skip>
+
+    <!--  Maven Plugins -->
+    <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <!-- overrides parent -->
+    <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version> <!-- overrides parent -->
+    <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> <!-- overrides parent -->
+    <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <!-- overrides parent -->
+    <maven-remote-resources-plugin.version>1.7.0</maven-remote-resources-plugin.version> <!-- overrides parent -->
+    <!-- org.jacoco Maven Plugins -->
+    <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
+    <!-- git plugin -->
+    <git-commit-id-plugin.version>4.0.4</git-commit-id-plugin.version>
   </properties>
 
   <dependencies>
@@ -164,115 +171,178 @@
   </dependencies>
 
   <build>
-    <plugins>
+    <pluginManagement>
+      <plugins>
 
-      <!-- The assembly plugin builds all artifacts for this project from the other modules
-           within the project.  These modules are complementary and not standalone.  Therefore,
-           they are not installed and downloaded independently by the end user.
-           Instead, the maven-assembly plugin builds all jars, and hides the multi-module
-           configuration from the end user. -->
+        <!-- The assembly plugin builds all artifacts for this project from the other modules
+             within the project.  These modules are complementary and not standalone.  Therefore,
+             they are not installed and downloaded independently by the end user.
+             Instead, the maven-assembly plugin builds all jars, and hides the multi-module
+             configuration from the end user. -->
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>${maven-assembly-plugin.version}</version>
+          <!--suppress MavenModelInspection -->
+          <configuration>
+            <archive>
+              <manifest>
+                <addDefaultEntries>false</addDefaultEntries>
+                <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+                <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+              </manifest>
+              <manifestEntries>
+                <Build-Jdk>${java.version} (${java.vendor} ${java.vm.version})</Build-Jdk>
+                <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>
+          </configuration>
+          <executions>
+
+            <!-- multi-release (MR) jar -->
+            <execution>
+              <id>assemble-jar</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+              <configuration>
+                <appendAssemblyId>false</appendAssemblyId>
+                <attach>true</attach>
+                <descriptors>
+                  <descriptor>src/assembly/assemble-mr-jar.xml</descriptor>
+                </descriptors>
+                <!-- The class loader requires this to be set in a multi-release JAR's manifest -->
+                <archive>
+                  <manifestEntries>
+                    <Multi-Release>true</Multi-Release>
+                  </manifestEntries>
+                </archive>
+              </configuration>
+            </execution>
+
+            <!-- sources, tests and javadocs jars -->
+            <execution>
+              <id>assemble-sources-tests-javadocs</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+              <configuration>
+                <appendAssemblyId>true</appendAssemblyId>
+                <attach>true</attach>
+                <descriptors>
+                  <!-- tests jar -->
+                  <descriptor>src/assembly/assemble-test-jar.xml</descriptor>
+                  <!-- sources.jar -->
+                  <descriptor>src/assembly/assemble-sources.xml</descriptor>
+                  <!-- test-sources.jar -->
+                  <descriptor>src/assembly/assemble-test-sources.xml</descriptor>
+                  <!-- javadoc jar -->
+                  <descriptor>src/assembly/assemble-javadoc.xml</descriptor>
+                </descriptors>
+              </configuration>
+            </execution>
+
+          </executions>
+        </plugin>
+
+        <plugin>
+          <!-- Generates aggregate code coverage report from website.
+               This applies across all Maven submodules. -->
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>${jacoco-maven-plugin.version}</version>
+          <executions>
+            <execution>
+              <id>default-report</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>report-aggregate</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>${maven-enforcer-plugin.version}</version>
+          <executions>
+            <execution>
+              <id>enforce-banned-dependencies</id>
+              <goals>
+                <goal>enforce</goal>
+              </goals>
+              <configuration>
+                <rules>
+                  <requireJavaVersion>
+                    <version>[1.8,1.9),[8,14)</version>
+                  </requireJavaVersion>
+                  <requireMavenVersion>
+                    <version>[${maven.version},)</version>
+                  </requireMavenVersion>
+                  <bannedDependencies>
+                    <excludes>
+                      <!--LGPL licensed library-->
+                      <exclude>com.google.code.findbugs:annotations</exclude>
+                    </excludes>
+                  </bannedDependencies>
+                </rules>
+                <fail>true</fail>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>pl.project13.maven</groupId>
+          <artifactId>git-commit-id-plugin</artifactId>
+          <version>${git-commit-id-plugin.version}</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${maven-jar-plugin.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <!--suppress MavenModelInspection -->
-        <configuration>
-          <archive>
-            <manifest>
-              <addDefaultEntries>false</addDefaultEntries>
-              <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
-            </manifest>
-            <manifestEntries>
-              <Build-Jdk>${java.version} (${java.vendor} ${java.vm.version})</Build-Jdk>
-              <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>
-        </configuration>
-        <executions>
-
-          <!-- multi-release (MR) jar -->
-          <execution>
-            <id>assemble-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <appendAssemblyId>false</appendAssemblyId>
-              <attach>true</attach>
-              <descriptors>
-                <descriptor>src/assembly/assemble-mr-jar.xml</descriptor>
-              </descriptors>
-              <!-- The class loader requires this to be set in a multi-release JAR's manifest -->
-              <archive>
-                <manifestEntries>
-                  <Multi-Release>true</Multi-Release>
-                </manifestEntries>
-              </archive>
-            </configuration>
-          </execution>
-
-          <!-- sources, tests and javadocs jars -->
-          <execution>
-            <id>assemble-sources-tests-javadocs</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <appendAssemblyId>true</appendAssemblyId>
-              <attach>true</attach>
-              <descriptors>
-                <!-- tests jar -->
-                <descriptor>src/assembly/assemble-test-jar.xml</descriptor>
-                <!-- sources.jar -->
-                <descriptor>src/assembly/assemble-sources.xml</descriptor>
-                <!-- test-sources.jar -->
-                <descriptor>src/assembly/assemble-test-sources.xml</descriptor>
-                <!-- javadoc jar -->
-                <descriptor>src/assembly/assemble-javadoc.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-
-        </executions>
       </plugin>
-
       <plugin>
-        <!-- Generates aggregate code coverage report from website.
-             This applies across all Maven submodules. -->
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>${jacoco-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>default-report</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>report-aggregate</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
-
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin</artifactId>
-        <version>${git-commit-id-plugin.version}</version>
       </plugin>
-
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 
@@ -365,10 +435,6 @@
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
           </plugin>
         </plugins>
@@ -388,6 +454,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-remote-resources-plugin</artifactId>
+              <version>${maven-remote-resources-plugin.version}</version>
               <executions>
                 <execution>
                   <id>process-resource-bundles</id>
@@ -397,6 +464,13 @@
             </plugin>
           </plugins>
         </pluginManagement>
+
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-remote-resources-plugin</artifactId>
+          </plugin>
+        </plugins>
       </build>
     </profile>
 
diff --git a/pom.xml b/pom.xml
index d3088b0..8e69b3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,13 +120,14 @@ under the License.
     <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
 
     <!--  Maven Plugins -->
+    <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version> <!-- overrides parent -->
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> <!-- overrides parent -->
     <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version> <!-- overrides parent -->
     <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version> <!-- overrides parent -->
     <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version> <!-- overrides parent -->
     <maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version> <!-- overrides parent -->
     <maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version> <!-- overrides parent -->
-    <maven-remote-resources-plugin.version>[1.7.0,)</maven-remote-resources-plugin.version> <!-- overrides parent -->
+    <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>
@@ -283,7 +284,7 @@ under the License.
                     <version>[1.8,1.9),[8,14)</version>
                   </requireJavaVersion>
                   <requireMavenVersion>
-                    <version>${maven.version},</version>
+                    <version>[${maven.version},)</version>
                   </requireMavenVersion>
                   <bannedDependencies>
                     <excludes>
@@ -504,6 +505,7 @@ under the License.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-remote-resources-plugin</artifactId>
+              <version>${maven-remote-resources-plugin.version}</version>
               <executions>
                 <execution>
                   <id>process-resource-bundles</id>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org