You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/03/04 17:08:43 UTC
[maven-scm-publish-plugin] branch mvn4 updated (49a54ce -> 6cdcbae)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
discard 49a54ce Switch a few core plugins to the new api
discard 15df84d mvn4 aggregator
add d70abc9 [MSCMPUB-50] Fix typo in 'skipDeployement'
add b8354a2 add Reproducible Builds badge
add 9c77889 [SCMPUB-52] Bump maven-shared-utils from 3.2.1 to 3.3.3 (#6)
add 503f567 Bump to 3.2.0-SNAPSHOT
add b8eee36 [MSCMPUB-55] Add GH Actions setup for ci
add d8e0878 Bump junit from 4.13.1 to 4.13.2
add 973eb14 [MSCMPUB-56] vuln-fix: Temporary Directory Hijacking or Information Disclosure
add fdfffdf [MSCMPUB-53] Require Java 8
add 0873657 [MSCMPUB-54] Require Maven 3.2.5+
add b96e65d [MSCMPUB-57] Upgrade parent pom to 39
add ef21a97 [MSCMPUB-57] Reformat
add c8b0849 [MSCMPUB-57] Upgrade misc deps maven-shared-utils to 3.3.4 commons-land to 3.12.0 maven-release-manager to 3.0.0-M7 org.apache.maven.scm:* to 2.0.0-M3
add f240e7d [MSCMPUB-57] Ignore formatting commit
new 63ca42c mvn4 aggregator
new 6cdcbae Switch a few core plugins to the new api
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 (49a54ce)
\
N -- N -- N refs/heads/mvn4 (6cdcbae)
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 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../invoker.properties => .git-blame-ignore-revs | 6 +-
.../invoker.properties => .github/dependabot.yml | 18 +-
.github/pull_request_template.md | 28 +
.../release-drafter.yml | 5 +-
.../workflows/maven.yml | 14 +-
.../workflows/release-drafter.yml | 17 +-
README.md | 1 +
pom.xml | 46 +-
.../invoker.properties | 0
src/it/{publish-scm => issue-mscmpub-50}/pom.xml | 3 +-
.../setup.bsh | 0
.../java/org/apache/maven/it/ThisHasJavadoc.java | 0
.../src/site/apt/index.apt | 0
.../src/site/resources/trunk/readme.txt | 0
.../src/site/site.xml | 0
Jenkinsfile => src/it/issue-mscmpub-50/verify.bsh | 8 +-
.../invoker.properties | 0
src/it/{publish-scm => publish-scm-skip}/pom.xml | 3 +-
.../setup.bsh | 0
.../java/org/apache/maven/it/ThisHasJavadoc.java | 0
.../src/site/apt/index.apt | 0
.../src/site/resources/trunk/readme.txt | 0
.../src/site/site.xml | 0
Jenkinsfile => src/it/publish-scm-skip/verify.bsh | 8 +-
.../plugins/scmpublish/AbstractScmPublishMojo.java | 608 +++++++++------------
.../scmpublish/ScmPublishPublishScmMojo.java | 285 ++++------
26 files changed, 486 insertions(+), 564 deletions(-)
copy src/it/publish-scm-staged/invoker.properties => .git-blame-ignore-revs (91%)
copy src/it/publish-scm-staged/invoker.properties => .github/dependabot.yml (65%)
create mode 100644 .github/pull_request_template.md
copy src/it/publish-scm-staged/invoker.properties => .github/release-drafter.yml (83%)
copy src/it/publish-scm/invoker.properties => .github/workflows/maven.yml (78%)
copy src/site/resources/download.cgi => .github/workflows/release-drafter.yml (76%)
copy src/it/{publish-scm => issue-mscmpub-50}/invoker.properties (100%)
copy src/it/{publish-scm => issue-mscmpub-50}/pom.xml (96%)
copy src/it/{publish-scm-staged => issue-mscmpub-50}/setup.bsh (100%)
copy src/it/{publish-scm-staged => issue-mscmpub-50}/src/main/java/org/apache/maven/it/ThisHasJavadoc.java (100%)
copy src/it/{publish-scm-staged => issue-mscmpub-50}/src/site/apt/index.apt (100%)
copy src/it/{publish-scm-staged => issue-mscmpub-50}/src/site/resources/trunk/readme.txt (100%)
copy src/it/{publish-scm-staged => issue-mscmpub-50}/src/site/site.xml (100%)
copy Jenkinsfile => src/it/issue-mscmpub-50/verify.bsh (86%)
copy src/it/{publish-scm => publish-scm-skip}/invoker.properties (100%)
copy src/it/{publish-scm => publish-scm-skip}/pom.xml (96%)
copy src/it/{publish-scm-staged => publish-scm-skip}/setup.bsh (100%)
copy src/it/{publish-scm-staged => publish-scm-skip}/src/main/java/org/apache/maven/it/ThisHasJavadoc.java (100%)
copy src/it/{publish-scm-staged => publish-scm-skip}/src/site/apt/index.apt (100%)
copy src/it/{publish-scm-staged => publish-scm-skip}/src/site/resources/trunk/readme.txt (100%)
copy src/it/{publish-scm-staged => publish-scm-skip}/src/site/site.xml (100%)
copy Jenkinsfile => src/it/publish-scm-skip/verify.bsh (86%)
[maven-scm-publish-plugin] 01/02: mvn4 aggregator
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
commit 63ca42c2cbfac729b5ec85f25526d9cba812982b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:15:07 2022 +0100
mvn4 aggregator
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 33b006b..9c0b560 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>39</version>
+ <version>40-SNAPSHOT</version>
<relativePath />
</parent>
@@ -66,7 +66,7 @@ under the License.
<properties>
<scmVersion>2.0.0-M3</scmVersion>
- <mavenVersion>3.2.5</mavenVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
<javaVersion>8</javaVersion>
<!-- for documentation purpose -->
@@ -120,7 +120,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<!-- remove with maven-shared-utils upgrade -->
<dependency>
[maven-scm-publish-plugin] 02/02: Switch a few core plugins to the new api
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
commit 6cdcbae5dbc760ba0d6e6876841f1d67f4001d9d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Feb 24 17:00:57 2022 +0100
Switch a few core plugins to the new api
---
pom.xml | 2 +-
.../plugins/scmpublish/AbstractScmPublishMojo.java | 21 +++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9c0b560..7498d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>40-SNAPSHOT</version>
+ <version>39</version>
<relativePath />
</parent>
diff --git a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
index 4230b7e..18eef98 100644
--- a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
+++ b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
@@ -62,6 +62,7 @@ import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
import org.apache.maven.settings.crypto.SettingsDecryptionResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
+import org.apache.maven.shared.release.config.ReleaseUtils;
import org.apache.maven.shared.release.scm.ScmRepositoryConfigurator;
import org.apache.maven.shared.utils.logging.MessageUtils;
@@ -319,8 +320,8 @@ public abstract class AbstractScmPublishMojo extends AbstractMojo {
logInfo("Performing a LOCAL checkout from " + scmUrl);
}
- ReleaseDescriptorBuilder descriptorBuilder = new ReleaseDescriptorBuilder();
- descriptorBuilder.setInteractive(settings.isInteractiveMode());
+ ReleaseDescriptorBuilder releaseDescriptor = new ReleaseDescriptorBuilder();
+ releaseDescriptor.setInteractive(settings.isInteractiveMode());
if (username == null || password == null) {
for (Server server : settings.getServers()) {
@@ -346,12 +347,12 @@ public abstract class AbstractScmPublishMojo extends AbstractMojo {
}
}
- descriptorBuilder.setScmPassword(password);
- descriptorBuilder.setScmUsername(username);
+ releaseDescriptor.setScmPassword(password);
+ releaseDescriptor.setScmUsername(username);
- descriptorBuilder.setWorkingDirectory(basedir.getAbsolutePath());
- descriptorBuilder.setLocalCheckout(localCheckout);
- descriptorBuilder.setScmSourceUrl(pubScmUrl);
+ releaseDescriptor.setWorkingDirectory(basedir.getAbsolutePath());
+ releaseDescriptor.setLocalCheckout(localCheckout);
+ releaseDescriptor.setScmSourceUrl(pubScmUrl);
if (providerImplementations != null) {
for (Map.Entry<String, String> providerEntry : providerImplementations.entrySet()) {
@@ -362,12 +363,12 @@ public abstract class AbstractScmPublishMojo extends AbstractMojo {
}
}
- ReleaseDescriptor releaseDescriptor = descriptorBuilder.build();
- scmRepository = scmRepositoryConfigurator.getConfiguredRepository(releaseDescriptor, settings);
+ ReleaseDescriptor descriptor = ReleaseUtils.buildReleaseDescriptor(releaseDescriptor);
+ scmRepository = scmRepositoryConfigurator.getConfiguredRepository(descriptor, settings);
scmProvider = scmRepositoryConfigurator.getRepositoryProvider(scmRepository);
- return releaseDescriptor;
+ return descriptor;
}
protected void checkoutExisting() throws MojoExecutionException {