Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/maven-deploy-plugin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: maven-deploy-plugin-3.0.0
Choose a base ref
...
head repository: apache/maven-deploy-plugin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: maven-deploy-plugin-3.1.4
Choose a head ref
Loading
Showing with 3,668 additions and 2,938 deletions.
  1. +11 −0 .asf.yaml
  2. +21 −0 .git-blame-ignore-revs
  3. +27 −0 .github/dependabot.yml
  4. +3 −3 .github/pull_request_template.md
  5. +18 −0 .github/release-drafter.yml
  6. +4 −1 .github/workflows/maven-verify.yml
  7. +27 −0 .github/workflows/pr-automation.yml
  8. +30 −0 .github/workflows/release-drafter.yml
  9. +2 −18 README.md
  10. +61 −56 pom.xml
  11. +1 −1 src/it/3rd-party-jar-with-extras/pom.xml
  12. +3 −12 src/it/{attach-jar-checksum-release/setup.bsh → 3rd-party-jar-with-extras/setup.groovy}
  13. +1 −1 src/it/3rd-party-jar-with-extras/test.properties
  14. +6 −6 src/it/3rd-party-jar-with-extras/verify.bsh
  15. +1 −1 src/it/3rd-party-jar-without-pom/pom.xml
  16. +1 −10 src/it/{skip/setup.bsh → 3rd-party-jar-without-pom/setup.groovy}
  17. +1 −1 src/it/3rd-party-jar-without-pom/test.properties
  18. +3 −3 src/it/3rd-party-jar-without-pom/verify.bsh
  19. +17 −18 src/it/MDEPLOY-169_deploy-at-end-multithread/invoker.properties
  20. +6 −6 src/it/MDEPLOY-169_deploy-at-end-multithread/pom.xml
  21. +6 −6 src/it/MDEPLOY-170_deploy-at-end-configperproject/pom.xml
  22. +2 −2 src/it/MDEPLOY-178_deployfile-with-embedded-pom/verify.groovy
  23. +15 −2 src/it/MDEPLOY-202_deployfile-with-multiple-executions/verify.groovy
  24. +1 −1 src/it/MDEPLOY-212/pom.xml
  25. +1 −1 src/it/MDEPLOY-213/pom.xml
  26. +37 −0 src/it/MDEPLOY-224_deploy-at-end-only-modules/module1/pom.xml
  27. +38 −0 src/it/MDEPLOY-224_deploy-at-end-only-modules/module2/pom.xml
  28. +22 −37 src/it/{attach-jar-checksum-snapshot → MDEPLOY-224_deploy-at-end-only-modules}/pom.xml
  29. +29 −0 src/it/MDEPLOY-224_deploy-at-end-only-modules/verify.groovy
  30. +37 −0 src/it/MDEPLOY-225_deploy-at-end-skip-root/module1/pom.xml
  31. +38 −0 src/it/MDEPLOY-225_deploy-at-end-skip-root/module2/pom.xml
  32. +20 −35 src/it/{attach-jar-checksum-release → MDEPLOY-225_deploy-at-end-skip-root}/pom.xml
  33. +22 −0 src/it/MDEPLOY-225_deploy-at-end-skip-root/verify.groovy
  34. +5 −5 src/it/alt-deploy-repo-with-dist-mgmt-snapshot/pom.xml
  35. +20 −0 src/it/alt-deploy-repo-with-dist-mgmt-snapshot/setup.groovy
  36. +5 −5 src/it/alt-deploy-repo-with-dist-mgmt/pom.xml
  37. +20 −0 src/it/alt-deploy-repo-with-dist-mgmt/setup.groovy
  38. +5 −5 src/it/alt-deploy-repo-without-dist-mgmt/pom.xml
  39. +0 −33 src/it/alt-deploy-repo-without-dist-mgmt/setup.bsh
  40. +20 −0 src/it/alt-deploy-repo-without-dist-mgmt/setup.groovy
  41. +0 −64 src/it/attach-jar-checksum-release/verify.groovy
  42. +0 −29 src/it/attach-jar-checksum-snapshot/setup.bsh
  43. +0 −95 src/it/attach-jar-checksum-snapshot/verify.groovy
  44. +9 −6 src/it/attach-release-jar/pom.xml
  45. +0 −33 src/it/attach-release-jar/setup.bsh
  46. +20 −0 src/it/attach-release-jar/setup.groovy
  47. +1 −1 src/it/deploy-at-end-fail/module1/pom.xml
  48. +6 −6 src/it/deploy-at-end-fail/pom.xml
  49. +0 −23 src/it/deploy-at-end-pass/module1/pom.xml
  50. +39 −0 src/it/deploy-at-end-pass/module2/pom.xml
  51. +25 −0 src/it/deploy-at-end-pass/module3/pom.xml
  52. +38 −0 src/it/deploy-at-end-pass/module4/pom.xml
  53. +10 −7 src/it/deploy-at-end-pass/pom.xml
  54. +8 −2 src/it/deploy-at-end-pass/verify.groovy
  55. +2 −2 src/it/deploy-attached-sources/pom.xml
  56. +18 −0 src/it/deploy-bom/invoker.properties
  57. +67 −0 src/it/deploy-bom/pom.xml
  58. +1 −5 src/it/{deploy-default-packaging/setup.bsh → deploy-bom/setup.groovy}
  59. +30 −0 src/it/deploy-bom/verify.groovy
  60. +2 −2 src/it/deploy-default-packaging/pom.xml
  61. +17 −0 src/it/deployfile-release-skip-fail/invoker.properties
  62. +48 −0 src/it/deployfile-release-skip-fail/pom.xml
  63. +18 −0 src/it/deployfile-release-skip-fail/test.properties
  64. +6 −13 src/it/{alt-deploy-repo-with-dist-mgmt/setup.bsh → deployfile-release-skip-fail/verify.groovy}
  65. +17 −0 src/it/deployfile-release-skip/invoker.properties
  66. +48 −0 src/it/deployfile-release-skip/pom.xml
  67. +18 −0 src/it/deployfile-release-skip/test.properties
  68. +24 −0 src/it/deployfile-release-skip/verify.groovy
  69. +17 −0 src/it/deployfile-skip-fail/invoker.properties
  70. +47 −0 src/it/deployfile-skip-fail/pom.xml
  71. +18 −0 src/it/deployfile-skip-fail/test.properties
  72. +6 −13 src/it/{alt-deploy-repo-with-dist-mgmt-snapshot/setup.bsh → deployfile-skip-fail/verify.groovy}
  73. +17 −0 src/it/deployfile-skip/invoker.properties
  74. +47 −0 src/it/deployfile-skip/pom.xml
  75. +18 −0 src/it/deployfile-skip/test.properties
  76. +24 −0 src/it/deployfile-skip/verify.groovy
  77. +17 −0 src/it/deployfile-snapshot-skip-fail/invoker.properties
  78. +48 −0 src/it/deployfile-snapshot-skip-fail/pom.xml
  79. +18 −0 src/it/deployfile-snapshot-skip-fail/test.properties
  80. +28 −0 src/it/deployfile-snapshot-skip-fail/verify.groovy
  81. +17 −0 src/it/deployfile-snapshot-skip/invoker.properties
  82. +48 −0 src/it/deployfile-snapshot-skip/pom.xml
  83. +18 −0 src/it/deployfile-snapshot-skip/test.properties
  84. +24 −0 src/it/deployfile-snapshot-skip/verify.groovy
  85. +0 −33 src/it/external-release-jar/setup.bsh
  86. +1 −6 src/it/{deploy-attached-sources/setup.bsh → external-release-jar/setup.groovy}
  87. +2 −2 src/it/gav-validation/invoker.properties
  88. +0 −33 src/it/gav-validation/setup.bsh
  89. +20 −0 src/it/gav-validation/setup.groovy
  90. +2 −2 src/it/mdeploy-45-test/pom.xml
  91. +0 −33 src/it/mdeploy-45-test/setup.bsh
  92. +20 −0 src/it/mdeploy-45-test/setup.groovy
  93. +8 −8 src/it/no-main-artifact-1/pom.xml
  94. +0 −33 src/it/no-main-artifact-1/setup.bsh
  95. +20 −0 src/it/no-main-artifact-1/setup.groovy
  96. +1 −1 src/it/no-main-artifact-1/verify.groovy
  97. +8 −8 src/it/no-main-artifact-2/pom.xml
  98. +0 −33 src/it/no-main-artifact-2/setup.bsh
  99. +20 −0 src/it/no-main-artifact-2/setup.groovy
  100. +1 −1 src/it/no-main-artifact-2/verify.groovy
  101. +4 −4 src/it/no-main-artifact-snapshot/pom.xml
  102. +1 −6 src/it/non-default-pom/non-default-pom.xml
  103. +0 −33 src/it/non-default-pom/setup.bsh
  104. +20 −0 src/it/non-default-pom/setup.groovy
  105. +5 −5 src/it/offline/pom.xml
  106. +0 −33 src/it/offline/setup.bsh
  107. +20 −0 src/it/offline/setup.groovy
  108. +5 −5 src/it/release-jar/pom.xml
  109. +0 −33 src/it/release-jar/setup.bsh
  110. +20 −0 src/it/release-jar/setup.groovy
  111. +4 −9 src/it/release-pom/pom.xml
  112. +0 −33 src/it/release-pom/setup.bsh
  113. +20 −0 src/it/release-pom/setup.groovy
  114. +18 −0 src/it/setup-mock-phase-maven-plugin/invoker.properties
  115. +57 −0 src/it/setup-mock-phase-maven-plugin/pom.xml
  116. +40 −0 src/it/setup-mock-phase-maven-plugin/src/main/resources/META-INF/plexus/components.xml
  117. +5 −5 src/it/skip-release-jar/pom.xml
  118. +0 −33 src/it/skip-release-jar/setup.bsh
  119. +20 −0 src/it/skip-release-jar/setup.groovy
  120. +5 −5 src/it/skip-snapshot-jar/pom.xml
  121. +0 −33 src/it/skip-snapshot-jar/setup.bsh
  122. +20 −0 src/it/skip-snapshot-jar/setup.groovy
  123. +4 −9 src/it/skip/pom.xml
  124. +20 −0 src/it/skip/setup.groovy
  125. +5 −5 src/it/snapshot-jar/pom.xml
  126. +0 −33 src/it/snapshot-jar/setup.bsh
  127. +20 −0 src/it/snapshot-jar/setup.groovy
  128. +4 −9 src/it/snapshot-pom/pom.xml
  129. +0 −33 src/it/snapshot-pom/setup.bsh
  130. +20 −0 src/it/snapshot-pom/setup.groovy
  131. +55 −76 src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
  132. +253 −367 src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
  133. +233 −224 src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
  134. +1 −20 src/site/apt/index.apt.vm
  135. +1 −1 src/site/site.xml
  136. +33 −84 src/site/xdoc/download.xml.vm
  137. +198 −171 src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
  138. +59 −68 src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoUnitTest.java
  139. +644 −551 src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
  140. +0 −63 src/test/java/org/apache/maven/plugins/deploy/Utils.java
  141. +59 −86 src/test/java/org/apache/maven/plugins/deploy/stubs/ArtifactRepositoryStub.java
  142. +18 −28 src/test/java/org/apache/maven/plugins/deploy/stubs/ArtifactRepositoryStub2.java
  143. +11 −15 src/test/java/org/apache/maven/plugins/deploy/stubs/AttachedArtifactStub.java
  144. +39 −62 src/test/java/org/apache/maven/plugins/deploy/stubs/DeployArtifactStub.java
  145. +16 −12 ...th-extras/setup.bsh → test/java/org/apache/maven/plugins/deploy/stubs/DeployBomArtifactStub.java}
  146. +16 −12 ...thout-pom/setup.bsh → test/java/org/apache/maven/plugins/deploy/stubs/DeployPomArtifactStub.java}
  147. +15 −8 src/test/java/org/apache/maven/plugins/deploy/stubs/MavenProjectStub.java
  148. +39 −0 src/test/resources/unit/basic-deploy-bom/plugin-config.xml
  149. +28 −0 src/test/resources/unit/basic-deploy-bom/target/deploy-test-file-1.0-SNAPSHOT.pom
  150. +1 −1 src/test/resources/unit/basic-deploy-pom/plugin-config.xml
  151. +36 −0 src/test/resources/unit/deploy-file-packaging/plugin-config.xml
  152. +1 −0 src/test/resources/unit/deploy-file-packaging/target/deploy-test-file-1.0-SNAPSHOT.jar
  153. +1 −0 src/test/resources/unit/deploy-file-test/plugin-config.xml
