You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/09/29 13:40:10 UTC

[maven-dependency-plugin] branch master updated (6a9ada8 -> 3ed0f50)

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

slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git.


    from 6a9ada8  Bump mockito-core from 2.28.2 to 3.12.4
     new 2dc1c7a  Adjust CI setup
     new 3ed0f50  Bump maven-dependency-tree from 3.0.1 to 3.1.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/maven.yml                         | 21 +++++----------------
 pom.xml                                             |  2 +-
 .../maven/plugins/dependency/tree/TreeMojo.java     |  2 +-
 3 files changed, 7 insertions(+), 18 deletions(-)

[maven-dependency-plugin] 01/02: Adjust CI setup

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git

commit 2dc1c7a9f037f338cd13b082fe2027c9bd729727
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Sep 29 15:36:29 2021 +0200

    Adjust CI setup
---
 .github/workflows/maven.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 91fc7a3..1f53dd1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,30 +25,19 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest,windows-latest, macOS-latest]
-        java: [8, 11, 16, 17-ea]
-        jdk: [adopt, zulu]
+        java: [8, 11, 17]
+        jdk: [temurin,zulu]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2.3.4
-
-      - name: Set up cache for ~./m2/repository
-        uses: actions/cache@v2.1.6
-        with:
-          path: ~/.m2/repository
-          key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            maven-${{ matrix.os }}-java${{ matrix.java }}-
-            maven-${{ matrix.os }}-
-
-      - name: Set up JDK
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
         with:
           distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}
+          cache: 'maven'
 
       - name: Build with Maven
         run: mvn install -e -B -V -Prun-its

[maven-dependency-plugin] 02/02: Bump maven-dependency-tree from 3.0.1 to 3.1.0

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git

commit 3ed0f503f4935191e6e6eeb2be498c96a05222f2
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Sep 29 14:20:21 2021 +0200

    Bump maven-dependency-tree from 3.0.1 to 3.1.0
---
 pom.xml                                                              | 2 +-
 src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c510b4..9acbefd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,7 +231,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-dependency-tree</artifactId>
-      <version>3.0.1</version>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
index e8bb731..218ec39 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/tree/TreeMojo.java
@@ -398,7 +398,7 @@ public class TreeMojo
                 convertAetherArtifactToMavenArtifact( child ),
                 child.getArtifact().getProperties().get( "preManagedVersion" ),
                 child.getArtifact().getProperties().get( "preManagedScope" ), null,
-                child.getDependency().isOptional() );
+                child.getDependency().isOptional(), exclusions );
 
         newChild.setChildren( new ArrayList<>() );