Merge branch 'main' into ImproveShortNameComparator

NationalSecurityAgency · Dec 23, 2024 · bc8c40b · bc8c40b
2 parents 8a1fe37 + 43a112d
commit bc8c40b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
@@ -118,7 +118,7 @@ jobs:
           distribution: "corretto"
 
       - name: Build with Maven
-        run: mvn -B -e -ntp "-Dstyle.color=always" site
+        run: mvn -B -e -ntp "-Dstyle.color=always" site -Pcoverage,pmd
 
   slack-notify:
     if: ${{ github.event_name == 'push' && github.repository == 'NationalSecurityAgency/emissary' }}

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -133,7 +133,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish site to GitHub Pages
-        run: mvn site site:stage scm-publish:publish-scm -DskipTests
+        run: mvn site site:stage scm-publish:publish-scm -Pcoverage,pmd -DskipTests
         continue-on-error: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ services, their cost and quality and keep the P2P network connected.
 
 - Linux or MacOSX operating system
 - [JDK 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html)
-- [Apache Maven 3.5+](http://maven.apache.org)
+- [Apache Maven 3.6.3+](http://maven.apache.org)
 
 ## Getting Started
 

diff --git a/pom.xml b/pom.xml
@@ -87,40 +87,40 @@
     <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <maven.min-version>3.5.0</maven.min-version>
-    <plugin.build-helper-maven.version>3.3.0</plugin.build-helper-maven.version>
-    <plugin.cyclonedx-maven.version>2.7.9</plugin.cyclonedx-maven.version>
+    <maven.min-version>3.6.3</maven.min-version>
+    <plugin.build-helper-maven.version>3.6.0</plugin.build-helper-maven.version>
+    <plugin.cyclonedx-maven.version>2.9.1</plugin.cyclonedx-maven.version>
     <plugin.duplicate-finder-maven.version>1.5.1</plugin.duplicate-finder-maven.version>
-    <plugin.exec-maven.version>3.1.0</plugin.exec-maven.version>
+    <plugin.exec-maven.version>3.5.0</plugin.exec-maven.version>
     <plugin.formatter-maven.version>2.23.0</plugin.formatter-maven.version>
-    <plugin.git-commit-id-maven.version>4.9.9</plugin.git-commit-id-maven.version>
+    <plugin.git-commit-id-maven.version>9.0.1</plugin.git-commit-id-maven.version>
     <plugin.impsort-maven.version>1.8.0</plugin.impsort-maven.version>
-    <plugin.jacoco-maven.version>0.8.8</plugin.jacoco-maven.version>
-    <plugin.maven-assembly.version>3.4.2</plugin.maven-assembly.version>
-    <plugin.maven-checkstyle.version>3.2.1</plugin.maven-checkstyle.version>
-    <plugin.maven-clean.version>3.2.0</plugin.maven-clean.version>
-    <plugin.maven-compiler.version>3.10.1</plugin.maven-compiler.version>
-    <plugin.maven-dependency.version>3.5.0</plugin.maven-dependency.version>
-    <plugin.maven-deploy.version>3.1.0</plugin.maven-deploy.version>
-    <plugin.maven-enforcer.version>3.2.1</plugin.maven-enforcer.version>
-    <plugin.maven-gpg.version>3.1.0</plugin.maven-gpg.version>
-    <plugin.maven-install.version>3.1.0</plugin.maven-install.version>
-    <plugin.maven-jar.version>3.3.0</plugin.maven-jar.version>
-    <plugin.maven-javadoc.version>3.4.1</plugin.maven-javadoc.version>
-    <plugin.maven-jxr.version>3.3.0</plugin.maven-jxr.version>
-    <plugin.maven-pmd.version>3.20.0</plugin.maven-pmd.version>
+    <plugin.jacoco-maven.version>0.8.12</plugin.jacoco-maven.version>
+    <plugin.maven-assembly.version>3.7.1</plugin.maven-assembly.version>
+    <plugin.maven-checkstyle.version>3.3.0</plugin.maven-checkstyle.version>
+    <plugin.maven-clean.version>3.4.0</plugin.maven-clean.version>
+    <plugin.maven-compiler.version>3.13.0</plugin.maven-compiler.version>
+    <plugin.maven-dependency.version>3.8.1</plugin.maven-dependency.version>
+    <plugin.maven-deploy.version>3.1.3</plugin.maven-deploy.version>
+    <plugin.maven-enforcer.version>3.5.0</plugin.maven-enforcer.version>
+    <plugin.maven-gpg.version>3.2.7</plugin.maven-gpg.version>
+    <plugin.maven-install.version>3.1.3</plugin.maven-install.version>
+    <plugin.maven-jar.version>3.4.2</plugin.maven-jar.version>
+    <plugin.maven-javadoc.version>3.11.1</plugin.maven-javadoc.version>
+    <plugin.maven-jxr.version>3.6.0</plugin.maven-jxr.version>
+    <plugin.maven-pmd.version>3.24.0</plugin.maven-pmd.version>
     <plugin.maven-project-info-reports.version>3.4.2</plugin.maven-project-info-reports.version>
-    <plugin.maven-release.version>3.0.0</plugin.maven-release.version>
+    <plugin.maven-release.version>3.1.1</plugin.maven-release.version>
     <plugin.maven-replacer.version>1.5.3</plugin.maven-replacer.version>
-    <plugin.maven-resources.version>3.3.0</plugin.maven-resources.version>
-    <plugin.maven-scm-publish.version>3.2.1</plugin.maven-scm-publish.version>
+    <plugin.maven-resources.version>3.3.1</plugin.maven-resources.version>
+    <plugin.maven-scm-publish.version>3.3.0</plugin.maven-scm-publish.version>
     <plugin.maven-site.version>3.12.1</plugin.maven-site.version>
-    <plugin.maven-source.version>3.2.1</plugin.maven-source.version>
-    <!-- seems to have an impact with java 11 integration, update with caution -->
-    <plugin.maven-surefire.version>3.1.0</plugin.maven-surefire.version>
+    <plugin.maven-source.version>3.3.1</plugin.maven-source.version>
+    <plugin.maven-surefire.version>3.2.3</plugin.maven-surefire.version>
     <plugin.nexus-staging-maven.version>1.6.7</plugin.nexus-staging-maven.version>
     <plugin.sonar-maven.version>3.9.1.2184</plugin.sonar-maven.version>
     <plugin.sortpom-maven.version>2.15.0</plugin.sortpom-maven.version>
+    <plugin.takari-lifecycle>2.0.8</plugin.takari-lifecycle>
     <plugin.versions-maven.version>2.17.1</plugin.versions-maven.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -668,6 +668,11 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>io.takari.maven.plugins</groupId>
+          <artifactId>takari-lifecycle-plugin</artifactId>
+          <version>${plugin.takari-lifecycle}</version>
+        </plugin>
         <plugin>
           <groupId>net.revelc.code</groupId>
           <artifactId>impsort-maven-plugin</artifactId>
@@ -884,7 +889,7 @@
             <format>xml</format>
             <includeTests>true</includeTests>
             <minimumTokens>100</minimumTokens>
-            <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
+            <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
             <targetJdk>${maven.compiler.target}</targetJdk>
           </configuration>
           <executions>
@@ -1357,6 +1362,10 @@
       <id>dist</id>
       <build>
         <plugins>
+          <plugin>
+            <groupId>io.takari.maven.plugins</groupId>
+            <artifactId>takari-lifecycle-plugin</artifactId>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>