11 changes: 11 additions & 0 deletions .asf.yaml
Original file line number Diff line number Diff line change
@@ -8,3 +8,14 @@ github:
- apache-maven
- maven-plugins
- maven-deploy-plugin
enabled_merge_buttons:
squash: true
merge: false
rebase: true
autolink_jira:
- MDEPLOY
notifications:
commits: commits@maven.apache.org
issues: issues@maven.apache.org
pullrequests: issues@maven.apache.org
jira_options: link label comment
21 changes: 21 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

# Change maven code style - parent 39
27026fb9d50f2ccf008387d562e9dc7800bfb975
27 changes: 27 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
6 changes: 3 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Following this checklist to help us incorporate your
contribution quickly and easily:

- [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MPH) filed
- [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MDEPLOY) filed
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
- [ ] Each commit in the pull request should have a meaningful subject line and body.
- [ ] Format the pull request title like `[MPH-XXX] - Fixes bug in ApproximateQuantiles`,
where you replace `MPH-XXX` with the appropriate JIRA issue. Best practice
- [ ] Format the pull request title like `[MDEPLOY-XXX] - Fixes bug in ApproximateQuantiles`,
where you replace `MDEPLOY-XXX` with the appropriate JIRA issue. Best practice
is to use the JIRA issue title in the pull request title and in the first line of the
commit message.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
18 changes: 18 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

