[maven-doxia-sitetools] branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.3.0 created (now 9e48107)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.3.0 in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git at 9e48107 Bump maven-project-info-reports-plugin from 3.1.2 to 3.3.0 No new revisions were added by this update.
[maven-doxia-sitetools] branch dependabot/maven/org.codehaus.plexus-plexus-velocity-1.3 created (now 6d42311)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-velocity-1.3 in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git at 6d42311 Bump plexus-velocity from 1.2 to 1.3 No new revisions were added by this update.
[maven-mvnd] branch master updated: Fix release guide and publish script
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new d377916 Fix release guide and publish script
d377916 is described below
commit d37791600d193d3ed6b55d846c53ddbbeaf99fc7
Author: Guillaume Nodet
AuthorDate: Fri Apr 29 19:28:05 2022 +0200
Fix release guide and publish script
---
RELEASING.adoc | 13 +
build/publish.sh | 1 +
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/RELEASING.adoc b/RELEASING.adoc
index af0a8fe..4e93c5d 100644
--- a/RELEASING.adoc
+++ b/RELEASING.adoc
@@ -1,11 +1,16 @@
= How to release `mnvd`
+* Run the
https://raw.githubusercontent.com/apache/maven-mvnd/master/build/release.sh[release
script] which will update the versions, the changelog, the native binaries and
will tag the new git commit. This new tag will trigger the
https://raw.githubusercontent.com/apache/maven-mvnd/master/.github/workflows/release.yaml[release
workflow] on this newly created tag.
[source,shell]
./build/release.sh
-* Re-run the
https://github.com/apache/maven-mvnd/actions?query=workflow%3A%22Mvnd+Changelog%22[Changelog
update] manually.
-* When it terminates, find the section about the current release
- in the
https://raw.githubusercontent.com/mvndaemon/mvnd/master/CHANGELOG.md[Changelog]
and copy its MarkDown source
- to the respective release page. The release page will appear once the
release build is finished.
+
+* Once the workflow completes, run the
https://raw.githubusercontent.com/apache/maven-mvnd/master/build/publish.sh[publish
script] which will download the built assemblies, compute the checksums and
signatures and commit them to the
https://dist.apache.org/repos/dist/dev/maven/mvnd/[dev distribution repository]
+https://github.com/apache/maven-mvnd/releases[releases].
+You can now call a vote on the mailto:d...@maven.apache.org[dev mailing list]
pointing to that release candidate.
+
+* Once the vote passes, publish the release.
+
+WARNING: *TODO*: document the publication process (move to the final svn area,
homebrew, sdkman, choco updates...)
diff --git a/build/publish.sh b/build/publish.sh
index 92ae19a..b6cdcd1 100755
--- a/build/publish.sh
+++ b/build/publish.sh
@@ -58,6 +58,7 @@ do
gpg --detach-sign --armor ${FILE}
done
+cd ..
svn co https://dist.apache.org/repos/dist/dev/maven/mvnd
mv ${VERSION} mvnd
cd mvnd
svn commit: r54186 - /dev/maven/mvnd/0.8.0/
Author: gnodet Date: Fri Apr 29 16:30:28 2022 New Revision: 54186 Log: Release Apache Maven Daemon 0.8.0 Added: dev/maven/mvnd/0.8.0/ dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip (with props) dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.asc dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.md5 dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha1 dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha256 dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha512 dev/maven/mvnd/0.8.0/mvnd-0.8.0-linux-amd64.zip (with props) dev/maven/mvnd/0.8.0/mvnd-0.8.0-linux-amd64.zip.asc dev/maven/mvnd/0.8.0/mvnd-0.8.0-linux-amd64.zip.md5 dev/maven/mvnd/0.8.0/mvnd-0.8.0-linux-amd64.zip.sha1 dev/maven/mvnd/0.8.0/mvnd-0.8.0-linux-amd64.zip.sha256 dev/maven/mvnd/0.8.0/mvnd-0.8.0-linux-amd64.zip.sha512 dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.tar.gz (with props) dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.tar.gz.asc dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.tar.gz.md5 dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.tar.gz.sha1 dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.tar.gz.sha256 dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.tar.gz.sha512 dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.zip (with props) dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.zip.asc dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.zip.md5 dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.zip.sha1 dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.zip.sha256 dev/maven/mvnd/0.8.0/mvnd-0.8.0-src.zip.sha512 dev/maven/mvnd/0.8.0/mvnd-0.8.0-windows-amd64.zip (with props) dev/maven/mvnd/0.8.0/mvnd-0.8.0-windows-amd64.zip.asc dev/maven/mvnd/0.8.0/mvnd-0.8.0-windows-amd64.zip.md5 dev/maven/mvnd/0.8.0/mvnd-0.8.0-windows-amd64.zip.sha1 dev/maven/mvnd/0.8.0/mvnd-0.8.0-windows-amd64.zip.sha256 dev/maven/mvnd/0.8.0/mvnd-0.8.0-windows-amd64.zip.sha512 Added: dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip == Binary file - no diff available. Propchange: dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip -- svn:mime-type = application/octet-stream Added: dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.asc == --- dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.asc (added) +++ dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.asc Fri Apr 29 16:30:28 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE3JgiTGQhp6W7h/NG7SN4zQmgjN4FAmJsEo4ACgkQ7SN4zQmg +jN6t8xAAscblQPlJSJIIsmOk6X5EVlStDj/mX50b23kI3oC+zbCXNkrZYZebZuhf +qPuq9tTS419jpsXbSPocDKMidV+AyKw2WlbR1UtIG6VPtHB6Cedn93gElIP7vT5i +GvaQg9qAu5DObPJqB6npcH5OqCBEIEbJnxl0rH3GPgfVmNhPLnLbLAnO8tExYTl3 +439CYN2hGSZocgtnCDpTSTNUibCS2NBVmu1RryPGRPUe5/KhQb1Q/PinDhv6sL7M +tWG+5Vvp5ts7S5jqfLFAV3QWo9kvfi5OSRkDnQRKKSp0tKrlbzVb9NdzgTLg8X6i +OWodtjYly7OxzsF7KpVxHOGhoUjGe47k4vXscHTK4kXKW+NkbduL+x1Hf2If89Ft +FQPYILXpYcnZ7iofhKAiSP0KsLzosMdIxJzRAJ/c3n/ZLP8Q0D0RQCnFLAF6fhdM +YVBdDzlnlf4ctqFFOPblXVQjvuNprNbtTT5ftzivaWfdXoMBxTOiANenDRROKVmS +PzHWX/97PwnYV5ODQ7VjCsdpX+dFVaEj/IwQH13LotUUgS70QGgyPAA3Ko3HzzqH +IVKUf74iTSs3HZkvm/jvHMaYBOk6Zv9idgq02Tz79YkulLWrcMtSXLAWqqB40JeV +0Afe6DtDdlJ833fheTsbrQNSpuiTdx2YsnfSJpzWrjuh5Xcfmt0= +=h6Di +-END PGP SIGNATURE- Added: dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.md5 == --- dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.md5 (added) +++ dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.md5 Fri Apr 29 16:30:28 2022 @@ -0,0 +1 @@ +a999a0b5c09a5cefb2c86fc53deedd06 Added: dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha1 == --- dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha1 (added) +++ dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha1 Fri Apr 29 16:30:28 2022 @@ -0,0 +1 @@ +40923ed240b41077d6cd74150b272e8510780d8c Added: dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha256 == --- dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha256 (added) +++ dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha256 Fri Apr 29 16:30:28 2022 @@ -0,0 +1 @@ +b39518a6919c1400fdffac2c4c7041498933c5c1541a76c6246a5428ee458978 Added: dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha512 == --- dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha512 (added) +++ dev/maven/mvnd/0.8.0/mvnd-0.8.0-darwin-amd64.zip.sha512 Fri Apr 29 16:30:28 2022 @@ -0,0 +1 @@ +473b5f3eacf528af15ec8d0c7d56b2cdc784682566ea5a810ed534cb9feb25450ef5c05ccb636eb3be8f972c042285794ff9ffbf9bc0d980c3da79dfe7f81e93 Added: dev/maven/mvnd/0.8.0/mvnd-0.8.0-linux-amd64.zip ==
[maven-mvnd] branch master updated (9b4f3f9 -> 30c41aa)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git from 9b4f3f9 Fix return values in script add 709ac3f [release] Release 0.8.0 new 30c41aa Next is 0.8.1-SNAPSHOT The 1 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: .../mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll | Bin 85217 -> 85217 bytes .../mvnd/nativ/Windows/x86_64/mvndnative.dll| Bin 99503 -> 99503 bytes 2 files changed, 0 insertions(+), 0 deletions(-)
[maven-mvnd] 01/01: Next is 0.8.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git commit 30c41aa8d51f32f320aff43b158b19c979b6c2f2 Author: Guillaume Nodet AuthorDate: Fri Apr 29 17:31:50 2022 +0200 Next is 0.8.1-SNAPSHOT --- agent/pom.xml | 2 +- build-plugin/pom.xml | 2 +- client/pom.xml| 2 +- common/pom.xml| 2 +- daemon/pom.xml| 2 +- dist/pom.xml | 2 +- helper/pom.xml| 2 +- integration-tests/pom.xml | 2 +- native/pom.xml| 2 +- pom.xml | 16 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index ffbb63b..2d0c90f 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-agent diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 84dc5da..63eba58 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-build-maven-plugin diff --git a/client/pom.xml b/client/pom.xml index ea1f19e..76b08f8 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-client diff --git a/common/pom.xml b/common/pom.xml index 1e06a5d..dd0e87f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-common diff --git a/daemon/pom.xml b/daemon/pom.xml index 18a4fb6..2f4ffb3 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-daemon diff --git a/dist/pom.xml b/dist/pom.xml index 24351f0..68da1f3 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-dist diff --git a/helper/pom.xml b/helper/pom.xml index 413ffd8..1ceb56e 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-helper-agent diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1eebebd..50ab452 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-integration-tests diff --git a/native/pom.xml b/native/pom.xml index 90c02b5..a3d33f9 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -20,7 +20,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-native diff --git a/pom.xml b/pom.xml index ec6ca05..da78b27 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT pom Maven Daemon - Parent @@ -214,38 +214,38 @@ org.mvndaemon.mvnd mvnd-native -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-agent -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-client -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-common -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-dist pom -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-daemon -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-helper-agent -0.8.0 +0.8.1-SNAPSHOT
[maven-mvnd] 01/01: [release] Release 0.8.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to tag 0.8.0 in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git commit 709ac3f88807e1a79943aeb161a443a16ea34ef9 Author: Guillaume Nodet AuthorDate: Fri Apr 29 17:31:45 2022 +0200 [release] Release 0.8.0 --- agent/pom.xml | 2 +- build-plugin/pom.xml| 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- daemon/pom.xml | 2 +- dist/pom.xml| 2 +- helper/pom.xml | 2 +- integration-tests/pom.xml | 2 +- native/pom.xml | 2 +- .../mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll | Bin 85217 -> 85217 bytes .../mvnd/nativ/Windows/x86_64/mvndnative.dll| Bin 99503 -> 99503 bytes pom.xml | 16 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index 2d0c90f..ffbb63b 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-agent diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 63eba58..84dc5da 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-build-maven-plugin diff --git a/client/pom.xml b/client/pom.xml index 76b08f8..ea1f19e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-client diff --git a/common/pom.xml b/common/pom.xml index dd0e87f..1e06a5d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-common diff --git a/daemon/pom.xml b/daemon/pom.xml index 2f4ffb3..18a4fb6 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-daemon diff --git a/dist/pom.xml b/dist/pom.xml index 68da1f3..24351f0 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-dist diff --git a/helper/pom.xml b/helper/pom.xml index 1ceb56e..413ffd8 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-helper-agent diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 50ab452..1eebebd 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-integration-tests diff --git a/native/pom.xml b/native/pom.xml index a3d33f9..90c02b5 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -20,7 +20,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-native diff --git a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll index cf4f0d2..b5547e8 100755 Binary files a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll and b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll differ diff --git a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86_64/mvndnative.dll b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86_64/mvndnative.dll index 46dbf82..5c017f2 100755 Binary files a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86_64/mvndnative.dll and b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86_64/mvndnative.dll differ diff --git a/pom.xml b/pom.xml index da78b27..ec6ca05 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 pom Maven Daemon - Parent @@ -214,38 +214,38 @@ org.mvndaemon.mvnd mvnd-native -0.8.1-SNAPSHOT +0.8.0 org.mvndaemon.mvnd mvnd-agent -0.8.1-SNAPSHOT +0.8.0 org.mvndaemon.mvnd mvnd-client -0.8.1-SNAPSHOT +0.8.0 org.mvndaemon.mvnd
[maven-mvnd] tag 0.8.0 created (now 709ac3f)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to tag 0.8.0 in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git at 709ac3f (commit) This tag includes the following new commits: new 709ac3f [release] Release 0.8.0 The 1 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.
[maven-mvnd] branch master updated: Fix return values in script
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git The following commit(s) were added to refs/heads/master by this push: new 9b4f3f9 Fix return values in script 9b4f3f9 is described below commit 9b4f3f9792da153911cc6223c9750b7c2eba6f0a Author: Guillaume Nodet AuthorDate: Fri Apr 29 17:01:18 2022 +0200 Fix return values in script --- build/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/release.sh b/build/release.sh index d65d74f..2a734ac 100755 --- a/build/release.sh +++ b/build/release.sh @@ -86,7 +86,7 @@ startup_check() fi local unstaged - unstaged=$(echo "$uncommits" | grep -c "^ [A-Z]") + unstaged=$(echo "$uncommits" | grep -c "^ [A-Z]") || true if [[ $unstaged -gt 0 ]]; then echo "There are unstaged changes - cannot proceed" echo $(echo "$uncommits" | grep "^ [A-Z]") @@ -94,7 +94,7 @@ startup_check() fi local untracked - untracked=$(echo "$uncommits" | grep -c "^??"); + untracked=$(echo "$uncommits" | grep -c "^??") || true if [[ $untracked -gt 0 ]]; then echo "There are untracked changes - cannot proceed" echo $(echo "$uncommits" | grep "^??")
[maven-mvnd] branch master updated: Fix script
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new 33cdd8f Fix script
33cdd8f is described below
commit 33cdd8f75ad38a7424cf18c9831ca84fd97079a6
Author: Guillaume Nodet
AuthorDate: Fri Apr 29 17:00:46 2022 +0200
Fix script
---
build/release.sh | 31 +--
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/build/release.sh b/build/release.sh
index e635560..d65d74f 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -32,32 +32,35 @@ startup_check()
git fetch
# Most of this code was taken from the __git_ps1_changes method of
https://github.com/markgandolfo/git-bash-completion
local branch_ref
- branch_ref="$(git symbolic-ref -q HEAD 2>/dev/null)";
- if [ -n "$branch_ref" ]; then
+ branch_ref=$(git symbolic-ref -q HEAD 2>/dev/null)
+ if [ -n "$branch_ref" ]
+ then
local branch_origin
-branch_origin="$(git for-each-ref --format='%(upstream:short)'
$branch_ref)";
-if [ -n "$branch_origin" ]; then
+branch_origin=$(git for-each-ref --format='%(upstream:short)' $branch_ref)
+if [ -n "$branch_origin" ]
+then
local branch
- branch=${branch_ref##refs/heads/};
+ branch=${branch_ref##refs/heads/}
- if [ "$branch" != "master" ]; then
+ if [ "$branch" != "master" ]
+ then
echo "Not working on the master - cannot proceed"
exit 1
fi
local unpush
- unpush=$(git rev-list $branch_origin..$branch --count);
+ unpush=$(git rev-list $branch_origin..$branch --count)
local unpull
- unpull=$(git rev-list $branch..$branch_origin --count);
+ unpull=$(git rev-list $branch..$branch_origin --count)
local staged
- staged=$(git diff --staged --name-status | wc -l);
+ staged=$(git diff --staged --name-status | wc -l)
local uncommits
- uncommits=$(git status -s -uall --porcelain);
+ uncommits=$(git status -s -uall --porcelain)
if [[ $unpush -gt 0 ]]; then
echo "There are changes which have not been pushed - cannot proceed.
The following commits need to be pushed:"
local unpushed
-unpushed=$(git rev-list $branch_origin..$branch);
+unpushed=$(git rev-list $branch_origin..$branch)
for commit in $unpushed; do
git --no-pager log --pretty=format:"%H - %an, %ar : %s" -n 1 $commit
done
@@ -67,7 +70,7 @@ startup_check()
if [[ $unpull -gt 0 ]]; then
echo "There are changes which have not been pulled - cannot proceed.
The following commits have been added to master since your last pull:"
local unpulled
-unpulled=$(git rev-list $branch..$branch_origin);
+unpulled=$(git rev-list $branch..$branch_origin)
for commit in $unpulled; do
git --no-pager log --pretty=format:"%H - %an, %ar : %s" -n 1 $commit
done
@@ -76,14 +79,14 @@ startup_check()
if [[ $staged -gt 0 ]]; then
local staging
-staging=$(git diff --staged --name-status);
+staging=$(git diff --staged --name-status)
echo "There are changes which are staged but have been commited -
cannot proceed"
echo $staging
exit 1
fi
local unstaged
- unstaged=$(echo "$uncommits" | grep -c "^ [A-Z]");
+ unstaged=$(echo "$uncommits" | grep -c "^ [A-Z]")
if [[ $unstaged -gt 0 ]]; then
echo "There are unstaged changes - cannot proceed"
echo $(echo "$uncommits" | grep "^ [A-Z]")
[maven-mvnd] branch master updated: Add a check to ensure the local repo is on par with the remote
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new f6c3a35 Add a check to ensure the local repo is on par with the remote
f6c3a35 is described below
commit f6c3a35a98074387c6911e7848a1a33c1a2301b3
Author: Guillaume Nodet
AuthorDate: Fri Apr 29 16:55:15 2022 +0200
Add a check to ensure the local repo is on par with the remote
---
build/release.sh | 84 +---
1 file changed, 80 insertions(+), 4 deletions(-)
diff --git a/build/release.sh b/build/release.sh
index ec9dfe8..e635560 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -26,10 +26,86 @@ then
exit 1
fi
-# checkout
-git checkout master
-git fetch origin
-git reset --hard origin/master
+startup_check()
+{
+ # Need to do a git fecth first to download remote changes for us to compare
against
+ git fetch
+ # Most of this code was taken from the __git_ps1_changes method of
https://github.com/markgandolfo/git-bash-completion
+ local branch_ref
+ branch_ref="$(git symbolic-ref -q HEAD 2>/dev/null)";
+ if [ -n "$branch_ref" ]; then
+local branch_origin
+branch_origin="$(git for-each-ref --format='%(upstream:short)'
$branch_ref)";
+if [ -n "$branch_origin" ]; then
+ local branch
+ branch=${branch_ref##refs/heads/};
+
+ if [ "$branch" != "master" ]; then
+echo "Not working on the master - cannot proceed"
+exit 1
+ fi
+
+ local unpush
+ unpush=$(git rev-list $branch_origin..$branch --count);
+ local unpull
+ unpull=$(git rev-list $branch..$branch_origin --count);
+ local staged
+ staged=$(git diff --staged --name-status | wc -l);
+ local uncommits
+ uncommits=$(git status -s -uall --porcelain);
+
+ if [[ $unpush -gt 0 ]]; then
+echo "There are changes which have not been pushed - cannot proceed.
The following commits need to be pushed:"
+local unpushed
+unpushed=$(git rev-list $branch_origin..$branch);
+for commit in $unpushed; do
+ git --no-pager log --pretty=format:"%H - %an, %ar : %s" -n 1 $commit
+done
+exit 1
+ fi
+
+ if [[ $unpull -gt 0 ]]; then
+echo "There are changes which have not been pulled - cannot proceed.
The following commits have been added to master since your last pull:"
+local unpulled
+unpulled=$(git rev-list $branch..$branch_origin);
+for commit in $unpulled; do
+ git --no-pager log --pretty=format:"%H - %an, %ar : %s" -n 1 $commit
+done
+exit 1
+ fi
+
+ if [[ $staged -gt 0 ]]; then
+local staging
+staging=$(git diff --staged --name-status);
+echo "There are changes which are staged but have been commited -
cannot proceed"
+echo $staging
+exit 1
+ fi
+
+ local unstaged
+ unstaged=$(echo "$uncommits" | grep -c "^ [A-Z]");
+ if [[ $unstaged -gt 0 ]]; then
+echo "There are unstaged changes - cannot proceed"
+echo $(echo "$uncommits" | grep "^ [A-Z]")
+exit 1
+ fi
+
+ local untracked
+ untracked=$(echo "$uncommits" | grep -c "^??");
+ if [[ $untracked -gt 0 ]]; then
+echo "There are untracked changes - cannot proceed"
+echo $(echo "$uncommits" | grep "^??")
+exit 1
+ fi
+fi
+ else
+echo "Working folder isn't a git folder"
+exit 1
+ fi
+}
+
+# check
+startup_check
# update version
mvn versions:set -DnewVersion=$VERSION
[maven-mvnd] branch master updated: Move back the sha256 computation on the client side
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new 3877b9d Move back the sha256 computation on the client side
3877b9d is described below
commit 3877b9dce857081de755f296684d1b2902c05636
Author: Guillaume Nodet
AuthorDate: Fri Apr 29 16:49:14 2022 +0200
Move back the sha256 computation on the client side
---
.github/workflows/release.yaml | 65 --
build/publish.sh | 2 +-
2 files changed, 1 insertion(+), 66 deletions(-)
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d95c32b..546d889 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -61,19 +61,12 @@ jobs:
- name: 'Build native distribution'
run: ./mvnw clean verify -Pnative -Dmrm=false -B -ntp -e -DskipTests
- - name: Compute sha256 checksums
-run: |
- for file in dist/target/mvnd-*.zip ; do
-sha256sum ${file} | cut -d ' ' -f 1 > ${file}.sha256
- done
-
- name: 'Upload artifact'
uses: actions/upload-artifact@v2
with:
name: artifacts
path: |
dist/target/mvnd-*.zip
-dist/target/mvnd-*.sha256
source:
name: 'Build source distributions'
@@ -101,12 +94,6 @@ jobs:
- name: 'Build source distribution'
run: ./mvnw clean verify -Psource-distribution -pl :mvnd -Dmrm=false
-B -ntp -e
- - name: Compute sha256 checksums
-run: |
- for file in target/mvnd-*.zip target/mvnd-*.tar.gz ; do
-sha256sum ${file} | cut -d ' ' -f 1 > ${file}.sha256
- done
-
- name: 'Upload artifact'
uses: actions/upload-artifact@v2
with:
@@ -114,8 +101,6 @@ jobs:
path: |
target/mvnd-*.zip
target/mvnd-*.tar.gz
-target/mvnd-*.sha256
-
release:
runs-on: ubuntu-18.04
@@ -171,16 +156,6 @@ jobs:
asset_name: mvnd-${{ env.VERSION }}-src.zip
asset_content_type: application/zip
- - name: Deploy mvnd-src.zip.sha256
-uses: actions/upload-release-asset@v1
-env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: artifacts/mvnd-${{ env.VERSION }}-src.zip.sha256
- asset_name: mvnd-${{ env.VERSION }}-src.zip.sha256
- asset_content_type: text/plain
-
- name: Deploy mvnd-src.tar.gz
uses: actions/upload-release-asset@v1
env:
@@ -191,16 +166,6 @@ jobs:
asset_name: mvnd-${{ env.VERSION }}-src.tar.gz
asset_content_type: application/tar.gz
- - name: Deploy mvnd-src.tar.gz.sha256
-uses: actions/upload-release-asset@v1
-env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: artifacts/mvnd-${{ env.VERSION }}-src.tar.gz.sha256
- asset_name: mvnd-${{ env.VERSION }}-src.tar.gz.sha256
- asset_content_type: text/plain
-
- name: Deploy mvnd-linux-amd64.zip
uses: actions/upload-release-asset@v1
env:
@@ -211,16 +176,6 @@ jobs:
asset_name: mvnd-${{ env.VERSION }}-linux-amd64.zip
asset_content_type: application/zip
- - name: Deploy mvnd-linux-amd64.zip.sha256
-uses: actions/upload-release-asset@v1
-env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: artifacts/mvnd-${{ env.VERSION }}-linux-amd64.zip.sha256
- asset_name: mvnd-${{ env.VERSION }}-linux-amd64.zip.sha256
- asset_content_type: text/plain
-
- name: Deploy mvnd-darwin-amd64.zip
uses: actions/upload-release-asset@v1
env:
@@ -231,16 +186,6 @@ jobs:
asset_name: mvnd-${{ env.VERSION }}-darwin-amd64.zip
asset_content_type: application/zip
- - name: Deploy mvnd-darwin-amd64.zip.sha256
-uses: actions/upload-release-asset@v1
-env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: artifacts/mvnd-${{ env.VERSION }}-darwin-amd64.zip.sha256
- asset_name: mvnd-${{ env.VERSION }}-darwin-amd64.zip.sha256
- asset_content_type: text/plain
-
- name: Deploy mvnd-windows-amd64.zip
uses: actions/upload-release-asset@v1
env:
@@ -250,13 +195,3 @@ jobs:
asset_path: artifacts/mvnd-${{ env.VERSION }}-windows-amd64.zip
asset_name: mvnd-${{ env.VERSION }}-windows-amd64.zip
[maven-release] branch migrate-plugin-off-plexus updated (c7aecdc1 -> 233699c6)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch migrate-plugin-off-plexus in repository https://gitbox.apache.org/repos/asf/maven-release.git from c7aecdc1 Fix tests add 233699c6 Fix ITs No new revisions were added by this update. Summary of changes: maven-release-manager/pom.xml | 22 ++ maven-release-plugin/pom.xml | 12 ++-- pom.xml | 13 + 3 files changed, 29 insertions(+), 18 deletions(-)
[maven-mvnd] branch master updated (98d71fa -> c1393ea)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git from 98d71fa Put back sha256 computation add 0dc83af [release] Release 0.8.0 new c1393ea Next is 0.8.1-SNAPSHOT The 1 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: .../mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll | Bin 85217 -> 85217 bytes .../mvnd/nativ/Windows/x86_64/mvndnative.dll| Bin 99503 -> 99503 bytes 2 files changed, 0 insertions(+), 0 deletions(-)
[maven-mvnd] 01/01: Next is 0.8.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git commit c1393eac4dc94e2e840ebaa05a0f5dfc789a505f Author: Guillaume Nodet AuthorDate: Fri Apr 29 16:26:06 2022 +0200 Next is 0.8.1-SNAPSHOT --- agent/pom.xml | 2 +- build-plugin/pom.xml | 2 +- client/pom.xml| 2 +- common/pom.xml| 2 +- daemon/pom.xml| 2 +- dist/pom.xml | 2 +- helper/pom.xml| 2 +- integration-tests/pom.xml | 2 +- native/pom.xml| 2 +- pom.xml | 16 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index ffbb63b..2d0c90f 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-agent diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 84dc5da..63eba58 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-build-maven-plugin diff --git a/client/pom.xml b/client/pom.xml index ea1f19e..76b08f8 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-client diff --git a/common/pom.xml b/common/pom.xml index 1e06a5d..dd0e87f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-common diff --git a/daemon/pom.xml b/daemon/pom.xml index 18a4fb6..2f4ffb3 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-daemon diff --git a/dist/pom.xml b/dist/pom.xml index 24351f0..68da1f3 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-dist diff --git a/helper/pom.xml b/helper/pom.xml index 413ffd8..1ceb56e 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-helper-agent diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1eebebd..50ab452 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-integration-tests diff --git a/native/pom.xml b/native/pom.xml index 90c02b5..a3d33f9 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -20,7 +20,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-native diff --git a/pom.xml b/pom.xml index ec6ca05..da78b27 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT pom Maven Daemon - Parent @@ -214,38 +214,38 @@ org.mvndaemon.mvnd mvnd-native -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-agent -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-client -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-common -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-dist pom -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-daemon -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-helper-agent -0.8.0 +0.8.1-SNAPSHOT
[maven-mvnd] tag 0.8.0 created (now 0dc83af)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to tag 0.8.0 in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git at 0dc83af (commit) This tag includes the following new commits: new 0dc83af [release] Release 0.8.0 The 1 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.
[maven-mvnd] 01/01: [release] Release 0.8.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to tag 0.8.0 in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git commit 0dc83af8f6eec74cd8ce847a556e08c6f7489715 Author: Guillaume Nodet AuthorDate: Fri Apr 29 16:26:01 2022 +0200 [release] Release 0.8.0 --- agent/pom.xml | 2 +- build-plugin/pom.xml| 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- daemon/pom.xml | 2 +- dist/pom.xml| 2 +- helper/pom.xml | 2 +- integration-tests/pom.xml | 2 +- native/pom.xml | 2 +- .../mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll | Bin 85217 -> 85217 bytes .../mvnd/nativ/Windows/x86_64/mvndnative.dll| Bin 99503 -> 99503 bytes pom.xml | 16 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index 2d0c90f..ffbb63b 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-agent diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 63eba58..84dc5da 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-build-maven-plugin diff --git a/client/pom.xml b/client/pom.xml index 76b08f8..ea1f19e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-client diff --git a/common/pom.xml b/common/pom.xml index dd0e87f..1e06a5d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-common diff --git a/daemon/pom.xml b/daemon/pom.xml index 2f4ffb3..18a4fb6 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-daemon diff --git a/dist/pom.xml b/dist/pom.xml index 68da1f3..24351f0 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-dist diff --git a/helper/pom.xml b/helper/pom.xml index 1ceb56e..413ffd8 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-helper-agent diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 50ab452..1eebebd 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-integration-tests diff --git a/native/pom.xml b/native/pom.xml index a3d33f9..90c02b5 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -20,7 +20,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-native diff --git a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll index b771ebf..cf4f0d2 100755 Binary files a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll and b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll differ diff --git a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86_64/mvndnative.dll b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86_64/mvndnative.dll index 73e9e4a..46dbf82 100755 Binary files a/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86_64/mvndnative.dll and b/native/src/main/resources/org/mvndaemon/mvnd/nativ/Windows/x86_64/mvndnative.dll differ diff --git a/pom.xml b/pom.xml index da78b27..ec6ca05 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 pom Maven Daemon - Parent @@ -214,38 +214,38 @@ org.mvndaemon.mvnd mvnd-native -0.8.1-SNAPSHOT +0.8.0 org.mvndaemon.mvnd mvnd-agent -0.8.1-SNAPSHOT +0.8.0 org.mvndaemon.mvnd mvnd-client -0.8.1-SNAPSHOT +0.8.0 org.mvndaemon.mvnd
[maven-mvnd] branch master updated: Put back sha256 computation
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new 98d71fa Put back sha256 computation
98d71fa is described below
commit 98d71fa3d748c5d6bb99553043104c230974564b
Author: Guillaume Nodet
AuthorDate: Fri Apr 29 16:23:53 2022 +0200
Put back sha256 computation
---
.github/workflows/release.yaml | 34 --
build/publish.sh | 13 -
2 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9bc56d2..d95c32b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -61,11 +61,19 @@ jobs:
- name: 'Build native distribution'
run: ./mvnw clean verify -Pnative -Dmrm=false -B -ntp -e -DskipTests
+ - name: Compute sha256 checksums
+run: |
+ for file in dist/target/mvnd-*.zip ; do
+sha256sum ${file} | cut -d ' ' -f 1 > ${file}.sha256
+ done
+
- name: 'Upload artifact'
uses: actions/upload-artifact@v2
with:
name: artifacts
- path: dist/target/mvnd-*.zip
+ path: |
+dist/target/mvnd-*.zip
+dist/target/mvnd-*.sha256
source:
name: 'Build source distributions'
@@ -90,16 +98,23 @@ jobs:
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
- - name: 'Build native distribution'
+ - name: 'Build source distribution'
run: ./mvnw clean verify -Psource-distribution -pl :mvnd -Dmrm=false
-B -ntp -e
+ - name: Compute sha256 checksums
+run: |
+ for file in target/mvnd-*.zip target/mvnd-*.tar.gz ; do
+sha256sum ${file} | cut -d ' ' -f 1 > ${file}.sha256
+ done
+
- name: 'Upload artifact'
uses: actions/upload-artifact@v2
with:
name: artifacts
path: |
-target/mvnd-*-src.zip
-target/mvnd-*-src.tar.gz
+target/mvnd-*.zip
+target/mvnd-*.tar.gz
+target/mvnd-*.sha256
release:
@@ -135,14 +150,6 @@ jobs:
run: |
echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q
-DforceStdout)" >> $GITHUB_ENV
- - name: Compute sha256 checksums
-run: |
- sha256sum artifacts/mvnd-${{ env.VERSION }}-linux-amd64.zip | cut -d
' ' -f 1 > artifacts/mvnd-${{ env.VERSION }}-linux-amd64.zip.sha256
- sha256sum artifacts/mvnd-${{ env.VERSION }}-darwin-amd64.zip | cut
-d ' ' -f 1 > artifacts/mvnd-${{ env.VERSION }}-darwin-amd64.zip.sha256
- sha256sum artifacts/mvnd-${{ env.VERSION }}-windows-amd64.zip | cut
-d ' ' -f 1 > artifacts/mvnd-${{ env.VERSION }}-windows-amd64.zip.sha256
- sha256sum artifacts/mvnd-${{ env.VERSION }}-src.zip | cut -d ' ' -f
1 > artifacts/mvnd-${{ env.VERSION }}-src.zip.sha256
- sha256sum artifacts/mvnd-${{ env.VERSION }}-src.tar.gz | cut -d ' '
-f 1 > artifacts/mvnd-${{ env.VERSION }}-src.tar.gz.sha256
-
- name: Create Release
id: create_release
uses: actions/create-release@v1
@@ -151,7 +158,7 @@ jobs:
with:
tag_name: ${{ env.VERSION }}
release_name: ${{ env.VERSION }}
- draft: false
+ draft: true
prerelease: false
- name: Deploy mvnd-src.zip
@@ -253,4 +260,3 @@ jobs:
asset_path: artifacts/mvnd-${{ env.VERSION
}}-windows-amd64.zip.sha256
asset_name: mvnd-${{ env.VERSION }}-windows-amd64.zip.sha256
asset_content_type: text/plain
-
diff --git a/build/publish.sh b/build/publish.sh
old mode 100644
new mode 100755
index 8692015..7e68606
--- a/build/publish.sh
+++ b/build/publish.sh
@@ -15,8 +15,19 @@
# limitations under the License.
#
+#
+# TODO: if multiple runs are available on the same tag, the artifactsUrl
variable will contain several urls:
+# TODO:
artifactsUrl='/repos/apache/maven-mvnd/actions/runs/2245126309/artifacts
/repos/apache/maven-mvnd/actions/runs/2245048166/artifacts
/repos/apache/maven-mvnd/actions/runs/2235462006/artifacts'
+# TODO: the script should detect and print a meaningful error instead of a
cryptic failure:
+# TODO: accepts 1 arg(s), received 3
+# TODO: Downloading artifacts from
+# TODO: accepts 1 arg(s), received 0
+#
+
+# Enable for debug execution
+# set -x
+
set -e
-set -x
export VERSION=$1
if [ "${VERSION}x" = "x" ]
[maven-release] branch migrate-plugin-off-plexus updated: Fix tests
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch migrate-plugin-off-plexus
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/migrate-plugin-off-plexus by
this push:
new c7aecdc1 Fix tests
c7aecdc1 is described below
commit c7aecdc14bc9528004e4917a1e1f2bde3d7588a1
Author: Tamas Cservenak
AuthorDate: Fri Apr 29 16:20:06 2022 +0200
Fix tests
---
maven-release-manager/pom.xml | 5
.../release/phase/AbstractInputVariablesPhase.java | 2 +-
.../release/phase/BranchInputVariablesPhase.java | 2 +-
.../shared/release/DefaultReleaseManagerTest.java | 5 +++-
.../maven/shared/release/PlexusJUnit4TestCase.java | 16 +++-
.../PropertiesReleaseDescriptorStoreTest.java | 2 +-
...tractEditModeRewritingReleasePhaseTestCase.java | 7 ++
.../AbstractRewritingReleasePhaseTestCase.java | 1 +
.../phase/BranchInputVariablesPhaseTest.java | 9 ---
.../shared/release/phase/CheckPomPhaseTest.java| 29 +++---
.../release/phase/CheckoutProjectFromScmTest.java | 16 +++-
.../phase/GenerateReleasePomsPhaseTest.java| 7 ++
.../release/phase/InputVariablesPhaseTest.java | 3 +++
.../phase/MapDevelopmentVersionPhaseIT.java| 10 +---
.../shared/release/phase/MapVersionsPhaseTest.java | 4 +--
.../phase/RewritePomsForBranchPhaseTest.java | 2 --
.../phase/RewritePomsForReleasePhaseTest.java | 4 +++
.../shared/release/phase/ScmBranchPhaseTest.java | 8 +++---
.../shared/release/phase/ScmTagPhaseTest.java | 20 +++
.../scm/DefaultScmRepositoryConfiguratorTest.java | 7 ++
.../shared/release/stubs/NamingPolicyStub.java | 2 +-
.../maven/shared/release/stubs/ScmManagerStub.java | 8 +++---
pom.xml| 6 +
23 files changed, 134 insertions(+), 41 deletions(-)
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 558e15c8..ddf31340 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -199,6 +199,11 @@
xmlunit-core
test
+
+ org.slf4j
+ slf4j-simple
+ test
+
org.eclipse.sisu
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java
index 7cd73da8..04fb12a5 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractInputVariablesPhase.java
@@ -93,7 +93,7 @@ public abstract class AbstractInputVariablesPhase
this.scmRepositoryConfigurator = requireNonNull(
scmRepositoryConfigurator );
this.namingPolicies = requireNonNull( namingPolicies );
this.branchOperation = branchOperation;
-this.defaultNamingPolicy = requireNonNull( defaultNamingPolicy );
+this.defaultNamingPolicy = defaultNamingPolicy;
}
/**
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhase.java
index 81d830e9..c0ca7f54 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhase.java
@@ -43,6 +43,6 @@ public class BranchInputVariablesPhase
public BranchInputVariablesPhase( Prompter prompter,
ScmRepositoryConfigurator scmRepositoryConfigurator,
Map namingPolicies
)
{
-super( prompter, scmRepositoryConfigurator, namingPolicies, true,
"default" );
+super( prompter, scmRepositoryConfigurator, namingPolicies, true, null
);
}
}
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
index 0e0ee142..376b8a02 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -49,7 +49,6 @@ import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmTag;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.manager.ScmManagerStub;
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.provider.ScmProviderStub;
import
[maven-antrun-plugin] branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.3.0 created (now 0fac2a5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.3.0 in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git at 0fac2a5 Bump maven-project-info-reports-plugin from 3.2.2 to 3.3.0 No new revisions were added by this update.
[maven-war-plugin] branch MWAR-453 updated (a73af6f -> bbe269e)
This is an automated email from the ASF dual-hosted git repository.
dennisl pushed a change to branch MWAR-453
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
from a73af6f [MWAR-453] Require Java 8
add bf5a235 Update plugin
add 35cec22 Merge pull request #20 from apache/update-plugin
add f3aead9 [MWAR-450] ISO-8859-1 properties files get changed into UTF-8
when filtered.
add f0ccbbf Fix suggestions from code review by @michael-o.
add 136f2df Update maven-shared-utils to version 3.3.4.
add 41f4875 Merge remote-tracking branch 'origin/update-plugin'
add 6abd29b Merge branch 'master' into master
add f8fd1a2 [MWAR-454] Upgrade Parent to 36
add e10a0e6 [MWAR-452] One page about Skinny WARs
add bbe269e Merge branch 'master' into MWAR-453
No new revisions were added by this update.
Summary of changes:
pom.xml| 107 ++--
src/it/MWAR-128/{prebuild.groovy => setup.groovy} | 0
.../{MWAR-352_custom-webXml => MWAR-450}/pom.xml | 15 ++-
.../src/main/webapp/WEB-INF/classes/log4j.xml} | 16 ++-
.../src/main/webapp}/WEB-INF/classes/my.properties | 0
.../src/main/webapp/WEB-INF/classes/myfile.txt}| 2 +-
.../src/main/webapp/WEB-INF/web.xml| 0
.../web => MWAR-450}/src/main/webapp/index.jsp | 0
.../verify.bsh | 62 +---
.../apache/maven/plugins/war/AbstractWarMojo.java | 25 -
.../war/packaging/AbstractWarPackagingTask.java| 32 +-
.../plugins/war/packaging/WarPackagingContext.java | 8 ++
src/site/apt/examples/skinny-wars.apt.vm | 112 -
src/site/apt/index.apt.vm | 2 +-
src/site/site.xml | 2 +-
15 files changed, 144 insertions(+), 239 deletions(-)
rename src/it/MWAR-128/{prebuild.groovy => setup.groovy} (100%)
copy src/it/{MWAR-352_custom-webXml => MWAR-450}/pom.xml (72%)
copy src/it/{MWAR-311/src/main/webapp/WEB-INF/web.xml =>
MWAR-450/src/main/webapp/WEB-INF/classes/log4j.xml} (59%)
copy src/it/{web-resources-filtering-delimiter/web/src/main/webresources =>
MWAR-450/src/main/webapp}/WEB-INF/classes/my.properties (100%)
copy src/it/{MWAR-167/invoker.properties =>
MWAR-450/src/main/webapp/WEB-INF/classes/myfile.txt} (94%)
copy src/it/{web-resources-filtering-delimiter/web =>
MWAR-450}/src/main/webapp/WEB-INF/web.xml (100%)
copy src/it/{web-resources-filtering-delimiter/web =>
MWAR-450}/src/main/webapp/index.jsp (100%)
mode change 100755 => 100644
copy src/it/{web-resources-filtering-delimiter => MWAR-450}/verify.bsh (69%)
delete mode 100644 src/site/apt/examples/skinny-wars.apt.vm
[maven-release] branch migrate-plugin-off-plexus created (now ab7a496f)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch migrate-plugin-off-plexus in repository https://gitbox.apache.org/repos/asf/maven-release.git at ab7a496f Migrate plugin off Plexus This branch includes the following new commits: new ab7a496f Migrate plugin off Plexus The 1 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.
[maven-mvnd] branch master updated (d2c986e -> 72cb834)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git from d2c986e Fix release notes generation add 4e5be51 [release] Release 0.8.0 new 72cb834 Next is 0.8.1-SNAPSHOT The 1 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: CHANGELOG.md| 20 +--- .../mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll | Bin 85217 -> 85217 bytes .../mvnd/nativ/Windows/x86_64/mvndnative.dll| Bin 99503 -> 99503 bytes 3 files changed, 5 insertions(+), 15 deletions(-)
[maven-mvnd] 01/01: Next is 0.8.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git commit 72cb8343d9dc1f7a9e8e707177f55f8925b73936 Author: Guillaume Nodet AuthorDate: Fri Apr 29 13:43:13 2022 +0200 Next is 0.8.1-SNAPSHOT --- agent/pom.xml | 2 +- build-plugin/pom.xml | 2 +- client/pom.xml| 2 +- common/pom.xml| 2 +- daemon/pom.xml| 2 +- dist/pom.xml | 2 +- helper/pom.xml| 2 +- integration-tests/pom.xml | 2 +- native/pom.xml| 2 +- pom.xml | 16 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index ffbb63b..2d0c90f 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-agent diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 84dc5da..63eba58 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-build-maven-plugin diff --git a/client/pom.xml b/client/pom.xml index ea1f19e..76b08f8 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-client diff --git a/common/pom.xml b/common/pom.xml index 1e06a5d..dd0e87f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-common diff --git a/daemon/pom.xml b/daemon/pom.xml index 18a4fb6..2f4ffb3 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-daemon diff --git a/dist/pom.xml b/dist/pom.xml index 24351f0..68da1f3 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-dist diff --git a/helper/pom.xml b/helper/pom.xml index 413ffd8..1ceb56e 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-helper-agent diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1eebebd..50ab452 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-integration-tests diff --git a/native/pom.xml b/native/pom.xml index 90c02b5..a3d33f9 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -20,7 +20,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-native diff --git a/pom.xml b/pom.xml index ec6ca05..da78b27 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT pom Maven Daemon - Parent @@ -214,38 +214,38 @@ org.mvndaemon.mvnd mvnd-native -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-agent -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-client -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-common -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-dist pom -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-daemon -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-helper-agent -0.8.0 +0.8.1-SNAPSHOT
[maven-mvnd] 01/01: [release] Release 0.8.0
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to tag 0.8.0 in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git commit 4e5be51e4f29e22910f1c0643a101b9114ddec9b Author: Guillaume Nodet AuthorDate: Fri Apr 29 13:43:07 2022 +0200 [release] Release 0.8.0 --- CHANGELOG.md| 20 +--- agent/pom.xml | 2 +- build-plugin/pom.xml| 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- daemon/pom.xml | 2 +- dist/pom.xml| 2 +- helper/pom.xml | 2 +- integration-tests/pom.xml | 2 +- native/pom.xml | 2 +- .../mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll | Bin 85217 -> 85217 bytes .../mvnd/nativ/Windows/x86_64/mvndnative.dll| Bin 99503 -> 99503 bytes pom.xml | 16 13 files changed, 22 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1229385..b2464ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,8 @@ # Changelog -## [Unreleased](https://github.com/apache/maven-mvnd/tree/HEAD) +## [0.8.0](https://github.com/apache/maven-mvnd/tree/0.8.0) (2022-04-29) -[Full Changelog](https://github.com/apache/maven-mvnd/compare/early-access...HEAD) - -**Closed issues:** - -- create Apache source-release distribution archive [\#543](https://github.com/apache/maven-mvnd/issues/543) -- Parallel build fails with NoSuchFileException for target/classes [\#500](https://github.com/apache/maven-mvnd/issues/500) - -**Merged pull requests:** - -- Replace `github.com/mvndaemon/mvnd` references [\#622](https://github.com/apache/maven-mvnd/pull/622) ([Stephan202](https://github.com/Stephan202)) - -## [early-access](https://github.com/apache/maven-mvnd/tree/early-access) (2022-04-26) - -[Full Changelog](https://github.com/apache/maven-mvnd/compare/0.7.1...early-access) +[Full Changelog](https://github.com/apache/maven-mvnd/compare/0.7.1...0.8.0) **Closed issues:** @@ -53,6 +40,7 @@ - mvnd maven plugin [\#546](https://github.com/apache/maven-mvnd/issues/546) - git bash show “bash: mvnd: command not found” on win 10 [\#545](https://github.com/apache/maven-mvnd/issues/545) - jdk 1.8 exception [\#544](https://github.com/apache/maven-mvnd/issues/544) +- create Apache source-release distribution archive [\#543](https://github.com/apache/maven-mvnd/issues/543) - Refactor build & release workflow [\#542](https://github.com/apache/maven-mvnd/issues/542) - Does not support the spring-boot-maven-plugin [\#537](https://github.com/apache/maven-mvnd/issues/537) - mvn clean slow on Windows - alternative implementation [\#536](https://github.com/apache/maven-mvnd/issues/536) @@ -60,10 +48,12 @@ - Investigate the setEnv logic across JDK / OS [\#528](https://github.com/apache/maven-mvnd/issues/528) - Build hang and CPU skyrocket with sisu-index:indexMojo [\#527](https://github.com/apache/maven-mvnd/issues/527) - \[discuss\]`maven.version` conflict in pom.xml & system property [\#516](https://github.com/apache/maven-mvnd/issues/516) +- Parallel build fails with NoSuchFileException for target/classes [\#500](https://github.com/apache/maven-mvnd/issues/500) - Second "clean" build in fails on Windows due to locked files [\#115](https://github.com/apache/maven-mvnd/issues/115) **Merged pull requests:** +- Replace `github.com/mvndaemon/mvnd` references [\#622](https://github.com/apache/maven-mvnd/pull/622) ([Stephan202](https://github.com/Stephan202)) - Upgrade to auto changelog 1.2 [\#621](https://github.com/apache/maven-mvnd/pull/621) ([gnodet](https://github.com/gnodet)) - Reapply Refactor build and release workflows apache\#574 [\#620](https://github.com/apache/maven-mvnd/pull/620) ([gnodet](https://github.com/gnodet)) - Fix typos in readme [\#618](https://github.com/apache/maven-mvnd/pull/618) ([Bananeweizen](https://github.com/Bananeweizen)) diff --git a/agent/pom.xml b/agent/pom.xml index 2d0c90f..ffbb63b 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-agent diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 63eba58..84dc5da 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.1-SNAPSHOT +0.8.0 mvnd-build-maven-plugin diff --git a/client/pom.xml b/client/pom.xml index 76b08f8..ea1f19e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -
[maven-mvnd] tag 0.8.0 created (now 4e5be51)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to tag 0.8.0 in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git at 4e5be51 (commit) This tag includes the following new commits: new 4e5be51 [release] Release 0.8.0 The 1 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.
[maven-mvnd] branch master updated: Fix release notes generation
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git The following commit(s) were added to refs/heads/master by this push: new d2c986e Fix release notes generation d2c986e is described below commit d2c986eb04c4c2b01cc8009eeb5d6321785ffe03 Author: Guillaume Nodet AuthorDate: Fri Apr 29 13:34:48 2022 +0200 Fix release notes generation --- build/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/release.sh b/build/release.sh index 5700679..ec9dfe8 100755 --- a/build/release.sh +++ b/build/release.sh @@ -36,7 +36,7 @@ mvn versions:set -DnewVersion=$VERSION # udpate changelog docker run -it --rm -v "$(pwd)":/usr/local/src/your-app githubchangeloggenerator/github-changelog-generator \ ---user apache --project maven-mvnd --token $GITHUB_TOKEN +--user apache --project maven-mvnd --token $GITHUB_TOKEN --future-release $VERSION --exclude-tags early-access # rebuild native libraries pushd native
[maven-mvnd] 01/01: Next is 0.8.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git commit 73b99b89b174809d53806b8f85e762caac2caf38 Author: Guillaume Nodet AuthorDate: Fri Apr 29 13:25:18 2022 +0200 Next is 0.8.1-SNAPSHOT --- agent/pom.xml | 2 +- build-plugin/pom.xml | 2 +- client/pom.xml| 2 +- common/pom.xml| 2 +- daemon/pom.xml| 2 +- dist/pom.xml | 2 +- helper/pom.xml| 2 +- integration-tests/pom.xml | 2 +- native/pom.xml| 2 +- pom.xml | 16 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index ffbb63b..2d0c90f 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-agent diff --git a/build-plugin/pom.xml b/build-plugin/pom.xml index 84dc5da..63eba58 100644 --- a/build-plugin/pom.xml +++ b/build-plugin/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-build-maven-plugin diff --git a/client/pom.xml b/client/pom.xml index ea1f19e..76b08f8 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-client diff --git a/common/pom.xml b/common/pom.xml index 1e06a5d..dd0e87f 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-common diff --git a/daemon/pom.xml b/daemon/pom.xml index 18a4fb6..2f4ffb3 100644 --- a/daemon/pom.xml +++ b/daemon/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-daemon diff --git a/dist/pom.xml b/dist/pom.xml index 24351f0..68da1f3 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-dist diff --git a/helper/pom.xml b/helper/pom.xml index 413ffd8..1ceb56e 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-helper-agent diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1eebebd..50ab452 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-integration-tests diff --git a/native/pom.xml b/native/pom.xml index 90c02b5..a3d33f9 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -20,7 +20,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT mvnd-native diff --git a/pom.xml b/pom.xml index ec6ca05..da78b27 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.mvndaemon.mvnd mvnd -0.8.0 +0.8.1-SNAPSHOT pom Maven Daemon - Parent @@ -214,38 +214,38 @@ org.mvndaemon.mvnd mvnd-native -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-agent -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-client -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-common -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-dist pom -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-daemon -0.8.0 +0.8.1-SNAPSHOT org.mvndaemon.mvnd mvnd-helper-agent -0.8.0 +0.8.1-SNAPSHOT
[maven-mvnd] branch master updated (ed54dc6 -> 73b99b8)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git from ed54dc6 Fix use of github token add d567f1d [release] Release 0.8.0 new 73b99b8 Next is 0.8.1-SNAPSHOT The 1 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: CHANGELOG.md| 15 ++- .../mvndaemon/mvnd/nativ/Windows/x86/mvndnative.dll | Bin 85217 -> 85217 bytes .../mvnd/nativ/Windows/x86_64/mvndnative.dll| Bin 99503 -> 99503 bytes 3 files changed, 14 insertions(+), 1 deletion(-)
[maven-mvnd] tag 0.8.0 created (now d567f1d)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to tag 0.8.0 in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git at d567f1d (commit) No new revisions were added by this update.
[maven-mvnd] branch master updated: Fix use of github token
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git The following commit(s) were added to refs/heads/master by this push: new ed54dc6 Fix use of github token ed54dc6 is described below commit ed54dc6fce0766f28f01fb2b76d9096dac2ad531 Author: Guillaume Nodet AuthorDate: Fri Apr 29 13:23:08 2022 +0200 Fix use of github token --- build/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/release.sh b/build/release.sh index 5201186..5700679 100755 --- a/build/release.sh +++ b/build/release.sh @@ -36,7 +36,7 @@ mvn versions:set -DnewVersion=$VERSION # udpate changelog docker run -it --rm -v "$(pwd)":/usr/local/src/your-app githubchangeloggenerator/github-changelog-generator \ ---user apache --project maven-mvnd --token GITHUB_TOKEN +--user apache --project maven-mvnd --token $GITHUB_TOKEN # rebuild native libraries pushd native
[maven-mvnd] branch master updated: Add a publish phase
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new c4d5f24 Add a publish phase
c4d5f24 is described below
commit c4d5f24fd3e6f8bc01ae676b8f14679e4635bc50
Author: Guillaume Nodet
AuthorDate: Fri Apr 29 13:18:29 2022 +0200
Add a publish phase
---
build/publish.sh | 56
build/release.sh | 32 +++-
2 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/build/publish.sh b/build/publish.sh
new file mode 100644
index 000..8692015
--- /dev/null
+++ b/build/publish.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# Copyright 2022 the original author or authors.
+#
+# Licensed 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.
+#
+
+set -e
+set -x
+export VERSION=$1
+
+if [ "${VERSION}x" = "x" ]
+then
+ echo "Specify the version: $0 [version]"
+ exit 1
+fi
+
+rm -Rf target/releases/${VERSION}
+mkdir -p target/releases/${VERSION}
+pushd target/releases
+
+runsUrl=$(echo "https://api.github.com/repos/apache/maven-mvnd/actions/runs; |
sed -e 's?https://api.github.com??g')
+artifactsUrl=$(gh api -H "Accept: application/vnd.github.v3+json" $runsUrl
--jq '.workflow_runs[] | select(.name=="Release" and
.head_branch=="'${VERSION}'") | .artifacts_url' | sed -e
's?https://api.github.com??g')
+downloadUrl=$(gh api -H "Accept: application/vnd.github.v3+json" $artifactsUrl
--jq '.artifacts[] | select(.name = "artifacts") | .archive_download_url' | sed
-e 's?https://api.github.com??g')
+echo "Downloading artifacts from $downloadUrl"
+gh api $downloadUrl > artifacts-${VERSION}.zip
+unzip artifacts-${VERSION}.zip -d ${VERSION}
+cd ${VERSION}
+
+for dist in darwin-amd64.zip linux-amd64.zip windows-amd64.zip src.zip
src.tar.gz
+do
+ FILE=mvnd-${VERSION}-${dist}
+ echo "$(cat ${FILE}.sha256) ${FILE}" | shasum -c
+ md5 -q ${FILE} > ${FILE}.md5
+ shasum -a 1 -b ${FILE} | cut -d ' ' -f 1 > ${FILE}.sha1
+ shasum -a 512 -b ${FILE} | cut -d ' ' -f 1 > ${FILE}.sha512
+ gpg --detach-sign --armor ${FILE}
+done
+
+svn co https://dist.apache.org/repos/dist/dev/maven/mvnd
+mv ${VERSION} mvnd
+cd mvnd
+svn add ${VERSION}
+svn commit -m "Release Apache Maven Daemon ${VERSION}"
+
+popd
diff --git a/build/release.sh b/build/release.sh
index 8902da7..5201186 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -17,24 +17,46 @@
set -e
-set -x
export VERSION=$1
export NEXT_VERSION=$2
+if [ "${VERSION}x" = "x" ] || [ "${NEXT_VERSION}x" = "x" ]
+then
+ echo "Specify the version: $0 [version] [next-version]"
+ exit 1
+fi
+
+# checkout
git checkout master
-git fetch upstream
-git reset --hard upstream/master
+git fetch origin
+git reset --hard origin/master
+
+# update version
mvn versions:set -DnewVersion=$VERSION
+
+# udpate changelog
docker run -it --rm -v "$(pwd)":/usr/local/src/your-app
githubchangeloggenerator/github-changelog-generator \
--user apache --project maven-mvnd --token GITHUB_TOKEN
+
+# rebuild native libraries
+pushd native
+make native-all
+popd
+
+# commit
git add -A
git commit -m "[release] Release $VERSION"
+
+# Create and push tag
git tag $VERSION
-git push upstream $VERSION
+git push origin $VERSION
# Pushing a tag will trigger the CI to build the release and publish
# the artifacts on https://github.com/apache/maven-mvnd/releases
+# update version
mvn versions:set -DnewVersion=$NEXT_VERSION
+
+# commit
git add -A
git commit -m "Next is $NEXT_VERSION"
-git push upstream master
+git push origin master
[maven-ear-plugin] branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.3.0 created (now ba3bb64)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-project-info-reports-plugin-3.3.0 in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git at ba3bb64 Bump maven-project-info-reports-plugin from 3.1.1 to 3.3.0 No new revisions were added by this update.
svn commit: r54164 - /dev/maven/mvnd/
Author: gnodet Date: Fri Apr 29 07:06:59 2022 New Revision: 54164 Log: Add mvnd directory for release candidates Added: dev/maven/mvnd/
[maven-dist-tool] branch master updated: explain rationale behind the 2 KEYS files
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git
The following commit(s) were added to refs/heads/master by this push:
new 920d28e explain rationale behind the 2 KEYS files
920d28e is described below
commit 920d28e274574d9211937626a1590e6cf11f847d
Author: Hervé Boutemy
AuthorDate: Fri Apr 29 08:41:40 2022 +0200
explain rationale behind the 2 KEYS files
---
.../java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java
b/src/main/java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java
index 8cdc29d..cf6fc3c 100644
--- a/src/main/java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java
+++ b/src/main/java/org/apache/maven/dist/tools/pgp/CheckPgpKeysReport.java
@@ -110,19 +110,23 @@ public class CheckPgpKeysReport
sink.paragraph_();
sink.list();
sink.listItem();
-sink.rawText( "official Maven PGP KEYS file from distribution area " );
+sink.rawText( "official Maven PGP KEYS file from distribution area
(PMC write only) " );
sink.link( DIST_KEYS_URL );
sink.rawText( DIST_KEYS_URL );
sink.link_();
sink.listItem_();
sink.listItem();
-sink.rawText( "intermediate one in Maven Subversion tree " );
+sink.rawText( "intermediate committer write one in Maven
Subversion tree " );
sink.link( PROJECT_KEYS_URL );
sink.rawText( PROJECT_KEYS_URL );
sink.link_();
sink.listItem_();
sink.list_();
sink.paragraph();
+sink.rawText( "Committers are supposed to write to project's KEYS then
ask PMC for sync, but sometimes PMC"
++ " members directly add in distribution area, then future sync is
not trivial any more." );
+sink.paragraph_();
+sink.paragraph();
sink.rawText( "match: " );
if ( projectKeys.equals( distKeys ) )
{
