You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/03/03 18:23:52 UTC
[maven-dependency-plugin] branch GITHUB_ACTIONS updated (80ae4e8 ->
aafd4b5)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git.
discard 80ae4e8 Trigger test.
discard 916ece6 Change name of pipeline.
discard b623f25 Fixed container names.
discard c7c4fae Improved.
discard edaf77e Just using Maven Container.
discard 0daeaca Renamed maiin to maven.yml
discard 2c4262e Fixing issue.
discard e80c54f Added Copyright header to workflow file.
discard 27d0af4 Added trigger for branches.
discard 0a9c27d Changed the trigger name.
discard 41df7da Another issue.
discard e959b5e Fixed tab/space issue.
discard 586109d Testing GitHub Actions.
add 23ce086 doc - Add note on dependecy:tree -Dverbose support in 3.0+
add 2284376 Merge pull request #4 from grimsa/patch-1
add d3cf760 update dependencies
add 6e16af8 revert maven-artifact-transfer
add db1cb20 Merge pull request #32 from apache/update
new 56d3f3f Testing GitHub Actions.
new 282736f Fixed tab/space issue.
new f2bf355 Another issue.
new 0406950 Changed the trigger name.
new d05954a Added trigger for branches.
new 4b8cc8a Added Copyright header to workflow file.
new d8de384 Fixing issue.
new 2bf7cc5 Renamed maiin to maven.yml
new 77821c0 Just using Maven Container.
new 3be6dfa Improved.
new 77e67de Fixed container names.
new a32bcf5 Change name of pipeline.
new aafd4b5 Trigger test.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (80ae4e8)
\
N -- N -- N refs/heads/GITHUB_ACTIONS (aafd4b5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 13 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:
.gitignore | 2 ++
pom.xml | 12 ++++++------
.../resolving-conflicts-using-the-dependency-tree.apt | 9 +++++++++
3 files changed, 17 insertions(+), 6 deletions(-)
[maven-dependency-plugin] 04/13: Changed the trigger name.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 0406950100539f6aca101eb23f700fd3533b1b9d
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 22:46:54 2019 +0200
Changed the trigger name.
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1d96a75..2072c98 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ on:
pull_request:
branches:
- MDEP-*
- - *
+ - GITHUB*
jobs:
mdep_linux_11:
[maven-dependency-plugin] 06/13: Added Copyright header to workflow
file.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 4b8cc8a2f54f819d4b377db65a60865179450317
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 22:58:41 2019 +0200
Added Copyright header to workflow file.
---
.github/workflows/main.yml | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 435f20e..288ac56 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
name: Aapche Maven Dependency Plugin
on:
push:
@@ -21,7 +38,6 @@ jobs:
- name: Build
run: |
- set -e
mvn -V --no-transfer-progress -B clean verify -Prun-its
shell: bash
@@ -39,7 +55,6 @@ jobs:
- name: Build
run: |
- set -e
mvn -V --no-transfer-progress -B clean verify -Prun-its
shell: bash
@@ -57,7 +72,6 @@ jobs:
- name: Test
run: |
- set -e
mvn -V --no-transfer-progress -B clean verify -Prun-its
shell: bash
[maven-dependency-plugin] 05/13: Added trigger for branches.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit d05954a68d2e708e9d28964c7c21562310e95c04
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 22:50:22 2019 +0200
Added trigger for branches.
---
.github/workflows/main.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2072c98..435f20e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,6 +3,7 @@ on:
push:
branches:
- master
+ - GITHUB*
pull_request:
branches:
- MDEP-*
[maven-dependency-plugin] 13/13: Trigger test.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit aafd4b5f8564435a3d3570070f7888dd42aeaf45
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Aug 23 11:20:20 2019 +0200
Trigger test.
---
.github/workflows/maven.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1098734..a946e97 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
#
+# added comment to trigger build.
name: MDEP
on:
push:
[maven-dependency-plugin] 12/13: Change name of pipeline.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit a32bcf52adcbc27d6140695169dc4866ace490d4
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 23:45:05 2019 +0200
Change name of pipeline.
---
.github/workflows/maven.yml | 2 +-
.../maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ec7adf1..1098734 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
#
-name: Aapche Maven Dependency Plugin
+name: MDEP
on:
push:
branches:
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
index eb3ae75..34c9f4b 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
@@ -542,7 +542,7 @@ public class TestUnpackMojo
mojo.setSilent( false );
stubFactory.setCreateFiles( true );
Artifact artifact = stubFactory.getSnapshotArtifact();
- assertTrue( artifact.getFile().setLastModified( now - 20000 ) );
+ assertTrue( artifact.getFile().setLastModified( now - 10000 ) );
ArtifactItem item = new ArtifactItem( createArtifact( artifact ) );
@@ -555,8 +555,7 @@ public class TestUnpackMojo
// round down to the last second
long time = now;
time = time - ( time % 1000 );
- // go back 10 more seconds for linux
- time -= 10000;
+
// set to known value
assertTrue( unpackedFile.setLastModified( time ) );
// set source to be newer was 4s but test is brittle on MacOS if less than 5s
[maven-dependency-plugin] 07/13: Fixing issue.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit d8de3840df843931c51af311befdee0199421ea1
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 23:01:56 2019 +0200
Fixing issue.
---
.github/workflows/main.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 288ac56..46db5f7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,10 +37,8 @@ jobs:
fetch-depth: 10
- name: Build
- run: |
- mvn -V --no-transfer-progress -B clean verify -Prun-its
-
- shell: bash
+ run: mvn -V --no-transfer-progress -B clean verify -Prun-its
+ shell: bash
env:
LC_ALL: en_US.UTF-8
[maven-dependency-plugin] 11/13: Fixed container names.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 77e67de9ef61371f07e7d7cd2347cf4de3314bbb
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 23:38:04 2019 +0200
Fixed container names.
---
.github/workflows/maven.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index dbdbfc6..ec7adf1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -56,7 +56,7 @@ jobs:
mdep_linux_12:
name: Ubuntu (OpenJDK 12)
runs-on: ubuntu-latest
- container: maven:3.6.1-jdk-12-slim
+ container: maven:3.6.1-jdk-12
steps:
- uses: actions/checkout@master
with:
@@ -69,7 +69,7 @@ jobs:
mdep_linux_13:
name: Ubuntu (OpenJDK 13)
runs-on: ubuntu-latest
- container: maven:3.6.1-jdk-13-slim
+ container: maven:3.6.1-jdk-13
steps:
- uses: actions/checkout@master
with:
[maven-dependency-plugin] 01/13: Testing GitHub Actions.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 56d3f3fb0ee1d20ffd53dd6e7891dc8b99ec622e
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 22:40:03 2019 +0200
Testing GitHub Actions.
---
.github/workflows/main.yml | 85 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..c57ddcf
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,85 @@
+name: Aapche Maven Dependency Plugin
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - MDEP-*
+ - *
+
+jobs:
+ mdep_linux_11:
+ name: Linux (OpenJDK 11)
+ runs-on: ubuntu-latest
+ container: openjdk:11
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 10
+
+ - name: Build
+ run: |
+ set -e
+ mvn -V --no-transfer-progress -B clean verify -Prun-its
+
+ shell: bash
+ env:
+ LC_ALL: en_US.UTF-8
+
+ mdep_linux_12:
+ name: Linux (OpenJDK 12)
+ runs-on: ubuntu-latest
+ container: openjdk:12
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 10
+
+ - name: Build
+ run: |
+ set -e
+ mvn -V --no-transfer-progress -B clean verify -Prun-its
+
+ shell: bash
+ env:
+ LC_ALL: en_US.UTF-8
+
+ mdep_linux_13:
+ name: Linux (OpenJDK 13)
+ runs-on: ubuntu-latest
+ container: openjdk:13
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 10
+
+ - name: Test
+ run: |
+ set -e
+ mvn -V --no-transfer-progress -B clean verify -Prun-its
+
+ shell: bash
+ env:
+ LC_ALL: en_US.UTF-8
+
+ mdep_windows:
+ name: Windows
+ runs-on: windows-latest
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 10
+
+ - run: choco install openjdk --version 12.0.2
+ shell: bash
+
+ - name: Test
+ run: |
+ set -e
+ export JAVA_HOME="C:\Program Files\OpenJDK\jdk-12.0.2"
+ mvn -V --no-transfer-progress -B clean verify -Prun-its
+
+ shell: bash
+ env:
+ LC_ALL: en_US.UTF-8
[maven-dependency-plugin] 02/13: Fixed tab/space issue.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 282736fa7737401f1f54724951b5cfea1734feb2
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 22:43:41 2019 +0200
Fixed tab/space issue.
---
.github/workflows/main.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c57ddcf..943692e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
- name: Build
run: |
set -e
- mvn -V --no-transfer-progress -B clean verify -Prun-its
+ mvn -V --no-transfer-progress -B clean verify -Prun-its
shell: bash
env:
@@ -39,7 +39,7 @@ jobs:
- name: Build
run: |
set -e
- mvn -V --no-transfer-progress -B clean verify -Prun-its
+ mvn -V --no-transfer-progress -B clean verify -Prun-its
shell: bash
env:
@@ -57,7 +57,7 @@ jobs:
- name: Test
run: |
set -e
- mvn -V --no-transfer-progress -B clean verify -Prun-its
+ mvn -V --no-transfer-progress -B clean verify -Prun-its
shell: bash
env:
@@ -78,7 +78,7 @@ jobs:
run: |
set -e
export JAVA_HOME="C:\Program Files\OpenJDK\jdk-12.0.2"
- mvn -V --no-transfer-progress -B clean verify -Prun-its
+ mvn -V --no-transfer-progress -B clean verify -Prun-its
shell: bash
env:
[maven-dependency-plugin] 08/13: Renamed maiin to maven.yml
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 2bf7cc5d8b4bca2b818c27000cee609c74ee353a
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 23:12:00 2019 +0200
Renamed maiin to maven.yml
---
.github/workflows/{main.yml => maven.yml} | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/maven.yml
similarity index 99%
rename from .github/workflows/main.yml
rename to .github/workflows/maven.yml
index 46db5f7..c704031 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/maven.yml
@@ -35,7 +35,6 @@ jobs:
- uses: actions/checkout@master
with:
fetch-depth: 10
-
- name: Build
run: mvn -V --no-transfer-progress -B clean verify -Prun-its
shell: bash
[maven-dependency-plugin] 03/13: Another issue.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit f2bf35578dad8abb14672a479ca18a93dee1d464
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 22:44:44 2019 +0200
Another issue.
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 943692e..1d96a75 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ on:
- master
pull_request:
branches:
- - MDEP-*
+ - MDEP-*
- *
jobs:
[maven-dependency-plugin] 09/13: Just using Maven Container.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 77821c08fd0af0eafbebb869cc90042dd99dbc21
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 23:18:06 2019 +0200
Just using Maven Container.
---
.github/workflows/maven.yml | 36 +-----------------------------------
1 file changed, 1 insertion(+), 35 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c704031..2fc684b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -30,7 +30,7 @@ jobs:
mdep_linux_11:
name: Linux (OpenJDK 11)
runs-on: ubuntu-latest
- container: openjdk:11
+ container: maven:3.6.1-jdk-11-slim
steps:
- uses: actions/checkout@master
with:
@@ -41,40 +41,6 @@ jobs:
env:
LC_ALL: en_US.UTF-8
- mdep_linux_12:
- name: Linux (OpenJDK 12)
- runs-on: ubuntu-latest
- container: openjdk:12
- steps:
- - uses: actions/checkout@master
- with:
- fetch-depth: 10
-
- - name: Build
- run: |
- mvn -V --no-transfer-progress -B clean verify -Prun-its
-
- shell: bash
- env:
- LC_ALL: en_US.UTF-8
-
- mdep_linux_13:
- name: Linux (OpenJDK 13)
- runs-on: ubuntu-latest
- container: openjdk:13
- steps:
- - uses: actions/checkout@master
- with:
- fetch-depth: 10
-
- - name: Test
- run: |
- mvn -V --no-transfer-progress -B clean verify -Prun-its
-
- shell: bash
- env:
- LC_ALL: en_US.UTF-8
-
mdep_windows:
name: Windows
runs-on: windows-latest
[maven-dependency-plugin] 10/13: Improved.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch GITHUB_ACTIONS
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 3be6dfab5bc1aa54d9efd18b2c63a00b1e576822
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Aug 12 23:32:48 2019 +0200
Improved.
---
.github/workflows/maven.yml | 43 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 40 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2fc684b..dbdbfc6 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,8 +27,21 @@ on:
- GITHUB*
jobs:
+ mdep_linux_8:
+ name: Ubuntu (OpenJDK 8)
+ runs-on: ubuntu-latest
+ container: maven:3.6.1-jdk-8-slim
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 10
+ - name: Build
+ run: mvn -V --no-transfer-progress -B clean verify -Prun-its
+ shell: bash
+ env:
+ LC_ALL: en_US.UTF-8
mdep_linux_11:
- name: Linux (OpenJDK 11)
+ name: Ubuntu (OpenJDK 11)
runs-on: ubuntu-latest
container: maven:3.6.1-jdk-11-slim
steps:
@@ -40,7 +53,32 @@ jobs:
shell: bash
env:
LC_ALL: en_US.UTF-8
-
+ mdep_linux_12:
+ name: Ubuntu (OpenJDK 12)
+ runs-on: ubuntu-latest
+ container: maven:3.6.1-jdk-12-slim
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 10
+ - name: Build
+ run: mvn -V --no-transfer-progress -B clean verify -Prun-its
+ shell: bash
+ env:
+ LC_ALL: en_US.UTF-8
+ mdep_linux_13:
+ name: Ubuntu (OpenJDK 13)
+ runs-on: ubuntu-latest
+ container: maven:3.6.1-jdk-13-slim
+ steps:
+ - uses: actions/checkout@master
+ with:
+ fetch-depth: 10
+ - name: Build
+ run: mvn -V --no-transfer-progress -B clean verify -Prun-its
+ shell: bash
+ env:
+ LC_ALL: en_US.UTF-8
mdep_windows:
name: Windows
runs-on: windows-latest
@@ -51,7 +89,6 @@ jobs:
- run: choco install openjdk --version 12.0.2
shell: bash
-
- name: Test
run: |
set -e