_extends: maven-gh-actions-shared
5 changes: 4 additions & 1 deletion .github/workflows/maven-verify.yml
Original file line number Diff line number Diff line change
@@ -24,4 +24,7 @@ on:
jobs:
build:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
with:
maven4-enabled: true

27 changes: 27 additions & 0 deletions .github/workflows/pr-automation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: PR Automation
on:
pull_request_target:
types:
- closed

jobs:
pr-automation:
name: PR Automation
uses: apache/maven-gh-actions-shared/.github/workflows/pr-automation.yml@v4
30 changes: 30 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: Release Drafter
on:
push:
branches:
- maven-deploy-plugin-3.x
workflow_dispatch:

jobs:
update_release_draft:
uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4
with:
config-name: 'release-drafter-3.x.yml'

20 changes: 2 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -17,9 +17,10 @@
Contributing to [Apache Maven Deploy Plugin](https://maven.apache.org/plugins/maven-deploy-plugin/)
======================

[![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MDEPLOY.json)][jira]
[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.plugins/maven-deploy-plugin.svg?label=Maven%20Central&versionPrefix=3.)](https://search.maven.org/artifact/org.apache.maven.plugins/maven-deploy-plugin)
[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.plugins/maven-deploy-plugin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.plugins/maven-deploy-plugin)
[![Reproducible Builds](https://img.shields.io/badge/Reproducible_Builds-ok-green?labelColor=blue)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/plugins/maven-deploy-plugin/README.md)
[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-deploy-plugin/job/master.svg?)][build]
[![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-deploy-plugin/job/master.svg?)][test-results]

@@ -33,7 +34,6 @@ things.
Getting Started
---------------

+ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
+ Make sure you have a [GitHub account](https://github.com/signup/free).
+ If you're planning to implement a new feature, it makes sense to discuss your changes
on the [dev list][ml-list]] first.
@@ -59,37 +59,21 @@ There are some guidelines which will make applying PRs easier for us:
+ Create minimal diffs - disable on save actions like reformat source code or organize imports.
If you feel the source code should be reformatted, create a separate PR for this change.
+ Check for unnecessary whitespace with `git diff --check` before committing.
+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
```
[MDEPLOY-XXX] - Subject of the JIRA Ticket
Optional supplemental description.
```
+ Make sure you have added the necessary tests (JUnit/IT) for your changes.
+ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
+ Submit a pull request to the repository in the Apache organization.
+ Update your JIRA ticket and include a link to the pull request in the ticket.

If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].

Making Trivial Changes
----------------------

For changes of a trivial nature to comments and documentation, it is not always
necessary to create a new ticket in JIRA. In this case, it is appropriate to
start the first line of a commit with '(doc)' instead of a ticket number.

Additional Resources
--------------------

+ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
+ [Apache Maven Deploy JIRA project page][jira]
+ [Contributor License Agreement][cla]
+ [General GitHub documentation](https://help.github.com/)
+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
+ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
+ #Maven IRC channel on freenode.org

[jira]: https://issues.apache.org/jira/projects/MDEPLOY/
[license]: https://www.apache.org/licenses/LICENSE-2.0
[ml-list]: https://maven.apache.org/mailing-lists.html
[code-style]: https://maven.apache.org/developers/conventions/code.html
Loading