You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gi...@apache.org on 2022/04/17 08:39:33 UTC
[maven-release] branch dependabot/maven/commons-cli-commons-cli-1.5.0 updated (4f1417e2 -> 930b6719)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/commons-cli-commons-cli-1.5.0
in repository https://gitbox.apache.org/repos/asf/maven-release.git
discard 4f1417e2 Bump commons-cli from 1.2 to 1.5.0
add 0193b314 Change interface implemented by MavenArtifactVersion
add ac76d691 [MRELEASE-1075] Move CVS-based tests to Subversion or Git
add 309652bd [MRELEASE-1074] Upgrade Maven SCM to 1.12.2
add 53d6743e [MRELEASE-1076] Upgrade Plexus Utils to 3.4.1
add eca939b0 Bump version to 3.0.0-M5-SNAPSHOT
add 5c2f6fa6 [maven-release-plugin] prepare release maven-release-3.0.0-M5
add b31b7781 [maven-release-plugin] prepare for next development iteration
add 6d7e0a4c Bump mrm-maven-plugin from 1.2.0 to 1.3.0
add 13f65cec improve default phases documentation
add ed22a9fd Shared GitHub Action v2
add e8244825 fix typo
add 41ed1cc6 Bump jdom2 from 2.0.6 to 2.0.6.1
add bb6a9795 Merge pull request #96 from apache/dependabot/maven/org.jdom-jdom2-2.0.6.1
add 48094bdb s/deployment/release perform/
add 01b4f784 Fix xsd NS
add 8675beba [MRELEASE-899] release:prepare should not change the line separator but detect effective line separator from pom.xml
add 8fc43859 Remove dead profile
add 126488ac [MRELEASE-955] clarify useReleaseProfile parameter and default profile
add 8c7fd99b Add .factorypath to .gitignore
add 6158bca5 [MRELEASE-1081] Upgrade Plexus Interactivity API to 1.1
add b8cb2e02 [MRELEASE-1083] Upgrade Maven Plugin Plugin to 3.6.4
add 8477434e Remove unused commons-io
add 930b6719 Bump commons-cli from 1.2 to 1.5.0
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 (4f1417e2)
\
N -- N -- N refs/heads/dependabot/maven/commons-cli-commons-cli-1.5.0 (930b6719)
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.
No new revisions were added by this update.
Summary of changes:
.../workflows/maven-verify.yml | 18 ++--
.github/workflows/maven.yml | 43 ---------
.gitignore | 1 +
maven-release-api/pom.xml | 2 +-
.../shared/release/config/ReleaseDescriptor.java | 7 ++
.../shared/release/phase/ResourceGenerator.java | 2 +-
.../release/policy/naming/NamingPolicyRequest.java | 2 +-
.../release/versions/MavenArtifactVersion.java | 68 +------------
maven-release-manager/pom.xml | 19 +---
.../src/main/components-fragment.xml | 15 +++
.../release/config/ReleaseDescriptorBuilder.java | 18 +++-
.../release/phase/AbstractRewritePomsPhase.java | 13 ---
.../release/policies/DefaultNamingPolicy.java | 2 +-
.../shared/release/strategies/DefaultStrategy.java | 2 +-
.../shared/release/transform/ModelETLRequest.java | 15 +--
.../src/main/mdo/release-descriptor.mdo | 13 ++-
maven-release-manager/src/site/apt/index.apt.vm | 27 +++++-
.../shared/release/phase/CheckPomPhaseTest.java | 4 +-
.../release/phase/InputVariablesPhaseTest.java | 10 +-
.../phase/RewritePomsForBranchPhaseTest.java | 17 ++--
.../phase/RewritePomsForDevelopmentPhaseTest.java | 26 ++---
.../phase/RewritePomsForReleasePhaseTest.java | 19 ++--
.../scm/DefaultScmRepositoryConfiguratorTest.java | 18 ++--
.../rewrite-for-branch/basic-pom-with-cvs/pom.xml | 34 -------
.../expected-pom.xml | 12 +--
.../basic-pom-with-git-from-tag}/pom.xml | 12 +--
.../expected-pom.xml | 8 +-
.../basic-pom-with-git}/pom.xml | 5 +-
.../expected-pom.xml | 8 +-
.../pom.xml | 8 +-
.../expected-pom.xml | 13 +--
.../pom.xml | 12 +--
.../rewrite-for-release/basic-pom-with-cvs/pom.xml | 34 -------
.../expected-pom.xml | 12 +--
.../basic-pom-with-git-from-tag}/pom.xml | 12 +--
.../expected-pom.xml | 8 +-
.../pom.xml | 5 +-
maven-release-plugin/pom.xml | 38 ++------
.../maven/plugins/release/AbstractReleaseMojo.java | 2 +-
.../plugins/release/AbstractScmReleaseMojo.java | 2 +-
.../maven/plugins/release/BranchReleaseMojo.java | 6 +-
.../maven/plugins/release/PerformReleaseMojo.java | 13 +--
.../maven/plugins/release/PrepareReleaseMojo.java | 105 +++++++++++++++++++--
.../maven/plugins/release/RollbackReleaseMojo.java | 2 +-
.../maven/plugins/release/UpdateVersionsMojo.java | 2 +-
.../src/site/apt/examples/branch.apt | 2 +-
.../src/site/apt/examples/perform-release.apt.vm | 2 +-
.../src/site/apt/examples/prepare-release.apt.vm | 2 +-
.../plugins/release/PrepareReleaseMojoTest.java | 68 +++++++++++--
.../test/resources/mojos/prepare/.gitattributes | 1 +
.../maven-release-oddeven-policy/pom.xml | 2 +-
.../maven-release-semver-policy/pom.xml | 2 +-
pom.xml | 18 ++--
53 files changed, 397 insertions(+), 414 deletions(-)
copy deploySite.sh => .github/workflows/maven-verify.yml (78%)
delete mode 100644 .github/workflows/maven.yml
delete mode 100644 maven-release-manager/src/test/resources/projects/rewrite-for-branch/basic-pom-with-cvs/pom.xml
rename maven-release-manager/src/test/resources/projects/rewrite-for-branch/{basic-pom-with-cvs-from-tag => basic-pom-with-git-from-tag}/expected-pom.xml (75%)
rename maven-release-manager/src/test/resources/projects/{rewrite-for-release/basic-pom-with-cvs-from-tag => rewrite-for-branch/basic-pom-with-git-from-tag}/pom.xml (75%)
rename maven-release-manager/src/test/resources/projects/rewrite-for-branch/{basic-pom-with-cvs => basic-pom-with-git}/expected-pom.xml (79%)
copy maven-release-manager/src/test/resources/projects/{rewrite-for-release/basic-pom-with-scm-expression => rewrite-for-branch/basic-pom-with-git}/pom.xml (81%)
rename maven-release-manager/src/test/resources/projects/rewrite-for-development/{basic-pom-with-cvs-from-tag => basic-pom-with-git-from-tag}/expected-pom.xml (79%)
rename maven-release-manager/src/test/resources/projects/rewrite-for-development/{basic-pom-with-cvs-from-tag => basic-pom-with-git-from-tag}/pom.xml (78%)
rename maven-release-manager/src/test/resources/projects/rewrite-for-development/{basic-pom-with-cvs => basic-pom-with-git}/expected-pom.xml (74%)
rename maven-release-manager/src/test/resources/projects/rewrite-for-development/{basic-pom-with-cvs => basic-pom-with-git}/pom.xml (74%)
delete mode 100644 maven-release-manager/src/test/resources/projects/rewrite-for-release/basic-pom-with-cvs/pom.xml
rename maven-release-manager/src/test/resources/projects/rewrite-for-release/{basic-pom-with-cvs-from-tag => basic-pom-with-git-from-tag}/expected-pom.xml (74%)
rename maven-release-manager/src/test/resources/projects/{rewrite-for-branch/basic-pom-with-cvs-from-tag => rewrite-for-release/basic-pom-with-git-from-tag}/pom.xml (75%)
rename maven-release-manager/src/test/resources/projects/rewrite-for-release/{basic-pom-with-cvs => basic-pom-with-git}/expected-pom.xml (78%)
copy maven-release-manager/src/test/resources/projects/rewrite-for-release/{basic-pom-with-scm-expression => basic-pom-with-git}/pom.xml (81%)
create mode 100644 maven-release-plugin/src/test/resources/mojos/prepare/.gitattributes