Merge pull request #2059 from hazendaz/master

Use directory plugin fork and update github actions
Waffle · Sep 28, 2023 · e92cf13 · e92cf13
2 parents c28291a + 5c369dd
commit e92cf13
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 32 deletions.
diff --git a/.github/workflows/ci.net.yaml b/.github/workflows/ci.net.yaml
@@ -13,7 +13,7 @@ jobs:
     name: Test .net ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@v4
       - name: Set up environment
         run: ./bootstrap.cmd
       - name: Test with .Net

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,13 +8,13 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019, windows-latest]
-        java: [17, 20, 21-ea]
+        java: [17, 21]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -23,7 +23,7 @@ jobs:
     if: github.repository_owner == 'waffle-OFF'
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml
@@ -10,11 +10,11 @@ jobs:
     if: github.repository_owner == 'waffle'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Analyze with Coverity
         run: |

diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml
@@ -10,11 +10,11 @@ jobs:
     if: github.repository_owner == 'waffle' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - uses: webfactory/ssh-agent@master
         with:

diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -10,14 +10,14 @@ jobs:
     if: github.repository_owner == 'waffle'
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@v4
         with:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Analyze with SonarCloud
         run: ./mvnw verify sonar:sonar -B -D"license.skip=true" -D"sonar.projectKey=Waffle_waffle" -D"sonar.organization=waffle" -D"sonar.host.url=https://sonarcloud.io" -D"sonar.login=$SONAR_TOKEN"

diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
@@ -10,11 +10,11 @@ jobs:
     if: github.repository_owner == 'waffle' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Deploy to Sonatype
         run: ./mvnw deploy -DskipTests -B -D"license.skip=true" --settings ./.mvn/settings.xml

diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
@@ -155,7 +155,7 @@
         <maven.compiler.testTarget>${java.test.version}</maven.compiler.testTarget>
         <maven.compiler.testRelease>${java.test.release.version}</maven.compiler.testRelease>
 
-        <maven.min-version>3.9.1</maven.min-version>
+        <maven.min-version>3.9.4</maven.min-version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
@@ -192,7 +192,7 @@
         <dependency.plugin>3.6.0</dependency.plugin>
         <dependency-check.plugin>8.4.0</dependency-check.plugin>
         <deploy.plugin>3.1.1</deploy.plugin>
-        <directory.plugin>1.0</directory.plugin>
+        <directory.plugin>1.1.0</directory.plugin>
         <enforcer.plugin>3.4.1</enforcer.plugin>
         <formatter.plugin>2.23.0</formatter.plugin>
         <git-commit-id.plugin>6.0.0</git-commit-id.plugin>
@@ -910,7 +910,7 @@
 
                 <!-- Find maven root -->
                 <plugin>
-                    <groupId>org.commonjava.maven.plugins</groupId>
+                    <groupId>com.github.hazendaz.maven</groupId>
                     <artifactId>directory-maven-plugin</artifactId>
                     <version>${directory.plugin}</version>
                 </plugin>
@@ -1061,7 +1061,7 @@
 
             <!-- Find maven root -->
             <plugin>
-                <groupId>org.commonjava.maven.plugins</groupId>
+                <groupId>com.github.hazendaz.maven</groupId>
                 <artifactId>directory-maven-plugin</artifactId>
                 <executions>
                     <execution>
@@ -1365,22 +1365,7 @@
                             <configuration>
                                 <lifecycleMappingMetadata>
                                     <pluginExecutions>
-                                        <pluginExecution>
-                                            <pluginExecutionFilter>
-                                                <groupId>org.commonjava.maven.plugins</groupId>
-                                                <artifactId>directory-maven-plugin</artifactId>
-                                                <versionRange>[${directory.plugin},)</versionRange>
-                                                <goals>
-                                                    <goal>highest-basedir</goal>
-                                                </goals>
-                                            </pluginExecutionFilter>
-                                            <action>
-                                                <execute>
-                                                    <runOnConfiguration>true</runOnConfiguration>
-                                                    <runOnIncremental>true</runOnIncremental>
-                                                </execute>
-                                            </action>
-                                        </pluginExecution>
+                                        <!-- Continue to run license plugin with m2e, its in plugin now but disabled there so this ensures it runs. -->
                                         <pluginExecution>
                                             <pluginExecutionFilter>
                                                 <groupId>com.mycila</groupId>