From 0288988d6354053976c00f6d3297ce3bc747e3ab Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Thu, 28 Apr 2022 09:43:19 +0200 Subject: [PATCH] Replace `github.com/mvndaemon/mvnd` references (#622) As the repository is now hosted under `github.com/apache/maven-mvnd`. --- README.adoc | 8 ++++---- RELEASING.adoc | 2 +- build/publish-on-sdkman.sh | 4 ++-- build/release.sh | 2 +- .../main/java/org/apache/maven/cli/DaemonMavenCli.java | 2 +- .../org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java | 2 +- .../java/org/mvndaemon/mvnd/junit/MvndTestExtension.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.adoc b/README.adoc index ad9da7aa..e9c0c277 100644 --- a/README.adoc +++ b/README.adoc @@ -101,7 +101,7 @@ $ unalias mvnd === Install manually -* Download the latest ZIP suitable for your platform from https://github.com/mvndaemon/mvnd/releases +* Download the latest ZIP suitable for your platform from https://github.com/apache/maven-mvnd/releases * Unzip to a directory of your choice * Add the `bin` directory to `PATH` * Optionally, you can create `~/.m2/mvnd.properties` and set the `java.home` property in case you do not want to bother @@ -166,7 +166,7 @@ A few special properties do not follow the above mechanism: * `mvnd.coreExtensions`: internal option to specify the list of maven extension to register For a full list of available properties please see -https://github.com/mvndaemon/mvnd/blob/master/dist/src/main/distro/conf/mvnd.properties[/dist/src/main/distro/conf/mvnd.properties]. +https://github.com/apache/maven-mvnd/blob/master/dist/src/main/distro/conf/mvnd.properties[/dist/src/main/distro/conf/mvnd.properties]. == Build `mvnd` from source @@ -200,7 +200,7 @@ https://www.graalvm.org/reference-manual/native-image/#prerequisites[`native-ima [source,shell] ---- -$ git clone https://github.com/mvndaemon/mvnd.git +$ git clone https://github.com/apache/maven-mvnd.git $ cd mvnd $ mvn clean verify -Pnative ... @@ -220,4 +220,4 @@ $ cp -R dist/target/mvnd-[version] [target-dir] Then you can simply add `[target-dir]/bin` to your `PATH` and run `mvnd`. -We're happy to improve `mvnd`, so https://github.com/mvndaemon/mvnd/issues[feedback] is most welcome! +We're happy to improve `mvnd`, so https://github.com/apache/maven-mvnd/issues[feedback] is most welcome! diff --git a/RELEASING.adoc b/RELEASING.adoc index 432a38a1..af0a8fe5 100644 --- a/RELEASING.adoc +++ b/RELEASING.adoc @@ -5,7 +5,7 @@ ./build/release.sh ---- -* Re-run the https://github.com/mvndaemon/mvnd/actions?query=workflow%3A%22Mvnd+Changelog%22[Changelog update] manually. +* 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. diff --git a/build/publish-on-sdkman.sh b/build/publish-on-sdkman.sh index 5d94cd4c..fb9f4b0c 100755 --- a/build/publish-on-sdkman.sh +++ b/build/publish-on-sdkman.sh @@ -32,7 +32,7 @@ function publishRelease() { MVND_PLATFORM=$3 FILE="mvnd-${VERSION}-${MVND_PLATFORM}.zip" - URL="https://github.com/mvndaemon/mvnd/releases/download/${VERSION}/${FILE}" + URL="https://github.com/apache/maven-mvnd/releases/download/${VERSION}/${FILE}" RESPONSE="$(curl -s -X POST \ -H "Consumer-Key: ${SDKMAN_CONSUMER_KEY}" \ -H "Consumer-Token: ${SDKMAN_CONSUMER_TOKEN}" \ @@ -75,7 +75,7 @@ node -pe " } " "${RESPONSE}" -RELEASE_URL=`curl -s -i https://git.io -F url=https://github.com/mvndaemon/mvnd/releases/tag/${VERSION} | grep Location | sed -e 's/Location: //g' | tr -d '\n' | tr -d '\r'` +RELEASE_URL=`curl -s -i https://git.io -F url=https://github.com/apache/maven-mvnd/releases/tag/${VERSION} | grep Location | sed -e 's/Location: //g' | tr -d '\n' | tr -d '\r'` echo "RELEASE_URL = $RELEASE_URL" RESPONSE="$(curl -s -X POST \ diff --git a/build/release.sh b/build/release.sh index 8eefc7be..8902da73 100755 --- a/build/release.sh +++ b/build/release.sh @@ -32,7 +32,7 @@ git commit -m "[release] Release $VERSION" git tag $VERSION git push upstream $VERSION # Pushing a tag will trigger the CI to build the release and publish -# the artifacts on https://github.com/mvndaemon/mvnd/releases +# the artifacts on https://github.com/apache/maven-mvnd/releases mvn versions:set -DnewVersion=$NEXT_VERSION git add -A diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java index 304779cc..5d23c9a4 100644 --- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java +++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java @@ -382,7 +382,7 @@ public class DaemonMavenCli { MessageUtils.setColorEnabled(false); } - // Workaround for https://github.com/mvndaemon/mvnd/issues/39 + // Workaround for https://github.com/apache/maven-mvnd/issues/39 final ch.qos.logback.classic.Logger mvndLogger = (ch.qos.logback.classic.Logger) slf4jLoggerFactory .getLogger("org.mvndaemon.mvnd"); mvndLogger.setLevel(ch.qos.logback.classic.Level.toLevel(System.getProperty("mvnd.log.level"), null)); diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java index 2ff2bf85..7cfc27b6 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java @@ -113,7 +113,7 @@ import org.mvndaemon.mvnd.cache.invalidating.InvalidatingPluginRealmCache; /* * gnodet: This file is based on maven DefaultMavenPluginManager and changed in order - * to better support parallel builds. See https://github.com/mvndaemon/mvnd/issues/310 + * to better support parallel builds. See https://github.com/apache/maven-mvnd/issues/310 */ /** * Provides basic services to manage Maven plugins and their mojos. This component is kept general in its design such diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java index 758ac4a3..8c8f9103 100644 --- a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java +++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java @@ -236,7 +236,7 @@ public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback, } private static void prefillLocalRepo(final Path localMavenRepository) { - /* Workaround for https://github.com/mvndaemon/mvnd/issues/281 */ + /* Workaround for https://github.com/apache/maven-mvnd/issues/281 */ final String preinstallArtifacts = System.getProperty("preinstall.artifacts").trim(); final Path hostLocalMavenRepo = Paths.get(System.getProperty("mvnd.test.hostLocalMavenRepo"));