From 88f4e848a6d19b8cfe838dcabde7eb1b033a78b6 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 12 Jul 2024 01:24:32 +0200 Subject: [PATCH] Transform into a Maven owned plugin --- .github/dependabot.yml | 25 +- .github/release-drafter.yml | 36 +- .../workflows/{maven.yml => maven-verify.yml} | 10 +- .github/workflows/release-drafter.yml | 21 +- LICENSE | 202 ++++++++++ LICENSE.txt | 23 -- NOTICE | 5 + README.md | 49 ++- header.txt | 26 -- pom.xml | 157 ++++---- .../invoker.properties | 16 + src/it/add-resource-skip-if-missing/pom.xml | 81 ++-- .../verify.groovy | 18 + src/it/add-resource-skip/invoker.properties | 16 + src/it/add-resource-skip/pom.xml | 81 ++-- src/it/add-resource-skip/verify.groovy | 18 + .../invoker.properties | 16 + src/it/add-source-skip-if-missing/pom.xml | 75 ++-- .../add-source-skip-if-missing/verify.groovy | 18 + src/it/add-source-skip/invoker.properties | 16 + src/it/add-source-skip/pom.xml | 75 ++-- src/it/add-source-skip/verify.groovy | 18 + .../invoker.properties | 16 + .../add-test-resource-skip-if-missing/pom.xml | 81 ++-- .../verify.groovy | 18 + .../add-test-resource-skip/invoker.properties | 16 + src/it/add-test-resource-skip/pom.xml | 81 ++-- src/it/add-test-resource-skip/verify.groovy | 18 + .../invoker.properties | 16 + .../add-test-source-skip-if-missing/pom.xml | 75 ++-- .../verify.groovy | 18 + .../add-test-source-skip/invoker.properties | 16 + src/it/add-test-source-skip/pom.xml | 75 ++-- src/it/add-test-source-skip/verify.groovy | 18 + src/it/addResource/pom.xml | 25 +- .../addResource/src/my-resources/resource.txt | 16 + .../src/my-test-resources/test-resource.txt | 16 + src/it/bsh-property/invoker.properties | 16 + src/it/bsh-property/pom.xml | 34 +- src/it/mbuildhelper-34/invoker.properties | 16 + src/it/mbuildhelper-34/pom.xml | 114 +++--- src/it/mbuildhelper-34/verify.groovy | 18 + src/it/mbuildhelper-53/invoker.properties | 16 + src/it/mbuildhelper-53/pom.xml | 118 +++--- src/it/mbuildhelper-53/verify.groovy | 18 + .../parse-version-issue-91/invoker.properties | 16 + src/it/parse-version-issue-91/pom.xml | 31 +- src/it/parse-version-issue-91/verify.groovy | 19 +- src/it/parse-version/invoker.properties | 16 + src/it/parse-version/pom.xml | 37 +- src/it/parse-version/verify.groovy | 19 +- src/it/regex-invalid/invoker.properties | 16 + src/it/regex-invalid/pom.xml | 29 +- .../src/main/resources/test.properties | 16 + src/it/regex-multi/invoker.properties | 16 + src/it/regex-multi/pom.xml | 32 +- .../src/main/resources/test.properties | 16 + src/it/regex-multi/verify.bsh | 18 + .../invoker.properties | 16 + .../pom.xml | 120 +++--- .../verify.groovy | 18 + src/it/regex-nomatch/invoker.properties | 16 + src/it/regex-nomatch/pom.xml | 29 +- .../src/main/resources/test.properties | 16 + src/it/regex-valid/invoker.properties | 16 + src/it/regex-valid/pom.xml | 29 +- .../src/main/resources/test.properties | 16 + src/it/regex-valid/verify.bsh | 18 + .../invoker.properties | 16 + .../pom.xml | 27 +- .../settings-maven-central-no-snapshot.xml | 18 + .../verify.groovy | 18 + .../invoker.properties | 16 + .../released-version-existing-asset/pom.xml | 27 +- .../settings-maven-central.xml | 18 + .../verify.groovy | 18 + .../invoker.properties | 16 + .../pom.xml | 19 + .../settings-maven-oss-snapshot.xml | 18 + .../verify.groovy | 18 + src/it/released-version/invoker.properties | 16 + src/it/released-version/pom.xml | 27 +- src/it/released-version/verify.groovy | 18 + .../reserve-ports-to-file/invoker.properties | 16 + src/it/reserve-ports-to-file/pom.xml | 44 ++- src/it/reserve-ports-to-file/verify.groovy | 18 + .../invoker.properties | 16 + .../reserve-ports-with-min-root-range/pom.xml | 56 ++- .../verify.groovy | 18 + .../reserve-ports-with-min/invoker.properties | 16 + src/it/reserve-ports-with-min/pom.xml | 62 +-- src/it/reserve-ports-with-min/verify.groovy | 18 + src/it/reserve-ports-with-random/pom.xml | 40 +- .../reserve-ports-with-random/verify.groovy | 18 + .../invoker.properties | 16 + src/it/reserve-ports-with-sequence/pom.xml | 40 +- .../reserve-ports-with-sequence/verify.groovy | 18 + .../invoker.properties | 16 + src/it/reserve-ports-with-urls/names1.txt | 16 + src/it/reserve-ports-with-urls/names2.txt | 16 + src/it/reserve-ports-with-urls/pom.xml | 31 +- src/it/reserve-ports-with-urls/verify.groovy | 18 + src/it/reserve-ports/invoker.properties | 16 + src/it/reserve-ports/pom.xml | 60 +-- src/it/reserve-ports/verify.groovy | 18 + src/it/surefire/pom.xml | 61 ++- .../mojo/PassReservedPortToSureFireTest.java | 53 +-- src/it/timestamp-regex/invoker.properties | 16 + src/it/timestamp-regex/pom.xml | 29 +- .../src/main/resources/test.properties | 16 + src/it/timestamp-regex/verify.bsh | 18 + .../timestamp-timesource/invoker.properties | 16 + src/it/timestamp-timesource/module-1/pom.xml | 23 +- .../src/main/resources/test.properties | 16 + src/it/timestamp-timesource/module-2/pom.xml | 23 +- .../src/main/resources/test.properties | 16 + src/it/timestamp-timesource/pom.xml | 27 +- src/it/timestamp-timesource/verify.bsh | 18 + src/it/timestamp-valid/invoker.properties | 16 + src/it/timestamp-valid/pom.xml | 29 +- .../src/main/resources/test.properties | 16 + src/it/timestamp-valid/verify.bsh | 18 + src/it/uptodate-flatten/fixture.properties | 16 + src/it/uptodate-flatten/invoker.properties | 16 + src/it/uptodate-flatten/pom.xml | 147 +++---- src/it/uptodate-flatten/prebuild.groovy | 20 +- src/it/uptodate-flatten/verify.groovy | 18 + src/it/uptodate-glob/fixture.properties | 16 + src/it/uptodate-glob/invoker.properties | 16 + src/it/uptodate-glob/pom.xml | 151 ++++---- src/it/uptodate-glob/prebuild.groovy | 20 +- src/it/uptodate-glob/verify.groovy | 18 + src/it/uptodate-identity/fixture.properties | 16 + src/it/uptodate-identity/invoker.properties | 16 + src/it/uptodate-identity/pom.xml | 143 ++++--- src/it/uptodate-identity/prebuild.groovy | 20 +- src/it/uptodate-identity/verify.groovy | 18 + src/it/uptodate-merge/fixture.properties | 16 + src/it/uptodate-merge/invoker.properties | 16 + src/it/uptodate-merge/pom.xml | 151 ++++---- src/it/uptodate-merge/prebuild.groovy | 20 +- src/it/uptodate-merge/verify.groovy | 18 + .../fixture.properties | 16 + .../invoker.properties | 16 + src/it/uptodate-multi-negative/pom.xml | 358 +++++++++--------- .../uptodate-multi-negative/prebuild.groovy | 20 +- src/it/uptodate-multi-negative/verify.groovy | 18 + src/it/uptodate-multi/fixture.properties | 16 + src/it/uptodate-multi/invoker.properties | 16 + src/it/uptodate-multi/pom.xml | 358 +++++++++--------- src/it/uptodate-multi/prebuild.groovy | 20 +- src/it/uptodate-multi/verify.groovy | 18 + src/it/uptodate-package/fixture.properties | 16 + src/it/uptodate-package/invoker.properties | 16 + src/it/uptodate-package/pom.xml | 151 ++++---- src/it/uptodate-package/prebuild.groovy | 20 +- src/it/uptodate-package/verify.groovy | 18 + src/it/uptodate-unpackage/fixture.properties | 16 + src/it/uptodate-unpackage/invoker.properties | 16 + src/it/uptodate-unpackage/pom.xml | 151 ++++---- src/it/uptodate-unpackage/prebuild.groovy | 20 +- src/it/uptodate-unpackage/verify.groovy | 18 + .../buildhelper/AbstractAddResourceMojo.java | 22 +- .../AbstractDefinePropertyMojo.java | 20 +- .../plugins/buildhelper/AbstractMojo.java | 33 ++ .../AbstractRegexPropertyMojo.java | 20 +- .../AbstractUpToDatePropertyMojo.java | 20 +- .../plugins}/buildhelper/AddResourceMojo.java | 20 +- .../plugins}/buildhelper/AddSourceMojo.java | 20 +- .../buildhelper/AddTestResourceMojo.java | 20 +- .../buildhelper/AddTestSourceMojo.java | 20 +- .../buildhelper/AttachArtifactMojo.java | 22 +- .../buildhelper/BeanshellPropertyMojo.java | 20 +- .../plugins}/buildhelper/CpuCountMojo.java | 20 +- .../plugins}/buildhelper/HostnameMojo.java | 20 +- .../plugins}/buildhelper/LocalIpMojo.java | 20 +- .../buildhelper/ParseVersionMojo.java | 22 +- .../buildhelper/RegexPropertiesMojo.java | 20 +- .../buildhelper/RegexPropertyMojo.java | 20 +- .../buildhelper/RegexPropertySetting.java | 20 +- .../buildhelper/ReleasedVersionMojo.java | 22 +- .../buildhelper/ReserveListenerPortMojo.java | 20 +- .../buildhelper/TimestampPropertyMojo.java | 20 +- .../buildhelper/UpToDatePropertiesMojo.java | 20 +- .../buildhelper/UpToDatePropertyMojo.java | 20 +- .../buildhelper/UpToDatePropertySetting.java | 20 +- .../plugins}/buildhelper/utils/Artifact.java | 20 +- .../buildhelper/utils/ParsedVersion.java | 24 +- .../plugins}/buildhelper/utils/Resource.java | 2 +- .../mojo/buildhelper/AbstractMojo.java | 15 - .../m2e/lifecycle-mapping-metadata.xml | 18 + src/site/apt/usage.apt.vm | 34 +- .../plugins}/buildhelper/FixtureUtils.java | 25 +- .../buildhelper/ParseVersionTest.java | 20 +- .../versioning/ParsedVersionTest.java | 22 +- 195 files changed, 4972 insertions(+), 1599 deletions(-) rename .github/workflows/{maven.yml => maven-verify.yml} (80%) create mode 100644 LICENSE delete mode 100644 LICENSE.txt create mode 100644 NOTICE delete mode 100644 header.txt rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AbstractAddResourceMojo.java (81%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AbstractDefinePropertyMojo.java (70%) create mode 100644 src/main/java/org/apache/maven/plugins/buildhelper/AbstractMojo.java rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AbstractRegexPropertyMojo.java (78%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AbstractUpToDatePropertyMojo.java (86%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AddResourceMojo.java (72%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AddSourceMojo.java (79%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AddTestResourceMojo.java (72%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AddTestSourceMojo.java (79%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/AttachArtifactMojo.java (83%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/BeanshellPropertyMojo.java (83%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/CpuCountMojo.java (72%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/HostnameMojo.java (71%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/LocalIpMojo.java (71%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/ParseVersionMojo.java (91%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/RegexPropertiesMojo.java (70%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/RegexPropertyMojo.java (77%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/RegexPropertySetting.java (81%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/ReleasedVersionMojo.java (86%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/ReserveListenerPortMojo.java (94%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/TimestampPropertyMojo.java (87%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/UpToDatePropertiesMojo.java (74%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/UpToDatePropertyMojo.java (77%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/UpToDatePropertySetting.java (80%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/utils/Artifact.java (75%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/utils/ParsedVersion.java (85%) rename src/main/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/utils/Resource.java (97%) delete mode 100644 src/main/java/org/codehaus/mojo/buildhelper/AbstractMojo.java rename src/test/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/FixtureUtils.java (86%) rename src/test/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/ParseVersionTest.java (95%) rename src/test/java/org/{codehaus/mojo => apache/maven/plugins}/buildhelper/versioning/ParsedVersionTest.java (80%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b76b895..f72d474 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +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. +# version: 2 updates: - - package-ecosystem: "maven" + - package-ecosystem: maven directory: "/" schedule: - interval: "daily" + interval: daily + time: '04:00' + open-pull-requests-limit: 10 + ignore: + # Ignore Maven Core updates + - dependency-name: "org.apache.maven:*" - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 35ddb2a..6a6adb2 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,19 +1,19 @@ -_extends: .github -name-template: '$RESOLVED_VERSION' -tag-template: 'build-helper-maven-plugin-$RESOLVED_VERSION' -version-resolver: - major: - labels: - - major - minor: - labels: - - minor - - enhancement - patch: - labels: - - patch - default: patch -template: | - ## Changes +# 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. - $CHANGES \ No newline at end of file +_extends: maven-gh-actions-shared +tag-template: maven-resources-plugin-$NEXT_MINOR_VERSION diff --git a/.github/workflows/maven.yml b/.github/workflows/maven-verify.yml similarity index 80% rename from .github/workflows/maven.yml rename to .github/workflows/maven-verify.yml index bfbfdc3..56062b5 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven-verify.yml @@ -15,11 +15,17 @@ # specific language governing permissions and limitations # under the License. -name: GitHub CI +name: Verify -on: [push, pull_request] +on: + push: + pull_request: jobs: build: name: Verify uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4 + with: + ff-maven: "4.0.0-beta-3" # Maven version for fail-fast-build + maven-matrix: '[ "4.0.0-beta-3" ]' + jdk-matrix: '[ "17", "21" ]' diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 0e4bba9..1049eaa 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -1,8 +1,25 @@ +# 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: - master jobs: - update_release_draft: - uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4 + update_release_draft: + uses: apache/maven-gh-actions-shared/.github/workflows/release-drafter.yml@v4 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 4eca986..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,23 +0,0 @@ - -The MIT License - -Copyright 2006-2012 The Codehaus. -Copyright 2015-2016 The MojoHaus. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files \(the "Software"\), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..b325558 --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache Maven build Helper Plugin +Copyright 2005-2024 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md index 33190b9..66cba7e 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,31 @@ -# MojoHaus Build Helper Maven Plugin - -[![The MIT License](https://img.shields.io/github/license/mojohaus/build-helper-maven-plugin.svg?label=License)](https://opensource.org/licenses/MIT) -[![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.mojo/build-helper-maven-plugin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.mojo/build-helper-maven-plugin) -[![Build Status](https://github.com/mojohaus/build-helper-maven-plugin/workflows/GitHub%20CI/badge.svg?branch=master)](https://github.com/mojohaus/build-helper-maven-plugin/actions/workflows/maven.yml?query=branch%3Amaster) + +Contributing to [Apache Maven Build Helper Plugin](https://maven.apache.org/plugins/maven-resources-plugin/) +====================== + +[![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-build-helper-plugin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.plugins/maven-resources-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-build-helper-plugin/README.md) +[![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-build-helper-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-build-helper-plugin/job/master.svg?)][test-results] +[![Build Status](https://github.com/apache/maven-build-helper-plugin/workflows/GitHub%20CI/badge.svg?branch=master)](https://github.com/apache/maven-build-helper-plugin/actions/workflows/maven.yml?query=branch%3Amaster) This is the [build-helper-maven-plugin](http://www.mojohaus.org/build-helper-maven-plugin/) contains -serveral goals to support you in different kinds of task, like parsing version information, -add supplemental source/test folders to a Maven project or attach supplemental artifacts. - -More details can be found on the [goals overview page](http://www.mojohaus.org/build-helper-maven-plugin/). - -## Releasing - -* Make sure `gpg-agent` is running. -* Execute `mvn -B release:prepare release:perform` - -For publishing the site do the following: - -``` -cd target/checkout -mvn verify site site:stage scm-publish:publish-scm -``` +several support goals to assist in different kinds of task, like parsing version information, +adding supplemental source/test folders to a Maven project or attaching supplemental artifacts. +More details can be found on the [goals overview page](http://maven.apache.org/plugins/maven-build-helper-plugin/). diff --git a/header.txt b/header.txt deleted file mode 100644 index 965324e..0000000 --- a/header.txt +++ /dev/null @@ -1,26 +0,0 @@ -^package -^\s*$ -^/\*\s*$ -^ \* The MIT License\s*$ -^ \*\s*$ -^ \* Copyright \(c\) \d{4}(-\d{4}){0,1}, The Codehaus\s*$ -^ \*\s*$ -^ \* Permission is hereby granted, free of charge, to any person obtaining a copy of\s*$ -^ \* this software and associated documentation files \(the "Software"\), to deal in\s*$ -^ \* the Software without restriction, including without limitation the rights to\s*$ -^ \* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\s*$ -^ \* of the Software, and to permit persons to whom the Software is furnished to do\s*$ -^ \* so, subject to the following conditions:\s*$ -^ \*\s*$ -^ \* The above copyright notice and this permission notice shall be included in all\s*$ -^ \* copies or substantial portions of the Software\.\s*$ -^ \*\s*$ -^ \* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\s*$ -^ \* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\s*$ -^ \* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\s*$ -^ \* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\s*$ -^ \* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\s*$ -^ \* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\s*$ -^ \* SOFTWARE\.\s*$ -^ \*/\s*$ -^\s*$ diff --git a/pom.xml b/pom.xml index c02ab06..5ee802d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,92 +1,76 @@ + 4.0.0 - org.codehaus.mojo - mojo-parent - 84 + org.apache.maven.plugins + maven-plugins + 43 + - build-helper-maven-plugin + maven-build-helper-plugin 4.0.0-SNAPSHOT maven-plugin - Build Helper Maven Plugin + Maven Build Helper Plugin This plugin contains various small independent goals to assist with Maven build lifecycle - https://www.mojohaus.org/build-helper-maven-plugin/ + https://maven.apache.org/plugins/maven-build-helper-plugin/ 2005 - - - The MIT License - https://spdx.org/licenses/MIT.txt - repo - - - - - - Dan Tran - dantran@gmail.com - - Developer - - 5 - - - rfscholte - Robert Scholte - - Developer - - +1 - - - khmarbaise - Karl Heinz Marbaise - khmarbaise@apache.org - - Developer - - +1 - - - sjaranowski - Slawomir Jaranowski - sjaranowski@apache.org - - Developer - - Europe/Warsaw - - + + ${mavenVersion} - scm:git:https://github.com/mojohaus/build-helper-maven-plugin.git - scm:git:ssh://git@github.com/mojohaus/build-helper-maven-plugin.git + scm:git:https://gitbox.apache.org/repos/asf/maven-build-helper-plugin.git + scm:git:https://gitbox.apache.org/repos/asf/maven-build-helper-plugin.git HEAD - https://github.com/mojohaus/build-helper-maven-plugin/tree/master + https://github.com/apache/maven-build-helper-plugin/tree/${project.scm.tag} GitHub - https://github.com/mojohaus/build-helper-maven-plugin/issues/ + https://github.com/apache/maven-build-helper-plugin/issues/ - GitHub - https://github.com/mojohaus/build-helper-maven-plugin/actions + Jenkins + https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-build-helper-plugin/ + + + apache.website + scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path} + + + - ${project.build.directory}/staging/build-helper-maven-plugin - 4.0.0-beta-3 - 17 - 4.0.0-beta-1 + 4.0.0-beta-3 + 17 + + 4.0.0-beta-1 2024-05-19T19:34:17Z @@ -95,14 +79,32 @@ org.apache.maven maven-api-core ${mavenVersion} + provided + + + org.apache.maven + maven-api-di + ${mavenVersion} + provided + + + org.apache.maven + maven-api-model + ${mavenVersion} + provided + + + org.apache.maven + maven-api-settings + ${mavenVersion} + provided + + + org.apache.maven + maven-api-meta + ${mavenVersion} + provided - - - - - - - org.codehaus.plexus @@ -146,11 +148,27 @@ + + com.diffplug.spotless + spotless-maven-plugin + + + + src/**/*.java + + + + + **/pom.xml + + + + org.apache.maven.plugins - maven-checkstyle-plugin + maven-surefire-plugin - MagicNumber + true @@ -168,6 +186,7 @@ true true + prebuild verify ${project.build.directory}/local-repo src/it/settings.xml diff --git a/src/it/add-resource-skip-if-missing/invoker.properties b/src/it/add-resource-skip-if-missing/invoker.properties index ff27f70..d3c162e 100644 --- a/src/it/add-resource-skip-if-missing/invoker.properties +++ b/src/it/add-resource-skip-if-missing/invoker.properties @@ -1,2 +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. invoker.goals = -X generate-sources invoker.buildResult = success diff --git a/src/it/add-resource-skip-if-missing/pom.xml b/src/it/add-resource-skip-if-missing/pom.xml index 545cf3f..6b0554b 100644 --- a/src/it/add-resource-skip-if-missing/pom.xml +++ b/src/it/add-resource-skip-if-missing/pom.xml @@ -1,36 +1,55 @@ + + - 4.0.0 + 4.0.0 - build-helper - integration-test - 1.0-SNAPSHOT + build-helper + integration-test + 1.0-SNAPSHOT - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - integration-test - generate-sources - - add-resource - - - - - ${project.basedir}/not-existing - does-not-matter - - - true - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + integration-test + + add-resource + + generate-sources + + + + ${project.basedir}/not-existing + does-not-matter + + + true + + + + + + diff --git a/src/it/add-resource-skip-if-missing/verify.groovy b/src/it/add-resource-skip-if-missing/verify.groovy index a7fbc2f..9f2db96 100644 --- a/src/it/add-resource-skip-if-missing/verify.groovy +++ b/src/it/add-resource-skip-if-missing/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/add-resource-skip/invoker.properties b/src/it/add-resource-skip/invoker.properties index ff27f70..d3c162e 100644 --- a/src/it/add-resource-skip/invoker.properties +++ b/src/it/add-resource-skip/invoker.properties @@ -1,2 +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. invoker.goals = -X generate-sources invoker.buildResult = success diff --git a/src/it/add-resource-skip/pom.xml b/src/it/add-resource-skip/pom.xml index c7111b8..49e5169 100644 --- a/src/it/add-resource-skip/pom.xml +++ b/src/it/add-resource-skip/pom.xml @@ -1,36 +1,55 @@ + + - 4.0.0 + 4.0.0 - build-helper - integration-test - 1.0-SNAPSHOT + build-helper + integration-test + 1.0-SNAPSHOT - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - integration-test - generate-sources - - add-resource - - - - - ${project.basedir}/not-existing - does-not-matter - - - true - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + integration-test + + add-resource + + generate-sources + + + + ${project.basedir}/not-existing + does-not-matter + + + true + + + + + + diff --git a/src/it/add-resource-skip/verify.groovy b/src/it/add-resource-skip/verify.groovy index 2478f0d..fc32a9b 100644 --- a/src/it/add-resource-skip/verify.groovy +++ b/src/it/add-resource-skip/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/add-source-skip-if-missing/invoker.properties b/src/it/add-source-skip-if-missing/invoker.properties index ff27f70..d3c162e 100644 --- a/src/it/add-source-skip-if-missing/invoker.properties +++ b/src/it/add-source-skip-if-missing/invoker.properties @@ -1,2 +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. invoker.goals = -X generate-sources invoker.buildResult = success diff --git a/src/it/add-source-skip-if-missing/pom.xml b/src/it/add-source-skip-if-missing/pom.xml index 103d596..72f6507 100644 --- a/src/it/add-source-skip-if-missing/pom.xml +++ b/src/it/add-source-skip-if-missing/pom.xml @@ -1,33 +1,52 @@ + + - 4.0.0 + 4.0.0 - build-helper - integration-test - 1.0-SNAPSHOT + build-helper + integration-test + 1.0-SNAPSHOT - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - integration-test - generate-sources - - add-source - - - - ${project.basedir}/not-existing - - true - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + integration-test + + add-source + + generate-sources + + + ${project.basedir}/not-existing + + true + + + + + + diff --git a/src/it/add-source-skip-if-missing/verify.groovy b/src/it/add-source-skip-if-missing/verify.groovy index d033daa..0b5bfcb 100644 --- a/src/it/add-source-skip-if-missing/verify.groovy +++ b/src/it/add-source-skip-if-missing/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/add-source-skip/invoker.properties b/src/it/add-source-skip/invoker.properties index ff27f70..d3c162e 100644 --- a/src/it/add-source-skip/invoker.properties +++ b/src/it/add-source-skip/invoker.properties @@ -1,2 +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. invoker.goals = -X generate-sources invoker.buildResult = success diff --git a/src/it/add-source-skip/pom.xml b/src/it/add-source-skip/pom.xml index 78d8083..fe74376 100644 --- a/src/it/add-source-skip/pom.xml +++ b/src/it/add-source-skip/pom.xml @@ -1,33 +1,52 @@ + + - 4.0.0 + 4.0.0 - build-helper - integration-test - 1.0-SNAPSHOT + build-helper + integration-test + 1.0-SNAPSHOT - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - integration-test - generate-sources - - add-source - - - - ${project.basedir}/not-existing - - true - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + integration-test + + add-source + + generate-sources + + + ${project.basedir}/not-existing + + true + + + + + + diff --git a/src/it/add-source-skip/verify.groovy b/src/it/add-source-skip/verify.groovy index b8ef38b..c8fb43c 100644 --- a/src/it/add-source-skip/verify.groovy +++ b/src/it/add-source-skip/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/add-test-resource-skip-if-missing/invoker.properties b/src/it/add-test-resource-skip-if-missing/invoker.properties index ff27f70..d3c162e 100644 --- a/src/it/add-test-resource-skip-if-missing/invoker.properties +++ b/src/it/add-test-resource-skip-if-missing/invoker.properties @@ -1,2 +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. invoker.goals = -X generate-sources invoker.buildResult = success diff --git a/src/it/add-test-resource-skip-if-missing/pom.xml b/src/it/add-test-resource-skip-if-missing/pom.xml index 595de34..898630c 100644 --- a/src/it/add-test-resource-skip-if-missing/pom.xml +++ b/src/it/add-test-resource-skip-if-missing/pom.xml @@ -1,36 +1,55 @@ + + - 4.0.0 + 4.0.0 - build-helper - integration-test - 1.0-SNAPSHOT + build-helper + integration-test + 1.0-SNAPSHOT - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - integration-test - generate-sources - - add-test-resource - - - - - ${project.basedir}/not-existing - does-not-matter - - - true - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + integration-test + + add-test-resource + + generate-sources + + + + ${project.basedir}/not-existing + does-not-matter + + + true + + + + + + diff --git a/src/it/add-test-resource-skip-if-missing/verify.groovy b/src/it/add-test-resource-skip-if-missing/verify.groovy index 2c19959..058a4d2 100644 --- a/src/it/add-test-resource-skip-if-missing/verify.groovy +++ b/src/it/add-test-resource-skip-if-missing/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/add-test-resource-skip/invoker.properties b/src/it/add-test-resource-skip/invoker.properties index ff27f70..d3c162e 100644 --- a/src/it/add-test-resource-skip/invoker.properties +++ b/src/it/add-test-resource-skip/invoker.properties @@ -1,2 +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. invoker.goals = -X generate-sources invoker.buildResult = success diff --git a/src/it/add-test-resource-skip/pom.xml b/src/it/add-test-resource-skip/pom.xml index 48a17fd..55ef5f2 100644 --- a/src/it/add-test-resource-skip/pom.xml +++ b/src/it/add-test-resource-skip/pom.xml @@ -1,36 +1,55 @@ + + - 4.0.0 + 4.0.0 - build-helper - integration-test - 1.0-SNAPSHOT + build-helper + integration-test + 1.0-SNAPSHOT - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - integration-test - generate-sources - - add-test-resource - - - - - ${project.basedir}/not-existing - does-not-matter - - - true - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + integration-test + + add-test-resource + + generate-sources + + + + ${project.basedir}/not-existing + does-not-matter + + + true + + + + + + diff --git a/src/it/add-test-resource-skip/verify.groovy b/src/it/add-test-resource-skip/verify.groovy index 0bed2b5..624bc5a 100644 --- a/src/it/add-test-resource-skip/verify.groovy +++ b/src/it/add-test-resource-skip/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/add-test-source-skip-if-missing/invoker.properties b/src/it/add-test-source-skip-if-missing/invoker.properties index ff27f70..d3c162e 100644 --- a/src/it/add-test-source-skip-if-missing/invoker.properties +++ b/src/it/add-test-source-skip-if-missing/invoker.properties @@ -1,2 +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. invoker.goals = -X generate-sources invoker.buildResult = success diff --git a/src/it/add-test-source-skip-if-missing/pom.xml b/src/it/add-test-source-skip-if-missing/pom.xml index a37e06f..62ff907 100644 --- a/src/it/add-test-source-skip-if-missing/pom.xml +++ b/src/it/add-test-source-skip-if-missing/pom.xml @@ -1,33 +1,52 @@ + + - 4.0.0 + 4.0.0 - build-helper - integration-test - 1.0-SNAPSHOT + build-helper + integration-test + 1.0-SNAPSHOT - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - integration-test - generate-sources - - add-test-source - - - - ${project.basedir}/not-existing - - true - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + integration-test + + add-test-source + + generate-sources + + + ${project.basedir}/not-existing + + true + + + + + + diff --git a/src/it/add-test-source-skip-if-missing/verify.groovy b/src/it/add-test-source-skip-if-missing/verify.groovy index 5cf6e79..c61e542 100644 --- a/src/it/add-test-source-skip-if-missing/verify.groovy +++ b/src/it/add-test-source-skip-if-missing/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/add-test-source-skip/invoker.properties b/src/it/add-test-source-skip/invoker.properties index ff27f70..d3c162e 100644 --- a/src/it/add-test-source-skip/invoker.properties +++ b/src/it/add-test-source-skip/invoker.properties @@ -1,2 +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. invoker.goals = -X generate-sources invoker.buildResult = success diff --git a/src/it/add-test-source-skip/pom.xml b/src/it/add-test-source-skip/pom.xml index 26bbb2a..79ac2cc 100644 --- a/src/it/add-test-source-skip/pom.xml +++ b/src/it/add-test-source-skip/pom.xml @@ -1,33 +1,52 @@ + + - 4.0.0 + 4.0.0 - build-helper - integration-test - 1.0-SNAPSHOT + build-helper + integration-test + 1.0-SNAPSHOT - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - integration-test - generate-sources - - add-test-source - - - - ${project.basedir}/not-existing - - true - - - - - - + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + integration-test + + add-test-source + + generate-sources + + + ${project.basedir}/not-existing + + true + + + + + + diff --git a/src/it/add-test-source-skip/verify.groovy b/src/it/add-test-source-skip/verify.groovy index c0c7780..60bf45a 100644 --- a/src/it/add-test-source-skip/verify.groovy +++ b/src/it/add-test-source-skip/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/addResource/pom.xml b/src/it/addResource/pom.xml index 12768f9..9545115 100644 --- a/src/it/addResource/pom.xml +++ b/src/it/addResource/pom.xml @@ -1,11 +1,30 @@ + + 4.0.0 - + org.codehaus.mojo build-helper-maven-plugin-add-resource 1.0-SNAPSHOT - + build-helper-maven-plugin-add-resource @@ -48,5 +67,5 @@ - + diff --git a/src/it/addResource/src/my-resources/resource.txt b/src/it/addResource/src/my-resources/resource.txt index c552110..809f718 100644 --- a/src/it/addResource/src/my-resources/resource.txt +++ b/src/it/addResource/src/my-resources/resource.txt @@ -1 +1,17 @@ +# 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. This is just a text file. diff --git a/src/it/addResource/src/my-test-resources/test-resource.txt b/src/it/addResource/src/my-test-resources/test-resource.txt index c552110..809f718 100644 --- a/src/it/addResource/src/my-test-resources/test-resource.txt +++ b/src/it/addResource/src/my-test-resources/test-resource.txt @@ -1 +1,17 @@ +# 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. This is just a text file. diff --git a/src/it/bsh-property/invoker.properties b/src/it/bsh-property/invoker.properties index b5a9d80..f1de212 100644 --- a/src/it/bsh-property/invoker.properties +++ b/src/it/bsh-property/invoker.properties @@ -1 +1,17 @@ +# 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. invoker.goals = validate diff --git a/src/it/bsh-property/pom.xml b/src/it/bsh-property/pom.xml index 9927e64..1f0f91a 100644 --- a/src/it/bsh-property/pom.xml +++ b/src/it/bsh-property/pom.xml @@ -1,5 +1,23 @@ - + + + 4.0.0 org.codehaus.mojo @@ -8,9 +26,7 @@ jar bsh-property IT - - Tests that a Beanshell script can be run, access project, session and settings, and define properties. - + Tests that a Beanshell script can be run, access project, session and settings, and define properties. @@ -29,11 +45,9 @@ root local - - name = project.getModel().getName(); + name = project.getModel().getName(); root = session.getRootDirectory(); - local = settings.getLocalRepository(); - + local = settings.getLocalRepository(); @@ -41,4 +55,4 @@ - \ No newline at end of file + diff --git a/src/it/mbuildhelper-34/invoker.properties b/src/it/mbuildhelper-34/invoker.properties index f1e7f4d..3ed8e2b 100644 --- a/src/it/mbuildhelper-34/invoker.properties +++ b/src/it/mbuildhelper-34/invoker.properties @@ -1,3 +1,19 @@ +# 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. invoker.goals = validate invoker.buildResult = success invoker.maven.version = 3.1.0-alpha-1+ \ No newline at end of file diff --git a/src/it/mbuildhelper-34/pom.xml b/src/it/mbuildhelper-34/pom.xml index cac8ffe..f02e8cd 100644 --- a/src/it/mbuildhelper-34/pom.xml +++ b/src/it/mbuildhelper-34/pom.xml @@ -1,51 +1,69 @@ - - 4.0.0 + + + + 4.0.0 - \ No newline at end of file + org.codehaus.mojo + build-helper-mbuildhelper-34 + 1-SNAPSHOT + jar + + Regex valid with spaces replacement + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + regex-property + + + propname + chapi chapo bidiba + chapo + + true + + + + + + + + diff --git a/src/it/mbuildhelper-34/verify.groovy b/src/it/mbuildhelper-34/verify.groovy index 000ec7b..9b68aed 100644 --- a/src/it/mbuildhelper-34/verify.groovy +++ b/src/it/mbuildhelper-34/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/mbuildhelper-53/invoker.properties b/src/it/mbuildhelper-53/invoker.properties index 877b490..8e5a4d0 100644 --- a/src/it/mbuildhelper-53/invoker.properties +++ b/src/it/mbuildhelper-53/invoker.properties @@ -1,2 +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. invoker.goals = validate invoker.buildResult = success diff --git a/src/it/mbuildhelper-53/pom.xml b/src/it/mbuildhelper-53/pom.xml index 3b443d0..db8059a 100644 --- a/src/it/mbuildhelper-53/pom.xml +++ b/src/it/mbuildhelper-53/pom.xml @@ -1,55 +1,71 @@ - - 4.0.0 + + + + 4.0.0 - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - regex-property - - - propname - hi you - you - - false - - - - - - + org.codehaus.mojo + build-helper-mbuildhelper-53 + 1-SNAPSHOT + jar - \ No newline at end of file + Regex valid with empty replacement + Tests that an empty replacement works (previously failing as if replacement was not specified). + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + regex-property + + + propname + hi you + you + + false + + + + + + + + diff --git a/src/it/mbuildhelper-53/verify.groovy b/src/it/mbuildhelper-53/verify.groovy index d823afe..b207f2d 100644 --- a/src/it/mbuildhelper-53/verify.groovy +++ b/src/it/mbuildhelper-53/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/parse-version-issue-91/invoker.properties b/src/it/parse-version-issue-91/invoker.properties index d532f0f..d4635c5 100644 --- a/src/it/parse-version-issue-91/invoker.properties +++ b/src/it/parse-version-issue-91/invoker.properties @@ -1 +1,17 @@ +# 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. invoker.goals=${project.groupId}:${project.artifactId}:${project.version}:parse-version -DversionString=10.0.2-4545-RC1 diff --git a/src/it/parse-version-issue-91/pom.xml b/src/it/parse-version-issue-91/pom.xml index 5093ee9..f0dfa44 100644 --- a/src/it/parse-version-issue-91/pom.xml +++ b/src/it/parse-version-issue-91/pom.xml @@ -1,24 +1,41 @@ + + 4.0.0 - + org.codehaus.mojo build-helper-maven-plugin-parse-version-issue-91 1.2.3-SNAPSHOT - - Issue 91: use the property versionString which is given via command line - to parse this version and not the one which is contained in the pom.xml - + Issue 91: use the property versionString which is given via command line + to parse this version and not the one which is contained in the pom.xml @project.groupId@ @project.artifactId@ - @project.version@ + @project.version@ - + diff --git a/src/it/parse-version-issue-91/verify.groovy b/src/it/parse-version-issue-91/verify.groovy index 093e77f..5f31790 100644 --- a/src/it/parse-version-issue-91/verify.groovy +++ b/src/it/parse-version-issue-91/verify.groovy @@ -1,4 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/parse-version/invoker.properties b/src/it/parse-version/invoker.properties index cbbab8b..d522b94 100644 --- a/src/it/parse-version/invoker.properties +++ b/src/it/parse-version/invoker.properties @@ -1,3 +1,19 @@ +# 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. invoker.goals = test invoker.buildResult = success invoker.debug = true diff --git a/src/it/parse-version/pom.xml b/src/it/parse-version/pom.xml index 5a210c4..c2e7511 100644 --- a/src/it/parse-version/pom.xml +++ b/src/it/parse-version/pom.xml @@ -1,26 +1,43 @@ + + 4.0.0 - + org.codehaus.mojo build-helper-maven-plugin-reverse-port-it 20.4.00.0-SNAPSHOT - - build-helper-maven-plugin-parse-version-it - + build-helper-maven-plugin-parse-version-it + - + package - - + - + @project.groupId@ @project.artifactId@ - @project.version@ + @project.version@ @@ -33,5 +50,5 @@ - + diff --git a/src/it/parse-version/verify.groovy b/src/it/parse-version/verify.groovy index 351beed..cb8e17f 100644 --- a/src/it/parse-version/verify.groovy +++ b/src/it/parse-version/verify.groovy @@ -1,4 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/regex-invalid/invoker.properties b/src/it/regex-invalid/invoker.properties index 362cbf6..bf28366 100644 --- a/src/it/regex-invalid/invoker.properties +++ b/src/it/regex-invalid/invoker.properties @@ -1,2 +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. invoker.goals = validate invoker.buildResult = failure diff --git a/src/it/regex-invalid/pom.xml b/src/it/regex-invalid/pom.xml index a8fe641..c17fbf4 100644 --- a/src/it/regex-invalid/pom.xml +++ b/src/it/regex-invalid/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -7,25 +26,23 @@ jar Regex Invalid - - Tests that a invalid regex fails the build - + Tests that a invalid regex fails the build + false src/main/resources test.properties - false + true src/main/resources test.properties - true @@ -51,4 +68,4 @@ - \ No newline at end of file + diff --git a/src/it/regex-invalid/src/main/resources/test.properties b/src/it/regex-invalid/src/main/resources/test.properties index 9b9343d..281c3bb 100644 --- a/src/it/regex-invalid/src/main/resources/test.properties +++ b/src/it/regex-invalid/src/main/resources/test.properties @@ -1 +1,17 @@ +# 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=${build.version} \ No newline at end of file diff --git a/src/it/regex-multi/invoker.properties b/src/it/regex-multi/invoker.properties index 056ffdc..75f8432 100644 --- a/src/it/regex-multi/invoker.properties +++ b/src/it/regex-multi/invoker.properties @@ -1 +1,17 @@ +# 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. invoker.goals=compile diff --git a/src/it/regex-multi/pom.xml b/src/it/regex-multi/pom.xml index a44010f..9138752 100644 --- a/src/it/regex-multi/pom.xml +++ b/src/it/regex-multi/pom.xml @@ -1,5 +1,23 @@ - + + + 4.0.0 org.codehaus.mojo @@ -8,25 +26,23 @@ jar Regex Multi - - Tests that a valid regex gets applied - + Tests that a valid regex gets applied + false src/main/resources test.properties - false + true src/main/resources test.properties - true @@ -56,4 +72,4 @@ - \ No newline at end of file + diff --git a/src/it/regex-multi/src/main/resources/test.properties b/src/it/regex-multi/src/main/resources/test.properties index 9b9343d..281c3bb 100644 --- a/src/it/regex-multi/src/main/resources/test.properties +++ b/src/it/regex-multi/src/main/resources/test.properties @@ -1 +1,17 @@ +# 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=${build.version} \ No newline at end of file diff --git a/src/it/regex-multi/verify.bsh b/src/it/regex-multi/verify.bsh index 775fe25..e456abf 100644 --- a/src/it/regex-multi/verify.bsh +++ b/src/it/regex-multi/verify.bsh @@ -1,3 +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. + */ import java.io.*; import java.util.*; diff --git a/src/it/regex-no-match-keep-original-value-mbuildhelper-54/invoker.properties b/src/it/regex-no-match-keep-original-value-mbuildhelper-54/invoker.properties index 877b490..8e5a4d0 100644 --- a/src/it/regex-no-match-keep-original-value-mbuildhelper-54/invoker.properties +++ b/src/it/regex-no-match-keep-original-value-mbuildhelper-54/invoker.properties @@ -1,2 +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. invoker.goals = validate invoker.buildResult = success diff --git a/src/it/regex-no-match-keep-original-value-mbuildhelper-54/pom.xml b/src/it/regex-no-match-keep-original-value-mbuildhelper-54/pom.xml index 13c7c98..d23de7c 100644 --- a/src/it/regex-no-match-keep-original-value-mbuildhelper-54/pom.xml +++ b/src/it/regex-no-match-keep-original-value-mbuildhelper-54/pom.xml @@ -1,56 +1,72 @@ - - 4.0.0 + + + + 4.0.0 - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - execution1 - - regex-property - - - propname - originalvalue - nomatch - - false - - - - - - + org.codehaus.mojo + build-helper-mbuildhelper-54 + 1-SNAPSHOT + jar - \ No newline at end of file + Regex valid with empty replacement + Tests no replacement keeps original value. + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + execution1 + + regex-property + + + propname + originalvalue + nomatch + + false + + + + + + + + diff --git a/src/it/regex-no-match-keep-original-value-mbuildhelper-54/verify.groovy b/src/it/regex-no-match-keep-original-value-mbuildhelper-54/verify.groovy index f79d33f..c545963 100644 --- a/src/it/regex-no-match-keep-original-value-mbuildhelper-54/verify.groovy +++ b/src/it/regex-no-match-keep-original-value-mbuildhelper-54/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/regex-nomatch/invoker.properties b/src/it/regex-nomatch/invoker.properties index 362cbf6..bf28366 100644 --- a/src/it/regex-nomatch/invoker.properties +++ b/src/it/regex-nomatch/invoker.properties @@ -1,2 +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. invoker.goals = validate invoker.buildResult = failure diff --git a/src/it/regex-nomatch/pom.xml b/src/it/regex-nomatch/pom.xml index 9de7d03..adbfee2 100644 --- a/src/it/regex-nomatch/pom.xml +++ b/src/it/regex-nomatch/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -7,25 +26,23 @@ jar Regex NoMatch - - Tests that failOfNoMatch will fail if no match - + Tests that failOfNoMatch will fail if no match + false src/main/resources test.properties - false + true src/main/resources test.properties - true @@ -51,4 +68,4 @@ - \ No newline at end of file + diff --git a/src/it/regex-nomatch/src/main/resources/test.properties b/src/it/regex-nomatch/src/main/resources/test.properties index 9b9343d..281c3bb 100644 --- a/src/it/regex-nomatch/src/main/resources/test.properties +++ b/src/it/regex-nomatch/src/main/resources/test.properties @@ -1 +1,17 @@ +# 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=${build.version} \ No newline at end of file diff --git a/src/it/regex-valid/invoker.properties b/src/it/regex-valid/invoker.properties index 056ffdc..75f8432 100644 --- a/src/it/regex-valid/invoker.properties +++ b/src/it/regex-valid/invoker.properties @@ -1 +1,17 @@ +# 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. invoker.goals=compile diff --git a/src/it/regex-valid/pom.xml b/src/it/regex-valid/pom.xml index e98f755..9849281 100644 --- a/src/it/regex-valid/pom.xml +++ b/src/it/regex-valid/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -7,25 +26,23 @@ jar Regex Valid - - Tests that a valid regex gets applied - + Tests that a valid regex gets applied + false src/main/resources test.properties - false + true src/main/resources test.properties - true @@ -51,4 +68,4 @@ - \ No newline at end of file + diff --git a/src/it/regex-valid/src/main/resources/test.properties b/src/it/regex-valid/src/main/resources/test.properties index 9b9343d..281c3bb 100644 --- a/src/it/regex-valid/src/main/resources/test.properties +++ b/src/it/regex-valid/src/main/resources/test.properties @@ -1 +1,17 @@ +# 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=${build.version} \ No newline at end of file diff --git a/src/it/regex-valid/verify.bsh b/src/it/regex-valid/verify.bsh index 775fe25..e456abf 100644 --- a/src/it/regex-valid/verify.bsh +++ b/src/it/regex-valid/verify.bsh @@ -1,3 +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. + */ import java.io.*; import java.util.*; diff --git a/src/it/released-version-existing-asset-issue-108/invoker.properties b/src/it/released-version-existing-asset-issue-108/invoker.properties index 9d52a08..bed363c 100644 --- a/src/it/released-version-existing-asset-issue-108/invoker.properties +++ b/src/it/released-version-existing-asset-issue-108/invoker.properties @@ -1,3 +1,19 @@ +# 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. invoker.goals = test invoker.buildResult = success invoker.settingsFile = src/it/released-version-existing-asset-issue-108/settings-maven-central-no-snapshot.xml diff --git a/src/it/released-version-existing-asset-issue-108/pom.xml b/src/it/released-version-existing-asset-issue-108/pom.xml index 4242833..54e0e09 100644 --- a/src/it/released-version-existing-asset-issue-108/pom.xml +++ b/src/it/released-version-existing-asset-issue-108/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -33,27 +52,27 @@ org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ + @version.maven-antrun-plugin@ mk-target-dir - compile run + compile - + echo-released-version - test run + test myReleasedVersion.version=${myReleasedVersion.version} diff --git a/src/it/released-version-existing-asset-issue-108/settings-maven-central-no-snapshot.xml b/src/it/released-version-existing-asset-issue-108/settings-maven-central-no-snapshot.xml index 051c588..aa32ac5 100644 --- a/src/it/released-version-existing-asset-issue-108/settings-maven-central-no-snapshot.xml +++ b/src/it/released-version-existing-asset-issue-108/settings-maven-central-no-snapshot.xml @@ -1,4 +1,22 @@ + diff --git a/src/it/released-version-existing-asset-issue-108/verify.groovy b/src/it/released-version-existing-asset-issue-108/verify.groovy index c792a03..c1b25cb 100644 --- a/src/it/released-version-existing-asset-issue-108/verify.groovy +++ b/src/it/released-version-existing-asset-issue-108/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/released-version-existing-asset/invoker.properties b/src/it/released-version-existing-asset/invoker.properties index a48f607..cb85773 100644 --- a/src/it/released-version-existing-asset/invoker.properties +++ b/src/it/released-version-existing-asset/invoker.properties @@ -1,3 +1,19 @@ +# 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. invoker.goals = test invoker.buildResult = success invoker.settingsFile = src/it/released-version-existing-asset/settings-maven-central.xml diff --git a/src/it/released-version-existing-asset/pom.xml b/src/it/released-version-existing-asset/pom.xml index f7df1e4..857440f 100644 --- a/src/it/released-version-existing-asset/pom.xml +++ b/src/it/released-version-existing-asset/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -31,27 +50,27 @@ org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ + @version.maven-antrun-plugin@ mk-target-dir - compile run + compile - + echo-released-version - test run + test myReleasedVersion.version=${myReleasedVersion.version} diff --git a/src/it/released-version-existing-asset/settings-maven-central.xml b/src/it/released-version-existing-asset/settings-maven-central.xml index e112181..e1edc03 100644 --- a/src/it/released-version-existing-asset/settings-maven-central.xml +++ b/src/it/released-version-existing-asset/settings-maven-central.xml @@ -1,4 +1,22 @@ + diff --git a/src/it/released-version-existing-asset/verify.groovy b/src/it/released-version-existing-asset/verify.groovy index c792a03..c1b25cb 100644 --- a/src/it/released-version-existing-asset/verify.groovy +++ b/src/it/released-version-existing-asset/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/released-version-existing-snapshot/invoker.properties b/src/it/released-version-existing-snapshot/invoker.properties index 93b7e52..39025e9 100644 --- a/src/it/released-version-existing-snapshot/invoker.properties +++ b/src/it/released-version-existing-snapshot/invoker.properties @@ -1,2 +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. invoker.goals = validate invoker.settingsFile = src/it/released-version-existing-snapshot/settings-maven-oss-snapshot.xml diff --git a/src/it/released-version-existing-snapshot/pom.xml b/src/it/released-version-existing-snapshot/pom.xml index 501a987..ac05d3b 100644 --- a/src/it/released-version-existing-snapshot/pom.xml +++ b/src/it/released-version-existing-snapshot/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 diff --git a/src/it/released-version-existing-snapshot/settings-maven-oss-snapshot.xml b/src/it/released-version-existing-snapshot/settings-maven-oss-snapshot.xml index 6fc12b2..b44a627 100644 --- a/src/it/released-version-existing-snapshot/settings-maven-oss-snapshot.xml +++ b/src/it/released-version-existing-snapshot/settings-maven-oss-snapshot.xml @@ -1,4 +1,22 @@ + diff --git a/src/it/released-version-existing-snapshot/verify.groovy b/src/it/released-version-existing-snapshot/verify.groovy index 9e0650b..1f6a7af 100644 --- a/src/it/released-version-existing-snapshot/verify.groovy +++ b/src/it/released-version-existing-snapshot/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/released-version/invoker.properties b/src/it/released-version/invoker.properties index 2cf67a9..e70f09d 100644 --- a/src/it/released-version/invoker.properties +++ b/src/it/released-version/invoker.properties @@ -1,2 +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. invoker.goals = test invoker.buildResult = success \ No newline at end of file diff --git a/src/it/released-version/pom.xml b/src/it/released-version/pom.xml index cb80a19..551b5ba 100644 --- a/src/it/released-version/pom.xml +++ b/src/it/released-version/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -28,27 +47,27 @@ org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ + @version.maven-antrun-plugin@ mk-target-dir - compile run + compile - + echo-released-version - test run + test myReleasedVersion.version=${myReleasedVersion.version} diff --git a/src/it/released-version/verify.groovy b/src/it/released-version/verify.groovy index ddc8d26..8439b35 100644 --- a/src/it/released-version/verify.groovy +++ b/src/it/released-version/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/reserve-ports-to-file/invoker.properties b/src/it/reserve-ports-to-file/invoker.properties index 72fb620..0252f2d 100644 --- a/src/it/reserve-ports-to-file/invoker.properties +++ b/src/it/reserve-ports-to-file/invoker.properties @@ -1,2 +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. invoker.goals = initialize invoker.buildResult = success diff --git a/src/it/reserve-ports-to-file/pom.xml b/src/it/reserve-ports-to-file/pom.xml index ec91f0d..6b81d34 100644 --- a/src/it/reserve-ports-to-file/pom.xml +++ b/src/it/reserve-ports-to-file/pom.xml @@ -1,49 +1,65 @@ + + 4.0.0 - + org.codehaus.mojo build-helper-maven-plugin-reverse-port-it 1.0-SNAPSHOT - - build-helper-maven-plugin-reverse-port-it - + build-helper-maven-plugin-reverse-port-it + - + package - - + - + @project.groupId@ @project.artifactId@ - @project.version@ + @project.version@ reserve-ports-to-files - validate reserve-network-port + validate ${project.build.directory}/ports.properties port1 port2 port3 - + - - + - + 4.0.0 - + org.codehaus.mojo build-helper-maven-plugin-reverse-port-it 1.0-SNAPSHOT - - build-helper-maven-plugin-reverse-port-it - + build-helper-maven-plugin-reverse-port-it + - + package - - + - - @project.groupId@ + + @project.groupId@ @project.artifactId@ - @project.version@ + @project.version@ reserve-ports - process-test-resources reserve-network-port + process-test-resources port1 @@ -42,30 +59,30 @@ - + org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ - + @version.maven-antrun-plugin@ + mk-target-dir - compile run + compile - + echo-reserve-ports - test run + test port1=${port1} @@ -78,10 +95,9 @@ - - + - + 4.0.0 - + org.codehaus.mojo build-helper-maven-plugin-reverse-port-it 1.0-SNAPSHOT - - build-helper-maven-plugin-reverse-port-it - + build-helper-maven-plugin-reverse-port-it + - + package - - + - + @project.groupId@ @project.artifactId@ @project.version@ @@ -25,76 +42,76 @@ reserve-ports - process-test-resources reserve-network-port + process-test-resources port1 port2 port3 - 30000 + 30000 reserve-ports2 - process-test-resources reserve-network-port + process-test-resources port4 port5 port6 - 30000 + 30000 reserve-ports3 - process-test-resources reserve-network-port + process-test-resources port7 port8 port9 - 40000 + 40000 - + org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ - + @version.maven-antrun-plugin@ + mk-target-dir - compile run + compile - + echo-reserve-ports - test run + test port1=${port1} @@ -113,10 +130,9 @@ - - + - + 4.0.0 @@ -6,8 +25,7 @@ build-helper-maven-plugin-reverse-port-it 1.0-SNAPSHOT - build-helper-maven-plugin-reverse-port-it - + build-helper-maven-plugin-reverse-port-it @@ -15,45 +33,44 @@ - - @project.groupId@ + @project.groupId@ @project.artifactId@ @project.version@ reserve-ports - process-test-resources reserve-network-port + process-test-resources port1 port2 port3 - 9000 - 9005 + 9000 + 9005 true - + org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ + @version.maven-antrun-plugin@ mk-target-dir - compile run + compile @@ -63,10 +80,10 @@ echo-reserve-ports - test run + test port1=${port1} @@ -80,7 +97,6 @@ - 4.0.0 @@ -6,8 +25,7 @@ build-helper-maven-plugin-reverse-port-it 1.0-SNAPSHOT - build-helper-maven-plugin-reverse-port-it - + build-helper-maven-plugin-reverse-port-it @@ -15,45 +33,44 @@ - - @project.groupId@ + @project.groupId@ @project.artifactId@ @project.version@ reserve-ports - process-test-resources reserve-network-port + process-test-resources port1 port2 port3 - 9000 - 9005 + 9000 + 9005 false - + org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ + @version.maven-antrun-plugin@ mk-target-dir - compile run + compile @@ -63,10 +80,10 @@ echo-reserve-ports - test run + test port1=${port1} @@ -80,7 +97,6 @@ - 4.0.0 @@ -16,10 +35,10 @@ reserve-ports - process-test-resources reserve-network-port + process-test-resources file:///${project.basedir}/names2.txt @@ -28,10 +47,10 @@ reserve-ports-to-files - process-test-resources reserve-network-port + process-test-resources ${project.build.directory}/ports.properties @@ -45,27 +64,27 @@ org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ + @version.maven-antrun-plugin@ mk-target-dir - compile run + compile - + echo-reserve-ports - test run + test port1=${port1} diff --git a/src/it/reserve-ports-with-urls/verify.groovy b/src/it/reserve-ports-with-urls/verify.groovy index d24d75b..a0f9be7 100644 --- a/src/it/reserve-ports-with-urls/verify.groovy +++ b/src/it/reserve-ports-with-urls/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/reserve-ports/invoker.properties b/src/it/reserve-ports/invoker.properties index 006e071..735eaf9 100644 --- a/src/it/reserve-ports/invoker.properties +++ b/src/it/reserve-ports/invoker.properties @@ -1,2 +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. invoker.goals = test invoker.buildResult = success diff --git a/src/it/reserve-ports/pom.xml b/src/it/reserve-ports/pom.xml index e0c6c51..22a7e01 100644 --- a/src/it/reserve-ports/pom.xml +++ b/src/it/reserve-ports/pom.xml @@ -1,84 +1,101 @@ + + 4.0.0 - + org.codehaus.mojo build-helper-maven-plugin-reverse-port-it 1.0-SNAPSHOT - - build-helper-maven-plugin-reverse-port-it - + build-helper-maven-plugin-reverse-port-it + - + package - - + - + @project.groupId@ @project.artifactId@ - @project.version@ + @project.version@ reserve-ports - process-test-resources reserve-network-port + process-test-resources port1 port2 port3 - + reserve-ports-to-files - process-test-resources reserve-network-port + process-test-resources ${project.build.directory}/ports.properties port3 port4 port5 - + - + org.apache.maven.plugins maven-antrun-plugin - @maven-antrun-plugin.version@ - + @version.maven-antrun-plugin@ + mk-target-dir - compile run + compile - + echo-reserve-ports - test run + test port1=${port1} @@ -91,10 +108,9 @@ - - + - + 4.0.0 - + org.codehaus.mojo test-reserve-port-with-surefire 1.0-SNAPSHOT - + test-reserve-port-with-surefire + + + + junit @@ -16,17 +43,17 @@ test - + - + package - + org.apache.maven.plugins maven-compiler-plugin - @maven-compiler-plugin.version@ + @version.maven-compiler-plugin@ 1.8 1.8 @@ -42,30 +69,30 @@ reserve-ports - process-test-resources reserve-network-port + process-test-resources port1 port2 port3 - + - + - maven-surefire-plugin + maven-surefire-plugin @maven-surefire-plugin.version@ port1 ${port1} - + ${port1} @@ -74,15 +101,7 @@ - + - - - - - + diff --git a/src/it/surefire/src/test/java/org/codehaus/mojo/PassReservedPortToSureFireTest.java b/src/it/surefire/src/test/java/org/codehaus/mojo/PassReservedPortToSureFireTest.java index 116f971..20a2c6c 100644 --- a/src/it/surefire/src/test/java/org/codehaus/mojo/PassReservedPortToSureFireTest.java +++ b/src/it/surefire/src/test/java/org/codehaus/mojo/PassReservedPortToSureFireTest.java @@ -1,34 +1,43 @@ +/* + * 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. + */ package org.codehaus.mojo; import java.io.File; import junit.framework.TestCase; -public class PassReservedPortToSureFireTest - extends TestCase -{ - public void testCheckSystemProperties() - throws Exception - { - String port = System.getProperty( "port1" ); - Integer.parseInt( port ); +public class PassReservedPortToSureFireTest extends TestCase { + public void testCheckSystemProperties() throws Exception { + String port = System.getProperty("port1"); + Integer.parseInt(port); } - public void testCheckEnvironment() - throws Exception - { - String port = System.getenv( "port1" ); - Integer.parseInt( port ); + public void testCheckEnvironment() throws Exception { + String port = System.getenv("port1"); + Integer.parseInt(port); } - public void testCheckEnvironmentUsingMavenProject() - throws Exception - { - String env = System.getenv( "targetDir" ); - - String expectEnv = new File( System.getProperty( "basedir", "." ), "target" ).getAbsolutePath(); - - assertEquals( expectEnv, env ); - } + public void testCheckEnvironmentUsingMavenProject() throws Exception { + String env = System.getenv("targetDir"); + + String expectEnv = new File(System.getProperty("basedir", "."), "target").getAbsolutePath(); + assertEquals(expectEnv, env); + } } diff --git a/src/it/timestamp-regex/invoker.properties b/src/it/timestamp-regex/invoker.properties index 056ffdc..75f8432 100644 --- a/src/it/timestamp-regex/invoker.properties +++ b/src/it/timestamp-regex/invoker.properties @@ -1 +1,17 @@ +# 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. invoker.goals=compile diff --git a/src/it/timestamp-regex/pom.xml b/src/it/timestamp-regex/pom.xml index a33a45d..a60f99c 100644 --- a/src/it/timestamp-regex/pom.xml +++ b/src/it/timestamp-regex/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -7,25 +26,23 @@ jar Timestamp Jenkins - - Tests that a jenkins style timestamp can be set - + Tests that a jenkins style timestamp can be set + false src/main/resources test.properties - false + true src/main/resources test.properties - true @@ -63,4 +80,4 @@ - \ No newline at end of file + diff --git a/src/it/timestamp-regex/src/main/resources/test.properties b/src/it/timestamp-regex/src/main/resources/test.properties index 9b9343d..281c3bb 100644 --- a/src/it/timestamp-regex/src/main/resources/test.properties +++ b/src/it/timestamp-regex/src/main/resources/test.properties @@ -1 +1,17 @@ +# 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=${build.version} \ No newline at end of file diff --git a/src/it/timestamp-regex/verify.bsh b/src/it/timestamp-regex/verify.bsh index 2909129..897a169 100644 --- a/src/it/timestamp-regex/verify.bsh +++ b/src/it/timestamp-regex/verify.bsh @@ -1,3 +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. + */ import java.io.*; import java.util.*; import java.util.regex.*; diff --git a/src/it/timestamp-timesource/invoker.properties b/src/it/timestamp-timesource/invoker.properties index 056ffdc..75f8432 100644 --- a/src/it/timestamp-timesource/invoker.properties +++ b/src/it/timestamp-timesource/invoker.properties @@ -1 +1,17 @@ +# 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. invoker.goals=compile diff --git a/src/it/timestamp-timesource/module-1/pom.xml b/src/it/timestamp-timesource/module-1/pom.xml index 2ba8de3..b8d706a 100644 --- a/src/it/timestamp-timesource/module-1/pom.xml +++ b/src/it/timestamp-timesource/module-1/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -15,18 +34,18 @@ + false src/main/resources test.properties - false + true src/main/resources test.properties - true diff --git a/src/it/timestamp-timesource/module-1/src/main/resources/test.properties b/src/it/timestamp-timesource/module-1/src/main/resources/test.properties index cfac296..8b93983 100644 --- a/src/it/timestamp-timesource/module-1/src/main/resources/test.properties +++ b/src/it/timestamp-timesource/module-1/src/main/resources/test.properties @@ -1,2 +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. module.version=${module.build.timestamp} session.version=${session.build.timestamp} diff --git a/src/it/timestamp-timesource/module-2/pom.xml b/src/it/timestamp-timesource/module-2/pom.xml index 69765c3..4d392c0 100644 --- a/src/it/timestamp-timesource/module-2/pom.xml +++ b/src/it/timestamp-timesource/module-2/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -15,18 +34,18 @@ + false src/main/resources test.properties - false + true src/main/resources test.properties - true diff --git a/src/it/timestamp-timesource/module-2/src/main/resources/test.properties b/src/it/timestamp-timesource/module-2/src/main/resources/test.properties index cfac296..8b93983 100644 --- a/src/it/timestamp-timesource/module-2/src/main/resources/test.properties +++ b/src/it/timestamp-timesource/module-2/src/main/resources/test.properties @@ -1,2 +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. module.version=${module.build.timestamp} session.version=${session.build.timestamp} diff --git a/src/it/timestamp-timesource/pom.xml b/src/it/timestamp-timesource/pom.xml index 31582db..4f12455 100644 --- a/src/it/timestamp-timesource/pom.xml +++ b/src/it/timestamp-timesource/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -7,9 +26,7 @@ pom Timestamp TimeSource - - Tests that a fixed timestamp gets generated - + Tests that a fixed timestamp gets generated module-1 @@ -29,10 +46,10 @@ module-timestamp-property - validate timestamp-property + validate module.build.timestamp ${maven.build.timestamp.format} @@ -43,10 +60,10 @@ session-timestamp-property - validate timestamp-property + validate session.build.timestamp ${maven.build.timestamp.format} diff --git a/src/it/timestamp-timesource/verify.bsh b/src/it/timestamp-timesource/verify.bsh index e1c90f7..accc81c 100644 --- a/src/it/timestamp-timesource/verify.bsh +++ b/src/it/timestamp-timesource/verify.bsh @@ -1,3 +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. + */ import java.io.*; import java.util.*; diff --git a/src/it/timestamp-valid/invoker.properties b/src/it/timestamp-valid/invoker.properties index 056ffdc..75f8432 100644 --- a/src/it/timestamp-valid/invoker.properties +++ b/src/it/timestamp-valid/invoker.properties @@ -1 +1,17 @@ +# 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. invoker.goals=compile diff --git a/src/it/timestamp-valid/pom.xml b/src/it/timestamp-valid/pom.xml index 347f6ab..769573d 100644 --- a/src/it/timestamp-valid/pom.xml +++ b/src/it/timestamp-valid/pom.xml @@ -1,3 +1,22 @@ + + 4.0.0 @@ -7,25 +26,23 @@ jar Timestamp Valid - - Tests that a valid timestamp gets generated - + Tests that a valid timestamp gets generated + false src/main/resources test.properties - false + true src/main/resources test.properties - true @@ -48,4 +65,4 @@ - \ No newline at end of file + diff --git a/src/it/timestamp-valid/src/main/resources/test.properties b/src/it/timestamp-valid/src/main/resources/test.properties index 4d94da4..94ba324 100644 --- a/src/it/timestamp-valid/src/main/resources/test.properties +++ b/src/it/timestamp-valid/src/main/resources/test.properties @@ -1 +1,17 @@ +# 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=${timestamp} \ No newline at end of file diff --git a/src/it/timestamp-valid/verify.bsh b/src/it/timestamp-valid/verify.bsh index 5119bdb..0532aed 100644 --- a/src/it/timestamp-valid/verify.bsh +++ b/src/it/timestamp-valid/verify.bsh @@ -1,3 +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. + */ import java.io.*; import java.util.*; diff --git a/src/it/uptodate-flatten/fixture.properties b/src/it/uptodate-flatten/fixture.properties index 4e096a8..5fe2fed 100644 --- a/src/it/uptodate-flatten/fixture.properties +++ b/src/it/uptodate-flatten/fixture.properties @@ -1,3 +1,19 @@ +# 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. src/main/resources/source/dirA/fileAA.s = 1 src/main/resources/source/dirA/fileAB.s = 2 src/main/resources/source/dirA/fileAX.s = 3 diff --git a/src/it/uptodate-flatten/invoker.properties b/src/it/uptodate-flatten/invoker.properties index 209ce94..7fb7c31 100644 --- a/src/it/uptodate-flatten/invoker.properties +++ b/src/it/uptodate-flatten/invoker.properties @@ -1,2 +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. invoker.goals = validate #invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/src/it/uptodate-flatten/pom.xml b/src/it/uptodate-flatten/pom.xml index f833ce6..52044cd 100644 --- a/src/it/uptodate-flatten/pom.xml +++ b/src/it/uptodate-flatten/pom.xml @@ -1,64 +1,83 @@ - - 4.0.0 - - org.codehaus.mojo - build-helper-maven-plugin-uptodate-flatten-it - 1-SNAPSHOT - jar - - UpToDate Flatten - Tests that uptodate-property with flatten mapping works - - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - uptodate-property - - - propname-flatten - uptodate - outofdate - - src/main/resources/source - src/main/resources/target - - dir*/** - - - **/*X* - **/*Y/** - - - flatten - - - - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.codehaus.mojo + build-helper-maven-plugin-uptodate-flatten-it + 1-SNAPSHOT + jar + + UpToDate Flatten + Tests that uptodate-property with flatten mapping works + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + uptodate-property + + + propname-flatten + uptodate + outofdate + + src/main/resources/source + src/main/resources/target + + dir*/** + + + **/*X* + **/*Y/** + + + flatten + + + + + + + + + + diff --git a/src/it/uptodate-flatten/prebuild.groovy b/src/it/uptodate-flatten/prebuild.groovy index a684713..93a04a1 100644 --- a/src/it/uptodate-flatten/prebuild.groovy +++ b/src/it/uptodate-flatten/prebuild.groovy @@ -1 +1,19 @@ -org.codehaus.mojo.buildhelper.FixtureUtils.createResources( "target/it/uptodate-flatten" ) \ No newline at end of file +/* + * 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. + */ +org.apache.maven.plugins.buildhelper.FixtureUtils.createResources( "target/it/uptodate-flatten" ) \ No newline at end of file diff --git a/src/it/uptodate-flatten/verify.groovy b/src/it/uptodate-flatten/verify.groovy index 4b93231..ea42b31 100644 --- a/src/it/uptodate-flatten/verify.groovy +++ b/src/it/uptodate-flatten/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/uptodate-glob/fixture.properties b/src/it/uptodate-glob/fixture.properties index c2ae175..400333d 100644 --- a/src/it/uptodate-glob/fixture.properties +++ b/src/it/uptodate-glob/fixture.properties @@ -1,3 +1,19 @@ +# 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. src/main/resources/source/dirA/fileAA.s = 1 src/main/resources/source/dirA/fileAB.s = 2 src/main/resources/source/dirA/fileAX.s = 3 diff --git a/src/it/uptodate-glob/invoker.properties b/src/it/uptodate-glob/invoker.properties index 209ce94..7fb7c31 100644 --- a/src/it/uptodate-glob/invoker.properties +++ b/src/it/uptodate-glob/invoker.properties @@ -1,2 +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. invoker.goals = validate #invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/src/it/uptodate-glob/pom.xml b/src/it/uptodate-glob/pom.xml index 904ca85..9adc12f 100644 --- a/src/it/uptodate-glob/pom.xml +++ b/src/it/uptodate-glob/pom.xml @@ -1,66 +1,85 @@ - - 4.0.0 - - org.codehaus.mojo - build-helper-maven-plugin-uptodate-glob-it - 1-SNAPSHOT - jar - - UpToDate Glob - Tests that uptodate-property with glob mapping works - - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - uptodate-property - - - propname-glob - uptodate - outofdate - - src/main/resources/source - src/main/resources/target - - dir*/** - - - **/*X* - **/*Y/** - - - glob - *.s - *.t - - - - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.codehaus.mojo + build-helper-maven-plugin-uptodate-glob-it + 1-SNAPSHOT + jar + + UpToDate Glob + Tests that uptodate-property with glob mapping works + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + uptodate-property + + + propname-glob + uptodate + outofdate + + src/main/resources/source + src/main/resources/target + + dir*/** + + + **/*X* + **/*Y/** + + + glob + *.s + *.t + + + + + + + + + + diff --git a/src/it/uptodate-glob/prebuild.groovy b/src/it/uptodate-glob/prebuild.groovy index 850a2af..b1c0805 100644 --- a/src/it/uptodate-glob/prebuild.groovy +++ b/src/it/uptodate-glob/prebuild.groovy @@ -1 +1,19 @@ -org.codehaus.mojo.buildhelper.FixtureUtils.createResources( "target/it/uptodate-glob" ) \ No newline at end of file +/* + * 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. + */ +org.apache.maven.plugins.buildhelper.FixtureUtils.createResources( "target/it/uptodate-glob" ) \ No newline at end of file diff --git a/src/it/uptodate-glob/verify.groovy b/src/it/uptodate-glob/verify.groovy index 26c1b13..dfa5ae5 100644 --- a/src/it/uptodate-glob/verify.groovy +++ b/src/it/uptodate-glob/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/uptodate-identity/fixture.properties b/src/it/uptodate-identity/fixture.properties index 0b9583f..832ee32 100644 --- a/src/it/uptodate-identity/fixture.properties +++ b/src/it/uptodate-identity/fixture.properties @@ -1,3 +1,19 @@ +# 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. src/main/resources/source/dirA/fileAA.s = 1 src/main/resources/source/dirA/fileAB.s = 2 src/main/resources/source/dirA/fileAX.s = 3 diff --git a/src/it/uptodate-identity/invoker.properties b/src/it/uptodate-identity/invoker.properties index 209ce94..7fb7c31 100644 --- a/src/it/uptodate-identity/invoker.properties +++ b/src/it/uptodate-identity/invoker.properties @@ -1,2 +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. invoker.goals = validate #invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/src/it/uptodate-identity/pom.xml b/src/it/uptodate-identity/pom.xml index c9f5170..eadb975 100644 --- a/src/it/uptodate-identity/pom.xml +++ b/src/it/uptodate-identity/pom.xml @@ -1,62 +1,81 @@ - - 4.0.0 - - org.codehaus.mojo - build-helper-maven-plugin-uptodate-identity-it - 1-SNAPSHOT - jar - - UpToDate Identity - Tests that uptodate-property with identity mapping works - - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - uptodate-property - - - propname-identity - uptodate - outofdate - outofdate - - src/main/resources/source - src/main/resources/target - - dir*/** - - - **/*X* - **/*Y/** - - - - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.codehaus.mojo + build-helper-maven-plugin-uptodate-identity-it + 1-SNAPSHOT + jar + + UpToDate Identity + Tests that uptodate-property with identity mapping works + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + uptodate-property + + + propname-identity + uptodate + outofdate + outofdate + + src/main/resources/source + src/main/resources/target + + dir*/** + + + **/*X* + **/*Y/** + + + + + + + + + + diff --git a/src/it/uptodate-identity/prebuild.groovy b/src/it/uptodate-identity/prebuild.groovy index cfe83df..7eeb6be 100644 --- a/src/it/uptodate-identity/prebuild.groovy +++ b/src/it/uptodate-identity/prebuild.groovy @@ -1 +1,19 @@ -org.codehaus.mojo.buildhelper.FixtureUtils.createResources( "target/it/uptodate-identity" ) \ No newline at end of file +/* + * 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. + */ +org.apache.maven.plugins.buildhelper.FixtureUtils.createResources( "target/it/uptodate-identity" ) \ No newline at end of file diff --git a/src/it/uptodate-identity/verify.groovy b/src/it/uptodate-identity/verify.groovy index 977a585..98d16b6 100644 --- a/src/it/uptodate-identity/verify.groovy +++ b/src/it/uptodate-identity/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/uptodate-merge/fixture.properties b/src/it/uptodate-merge/fixture.properties index 61456b1..37ce043 100644 --- a/src/it/uptodate-merge/fixture.properties +++ b/src/it/uptodate-merge/fixture.properties @@ -1,3 +1,19 @@ +# 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. src/main/resources/source/dirA/fileAA.s = 1 src/main/resources/source/dirA/fileAB.s = 2 src/main/resources/source/dirA/fileAX.s = 3 diff --git a/src/it/uptodate-merge/invoker.properties b/src/it/uptodate-merge/invoker.properties index 209ce94..7fb7c31 100644 --- a/src/it/uptodate-merge/invoker.properties +++ b/src/it/uptodate-merge/invoker.properties @@ -1,2 +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. invoker.goals = validate #invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/src/it/uptodate-merge/pom.xml b/src/it/uptodate-merge/pom.xml index b7d55a2..011db63 100644 --- a/src/it/uptodate-merge/pom.xml +++ b/src/it/uptodate-merge/pom.xml @@ -1,66 +1,85 @@ - - 4.0.0 - - org.codehaus.mojo - build-helper-maven-plugin-uptodate-merge-it - 1-SNAPSHOT - jar - - UpToDate Merge - Tests that uptodate-property with merge mapping works - - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - uptodate-property - - - propname-merge - uptodate - outofdate - - src/main/resources/source - src/main/resources/target - - dir*/** - - - **/*X* - **/*Y/** - - - merge - file*.s - todir/outfile.t - - - - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.codehaus.mojo + build-helper-maven-plugin-uptodate-merge-it + 1-SNAPSHOT + jar + + UpToDate Merge + Tests that uptodate-property with merge mapping works + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + uptodate-property + + + propname-merge + uptodate + outofdate + + src/main/resources/source + src/main/resources/target + + dir*/** + + + **/*X* + **/*Y/** + + + merge + file*.s + todir/outfile.t + + + + + + + + + + diff --git a/src/it/uptodate-merge/prebuild.groovy b/src/it/uptodate-merge/prebuild.groovy index 0187d09..18b4950 100644 --- a/src/it/uptodate-merge/prebuild.groovy +++ b/src/it/uptodate-merge/prebuild.groovy @@ -1 +1,19 @@ -org.codehaus.mojo.buildhelper.FixtureUtils.createResources( "target/it/uptodate-merge" ) \ No newline at end of file +/* + * 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. + */ +org.apache.maven.plugins.buildhelper.FixtureUtils.createResources( "target/it/uptodate-merge" ) \ No newline at end of file diff --git a/src/it/uptodate-merge/verify.groovy b/src/it/uptodate-merge/verify.groovy index 31d2510..e36718b 100644 --- a/src/it/uptodate-merge/verify.groovy +++ b/src/it/uptodate-merge/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/uptodate-multi-negative/fixture.properties b/src/it/uptodate-multi-negative/fixture.properties index 14cc442..a71c680 100644 --- a/src/it/uptodate-multi-negative/fixture.properties +++ b/src/it/uptodate-multi-negative/fixture.properties @@ -1,3 +1,19 @@ +# 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. src/main/resources/source/dirA/fileAA.s = 1 src/main/resources/source/dirA/fileAB.s = 2 src/main/resources/source/dirA/fileAX.s = 3 diff --git a/src/it/uptodate-multi-negative/invoker.properties b/src/it/uptodate-multi-negative/invoker.properties index 209ce94..7fb7c31 100644 --- a/src/it/uptodate-multi-negative/invoker.properties +++ b/src/it/uptodate-multi-negative/invoker.properties @@ -1,2 +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. invoker.goals = validate #invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/src/it/uptodate-multi-negative/pom.xml b/src/it/uptodate-multi-negative/pom.xml index e406705..8adafb1 100644 --- a/src/it/uptodate-multi-negative/pom.xml +++ b/src/it/uptodate-multi-negative/pom.xml @@ -1,170 +1,188 @@ - - 4.0.0 - - org.codehaus.mojo - build-helper-maven-plugin-uptodate-multi-negative-it - 1-SNAPSHOT - jar - - UpToDate Multi (negative) - Tests that uptodate-properties works with various mappers when target out of date WRT source - - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - uptodate-properties - - - - - propname-flatten - uptodate - outofdate - - src/main/resources/source - src/main/resources/target/flatten - - dir*/** - - - **/*X* - **/*Y/** - - - flatten - - - - - propname-glob - uptodate - outofdate - - src/main/resources/source - src/main/resources/target/glob - - dir*/** - - - **/*X* - **/*Y/** - - - glob - *.s - *.t - - - - - propname-identity - uptodate - outofdate - outofdate - - src/main/resources/source - src/main/resources/target/identity - - dir*/** - - - **/*X* - **/*Y/** - - - - - propname-merge - uptodate - outofdate - - src/main/resources/source - src/main/resources/target/merge - - dir*/** - - - **/*X* - **/*Y/** - - - merge - file*.s - todir/outfile.t - - - - - propname-package - uptodate - outofdate - - src/main/resources/source - src/main/resources/target/package - - dir*/** - - - **/*X* - **/*Y/** - - - package - *.s - *.t - - - - - propname-unpackage - uptodate - outofdate - - src/main/resources/source/unpackage - src/main/resources/target/unpackage - - dir*.s - - - *X* - *Y* - - - unpackage - *.s - *.t - - - - - - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.codehaus.mojo + build-helper-maven-plugin-uptodate-multi-negative-it + 1-SNAPSHOT + jar + + UpToDate Multi (negative) + Tests that uptodate-properties works with various mappers when target out of date WRT source + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + uptodate-properties + + + + + propname-flatten + uptodate + outofdate + + src/main/resources/source + src/main/resources/target/flatten + + dir*/** + + + **/*X* + **/*Y/** + + + flatten + + + + + propname-glob + uptodate + outofdate + + src/main/resources/source + src/main/resources/target/glob + + dir*/** + + + **/*X* + **/*Y/** + + + glob + *.s + *.t + + + + + propname-identity + uptodate + outofdate + outofdate + + src/main/resources/source + src/main/resources/target/identity + + dir*/** + + + **/*X* + **/*Y/** + + + + + propname-merge + uptodate + outofdate + + src/main/resources/source + src/main/resources/target/merge + + dir*/** + + + **/*X* + **/*Y/** + + + merge + file*.s + todir/outfile.t + + + + + propname-package + uptodate + outofdate + + src/main/resources/source + src/main/resources/target/package + + dir*/** + + + **/*X* + **/*Y/** + + + package + *.s + *.t + + + + + propname-unpackage + uptodate + outofdate + + src/main/resources/source/unpackage + src/main/resources/target/unpackage + + dir*.s + + + *X* + *Y* + + + unpackage + *.s + *.t + + + + + + + + + + + + diff --git a/src/it/uptodate-multi-negative/prebuild.groovy b/src/it/uptodate-multi-negative/prebuild.groovy index a976be3..9ec926c 100644 --- a/src/it/uptodate-multi-negative/prebuild.groovy +++ b/src/it/uptodate-multi-negative/prebuild.groovy @@ -1 +1,19 @@ -org.codehaus.mojo.buildhelper.FixtureUtils.createResources( "target/it/uptodate-multi-negative" ) \ No newline at end of file +/* + * 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. + */ +org.apache.maven.plugins.buildhelper.FixtureUtils.createResources( "target/it/uptodate-multi-negative" ) \ No newline at end of file diff --git a/src/it/uptodate-multi-negative/verify.groovy b/src/it/uptodate-multi-negative/verify.groovy index 9ef9f9a..9b18021 100644 --- a/src/it/uptodate-multi-negative/verify.groovy +++ b/src/it/uptodate-multi-negative/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/uptodate-multi/fixture.properties b/src/it/uptodate-multi/fixture.properties index 59a1be7..6592586 100644 --- a/src/it/uptodate-multi/fixture.properties +++ b/src/it/uptodate-multi/fixture.properties @@ -1,3 +1,19 @@ +# 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. src/main/resources/source/dirA/fileAA.s = 1 src/main/resources/source/dirA/fileAB.s = 2 src/main/resources/source/dirA/fileAX.s = 3 diff --git a/src/it/uptodate-multi/invoker.properties b/src/it/uptodate-multi/invoker.properties index 209ce94..7fb7c31 100644 --- a/src/it/uptodate-multi/invoker.properties +++ b/src/it/uptodate-multi/invoker.properties @@ -1,2 +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. invoker.goals = validate #invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/src/it/uptodate-multi/pom.xml b/src/it/uptodate-multi/pom.xml index 2384980..90f9a5b 100644 --- a/src/it/uptodate-multi/pom.xml +++ b/src/it/uptodate-multi/pom.xml @@ -1,170 +1,188 @@ - - 4.0.0 - - org.codehaus.mojo - build-helper-maven-plugin-uptodate-multi-it - 1-SNAPSHOT - jar - - UpToDate Multi - Tests that uptodate-properties works with various mappers - - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - uptodate-properties - - - - - propname-flatten - uptodate - outofdate - - src/main/resources/source - src/main/resources/target/flatten - - dir*/** - - - **/*X* - **/*Y/** - - - flatten - - - - - propname-glob - uptodate - outofdate - - src/main/resources/source - src/main/resources/target/glob - - dir*/** - - - **/*X* - **/*Y/** - - - glob - *.s - *.t - - - - - propname-identity - uptodate - outofdate - outofdate - - src/main/resources/source - src/main/resources/target/identity - - dir*/** - - - **/*X* - **/*Y/** - - - - - propname-merge - uptodate - outofdate - - src/main/resources/source - src/main/resources/target/merge - - dir*/** - - - **/*X* - **/*Y/** - - - merge - file*.s - todir/outfile.t - - - - - propname-package - uptodate - outofdate - - src/main/resources/source - src/main/resources/target/package - - dir*/** - - - **/*X* - **/*Y/** - - - package - *.s - *.t - - - - - propname-unpackage - uptodate - outofdate - - src/main/resources/source/unpackage - src/main/resources/target/unpackage - - dir*.s - - - *X* - *Y* - - - unpackage - *.s - *.t - - - - - - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.codehaus.mojo + build-helper-maven-plugin-uptodate-multi-it + 1-SNAPSHOT + jar + + UpToDate Multi + Tests that uptodate-properties works with various mappers + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + uptodate-properties + + + + + propname-flatten + uptodate + outofdate + + src/main/resources/source + src/main/resources/target/flatten + + dir*/** + + + **/*X* + **/*Y/** + + + flatten + + + + + propname-glob + uptodate + outofdate + + src/main/resources/source + src/main/resources/target/glob + + dir*/** + + + **/*X* + **/*Y/** + + + glob + *.s + *.t + + + + + propname-identity + uptodate + outofdate + outofdate + + src/main/resources/source + src/main/resources/target/identity + + dir*/** + + + **/*X* + **/*Y/** + + + + + propname-merge + uptodate + outofdate + + src/main/resources/source + src/main/resources/target/merge + + dir*/** + + + **/*X* + **/*Y/** + + + merge + file*.s + todir/outfile.t + + + + + propname-package + uptodate + outofdate + + src/main/resources/source + src/main/resources/target/package + + dir*/** + + + **/*X* + **/*Y/** + + + package + *.s + *.t + + + + + propname-unpackage + uptodate + outofdate + + src/main/resources/source/unpackage + src/main/resources/target/unpackage + + dir*.s + + + *X* + *Y* + + + unpackage + *.s + *.t + + + + + + + + + + + + diff --git a/src/it/uptodate-multi/prebuild.groovy b/src/it/uptodate-multi/prebuild.groovy index bccad07..3443505 100644 --- a/src/it/uptodate-multi/prebuild.groovy +++ b/src/it/uptodate-multi/prebuild.groovy @@ -1 +1,19 @@ -org.codehaus.mojo.buildhelper.FixtureUtils.createResources( "target/it/uptodate-multi" ) \ No newline at end of file +/* + * 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. + */ +org.apache.maven.plugins.buildhelper.FixtureUtils.createResources( "target/it/uptodate-multi" ) \ No newline at end of file diff --git a/src/it/uptodate-multi/verify.groovy b/src/it/uptodate-multi/verify.groovy index b4c9627..92c76d7 100644 --- a/src/it/uptodate-multi/verify.groovy +++ b/src/it/uptodate-multi/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/uptodate-package/fixture.properties b/src/it/uptodate-package/fixture.properties index edac52b..c7ebab3 100644 --- a/src/it/uptodate-package/fixture.properties +++ b/src/it/uptodate-package/fixture.properties @@ -1,3 +1,19 @@ +# 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. src/main/resources/source/dirA/fileAA.s = 1 src/main/resources/source/dirA/fileAB.s = 2 src/main/resources/source/dirA/fileAX.s = 3 diff --git a/src/it/uptodate-package/invoker.properties b/src/it/uptodate-package/invoker.properties index 209ce94..7fb7c31 100644 --- a/src/it/uptodate-package/invoker.properties +++ b/src/it/uptodate-package/invoker.properties @@ -1,2 +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. invoker.goals = validate #invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/src/it/uptodate-package/pom.xml b/src/it/uptodate-package/pom.xml index 791d812..75d8407 100644 --- a/src/it/uptodate-package/pom.xml +++ b/src/it/uptodate-package/pom.xml @@ -1,66 +1,85 @@ - - 4.0.0 - - org.codehaus.mojo - build-helper-maven-plugin-uptodate-package-it - 1-SNAPSHOT - jar - - UpToDate Package - Tests that uptodate-property with package mapping works - - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - uptodate-property - - - propname-package - uptodate - outofdate - - src/main/resources/source - src/main/resources/target - - dir*/** - - - **/*X* - **/*Y/** - - - package - *.s - *.t - - - - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.codehaus.mojo + build-helper-maven-plugin-uptodate-package-it + 1-SNAPSHOT + jar + + UpToDate Package + Tests that uptodate-property with package mapping works + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + uptodate-property + + + propname-package + uptodate + outofdate + + src/main/resources/source + src/main/resources/target + + dir*/** + + + **/*X* + **/*Y/** + + + package + *.s + *.t + + + + + + + + + + diff --git a/src/it/uptodate-package/prebuild.groovy b/src/it/uptodate-package/prebuild.groovy index 80a4504..9d0cf0e 100644 --- a/src/it/uptodate-package/prebuild.groovy +++ b/src/it/uptodate-package/prebuild.groovy @@ -1 +1,19 @@ -org.codehaus.mojo.buildhelper.FixtureUtils.createResources( "target/it/uptodate-package" ) \ No newline at end of file +/* + * 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. + */ +org.apache.maven.plugins.buildhelper.FixtureUtils.createResources( "target/it/uptodate-package" ) \ No newline at end of file diff --git a/src/it/uptodate-package/verify.groovy b/src/it/uptodate-package/verify.groovy index 977b707..4e14fc0 100644 --- a/src/it/uptodate-package/verify.groovy +++ b/src/it/uptodate-package/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/it/uptodate-unpackage/fixture.properties b/src/it/uptodate-unpackage/fixture.properties index e2e76d5..0548ea3 100644 --- a/src/it/uptodate-unpackage/fixture.properties +++ b/src/it/uptodate-unpackage/fixture.properties @@ -1,3 +1,19 @@ +# 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. src/main/resources/source/dirA.fileAA.s = 1 src/main/resources/source/dirA.fileAB.s = 2 src/main/resources/source/dirA.fileAX.s = 3 diff --git a/src/it/uptodate-unpackage/invoker.properties b/src/it/uptodate-unpackage/invoker.properties index 209ce94..7fb7c31 100644 --- a/src/it/uptodate-unpackage/invoker.properties +++ b/src/it/uptodate-unpackage/invoker.properties @@ -1,2 +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. invoker.goals = validate #invoker.mavenOpts = -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/src/it/uptodate-unpackage/pom.xml b/src/it/uptodate-unpackage/pom.xml index 4d98516..f419093 100644 --- a/src/it/uptodate-unpackage/pom.xml +++ b/src/it/uptodate-unpackage/pom.xml @@ -1,66 +1,85 @@ - - 4.0.0 - - org.codehaus.mojo - build-helper-maven-plugin-uptodate-unpackage-it - 1-SNAPSHOT - jar - - UpToDate Unpackage - Tests that uptodate-property with unpackage mapping works - - - - - src/main/resources - - test.properties - - false - - - src/main/resources - - test.properties - - true - - - - - @project.groupId@ - @project.artifactId@ - @project.version@ - - - - uptodate-property - - - propname-unpackage - uptodate - outofdate - - src/main/resources/source - src/main/resources/target - - dir*.s - - - *X* - *Y* - - - unpackage - *.s - *.t - - - - - - - - - - \ No newline at end of file + + + + 4.0.0 + + org.codehaus.mojo + build-helper-maven-plugin-uptodate-unpackage-it + 1-SNAPSHOT + jar + + UpToDate Unpackage + Tests that uptodate-property with unpackage mapping works + + + + + false + src/main/resources + + test.properties + + + + true + src/main/resources + + test.properties + + + + + + @project.groupId@ + @project.artifactId@ + @project.version@ + + + + uptodate-property + + + propname-unpackage + uptodate + outofdate + + src/main/resources/source + src/main/resources/target + + dir*.s + + + *X* + *Y* + + + unpackage + *.s + *.t + + + + + + + + + + diff --git a/src/it/uptodate-unpackage/prebuild.groovy b/src/it/uptodate-unpackage/prebuild.groovy index dea81e7..ca8a062 100644 --- a/src/it/uptodate-unpackage/prebuild.groovy +++ b/src/it/uptodate-unpackage/prebuild.groovy @@ -1 +1,19 @@ -org.codehaus.mojo.buildhelper.FixtureUtils.createResources( "target/it/uptodate-unpackage" ) \ No newline at end of file +/* + * 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. + */ +org.apache.maven.plugins.buildhelper.FixtureUtils.createResources( "target/it/uptodate-unpackage" ) \ No newline at end of file diff --git a/src/it/uptodate-unpackage/verify.groovy b/src/it/uptodate-unpackage/verify.groovy index 85a03fa..134aa2c 100644 --- a/src/it/uptodate-unpackage/verify.groovy +++ b/src/it/uptodate-unpackage/verify.groovy @@ -1,3 +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. + */ File file = new File( basedir, "build.log" ); assert file.exists(); diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AbstractAddResourceMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractAddResourceMojo.java similarity index 81% rename from src/main/java/org/codehaus/mojo/buildhelper/AbstractAddResourceMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AbstractAddResourceMojo.java index 122ca77..80b6fb8 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AbstractAddResourceMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractAddResourceMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License @@ -33,7 +51,7 @@ import org.apache.maven.api.di.Inject; import org.apache.maven.api.plugin.annotations.Parameter; import org.apache.maven.api.services.ProjectManager; -import org.codehaus.mojo.buildhelper.utils.Resource; +import org.apache.maven.plugins.buildhelper.utils.Resource; /** * Abstract Mojo for adding Resources diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AbstractDefinePropertyMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractDefinePropertyMojo.java similarity index 70% rename from src/main/java/org/codehaus/mojo/buildhelper/AbstractDefinePropertyMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AbstractDefinePropertyMojo.java index c4d625e..ba66661 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AbstractDefinePropertyMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractDefinePropertyMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/apache/maven/plugins/buildhelper/AbstractMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractMojo.java new file mode 100644 index 0000000..0976079 --- /dev/null +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractMojo.java @@ -0,0 +1,33 @@ +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; + +import org.apache.maven.api.di.Inject; +import org.apache.maven.api.plugin.Log; +import org.apache.maven.api.plugin.Mojo; + +public abstract class AbstractMojo implements Mojo { + + @Inject + Log log; + + public Log getLog() { + return log; + } +} diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AbstractRegexPropertyMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractRegexPropertyMojo.java similarity index 78% rename from src/main/java/org/codehaus/mojo/buildhelper/AbstractRegexPropertyMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AbstractRegexPropertyMojo.java index 9baf562..13dfa16 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AbstractRegexPropertyMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractRegexPropertyMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AbstractUpToDatePropertyMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractUpToDatePropertyMojo.java similarity index 86% rename from src/main/java/org/codehaus/mojo/buildhelper/AbstractUpToDatePropertyMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AbstractUpToDatePropertyMojo.java index 6b6b2fc..982a7e8 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AbstractUpToDatePropertyMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AbstractUpToDatePropertyMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AddResourceMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AddResourceMojo.java similarity index 72% rename from src/main/java/org/codehaus/mojo/buildhelper/AddResourceMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AddResourceMojo.java index 7d6ef23..ad711e0 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AddResourceMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AddResourceMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AddSourceMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AddSourceMojo.java similarity index 79% rename from src/main/java/org/codehaus/mojo/buildhelper/AddSourceMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AddSourceMojo.java index 308890b..4b89bf7 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AddSourceMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AddSourceMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AddTestResourceMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AddTestResourceMojo.java similarity index 72% rename from src/main/java/org/codehaus/mojo/buildhelper/AddTestResourceMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AddTestResourceMojo.java index 10a0c5b..7cdb8a7 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AddTestResourceMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AddTestResourceMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AddTestSourceMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AddTestSourceMojo.java similarity index 79% rename from src/main/java/org/codehaus/mojo/buildhelper/AddTestSourceMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AddTestSourceMojo.java index 602ff50..ea39ed5 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AddTestSourceMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AddTestSourceMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AttachArtifactMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/AttachArtifactMojo.java similarity index 83% rename from src/main/java/org/codehaus/mojo/buildhelper/AttachArtifactMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/AttachArtifactMojo.java index 0f38e49..fe606fb 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/AttachArtifactMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/AttachArtifactMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License @@ -35,7 +53,7 @@ import org.apache.maven.api.plugin.annotations.Parameter; import org.apache.maven.api.services.ArtifactFactory; import org.apache.maven.api.services.ProjectManager; -import org.codehaus.mojo.buildhelper.utils.Artifact; +import org.apache.maven.plugins.buildhelper.utils.Artifact; /** * Attach additional artifacts to be installed and deployed. diff --git a/src/main/java/org/codehaus/mojo/buildhelper/BeanshellPropertyMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/BeanshellPropertyMojo.java similarity index 83% rename from src/main/java/org/codehaus/mojo/buildhelper/BeanshellPropertyMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/BeanshellPropertyMojo.java index 2a0c606..7e2aaba 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/BeanshellPropertyMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/BeanshellPropertyMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/CpuCountMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/CpuCountMojo.java similarity index 72% rename from src/main/java/org/codehaus/mojo/buildhelper/CpuCountMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/CpuCountMojo.java index 2548ca6..6f5815e 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/CpuCountMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/CpuCountMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/HostnameMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/HostnameMojo.java similarity index 71% rename from src/main/java/org/codehaus/mojo/buildhelper/HostnameMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/HostnameMojo.java index ea3e682..44d0e5e 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/HostnameMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/HostnameMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/LocalIpMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/LocalIpMojo.java similarity index 71% rename from src/main/java/org/codehaus/mojo/buildhelper/LocalIpMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/LocalIpMojo.java index a979ffa..8b2c530 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/LocalIpMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/LocalIpMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/ParseVersionMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/ParseVersionMojo.java similarity index 91% rename from src/main/java/org/codehaus/mojo/buildhelper/ParseVersionMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/ParseVersionMojo.java index 53b66b1..20a7fcb 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/ParseVersionMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/ParseVersionMojo.java @@ -1,8 +1,26 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; import org.apache.maven.api.plugin.annotations.Mojo; import org.apache.maven.api.plugin.annotations.Parameter; -import org.codehaus.mojo.buildhelper.utils.ParsedVersion; +import org.apache.maven.plugins.buildhelper.utils.ParsedVersion; /** * Parse a version string and set properties containing the component parts of the version. This mojo sets the following diff --git a/src/main/java/org/codehaus/mojo/buildhelper/RegexPropertiesMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertiesMojo.java similarity index 70% rename from src/main/java/org/codehaus/mojo/buildhelper/RegexPropertiesMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertiesMojo.java index bed715a..929b809 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/RegexPropertiesMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertiesMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/RegexPropertyMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertyMojo.java similarity index 77% rename from src/main/java/org/codehaus/mojo/buildhelper/RegexPropertyMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertyMojo.java index 04eca40..be7a9f3 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/RegexPropertyMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertyMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/RegexPropertySetting.java b/src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertySetting.java similarity index 81% rename from src/main/java/org/codehaus/mojo/buildhelper/RegexPropertySetting.java rename to src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertySetting.java index cb98b21..b2d4f12 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/RegexPropertySetting.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/RegexPropertySetting.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/ReleasedVersionMojo.java similarity index 86% rename from src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/ReleasedVersionMojo.java index e09c86d..33f6f02 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/ReleasedVersionMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/ReleasedVersionMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License @@ -36,7 +54,7 @@ import org.apache.maven.api.services.VersionRangeResolver; import org.apache.maven.api.services.VersionRangeResolverException; import org.apache.maven.api.services.VersionRangeResolverResult; -import org.codehaus.mojo.buildhelper.utils.ParsedVersion; +import org.apache.maven.plugins.buildhelper.utils.ParsedVersion; /** * Resolve the latest released version of this project. This mojo sets the following properties: diff --git a/src/main/java/org/codehaus/mojo/buildhelper/ReserveListenerPortMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/ReserveListenerPortMojo.java similarity index 94% rename from src/main/java/org/codehaus/mojo/buildhelper/ReserveListenerPortMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/ReserveListenerPortMojo.java index c7f3f70..d043242 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/ReserveListenerPortMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/ReserveListenerPortMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/TimestampPropertyMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/TimestampPropertyMojo.java similarity index 87% rename from src/main/java/org/codehaus/mojo/buildhelper/TimestampPropertyMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/TimestampPropertyMojo.java index e931169..16132e1 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/TimestampPropertyMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/TimestampPropertyMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertiesMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertiesMojo.java similarity index 74% rename from src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertiesMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertiesMojo.java index 44ef29e..8dd4286 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertiesMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertiesMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertyMojo.java b/src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertyMojo.java similarity index 77% rename from src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertyMojo.java rename to src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertyMojo.java index db098a8..dd8c28f 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertyMojo.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertyMojo.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertySetting.java b/src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertySetting.java similarity index 80% rename from src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertySetting.java rename to src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertySetting.java index b10b775..ba33558 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/UpToDatePropertySetting.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/UpToDatePropertySetting.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/utils/Artifact.java b/src/main/java/org/apache/maven/plugins/buildhelper/utils/Artifact.java similarity index 75% rename from src/main/java/org/codehaus/mojo/buildhelper/utils/Artifact.java rename to src/main/java/org/apache/maven/plugins/buildhelper/utils/Artifact.java index 82d99c2..acbb469 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/utils/Artifact.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/utils/Artifact.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper.utils; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper.utils; /* * The MIT License diff --git a/src/main/java/org/codehaus/mojo/buildhelper/utils/ParsedVersion.java b/src/main/java/org/apache/maven/plugins/buildhelper/utils/ParsedVersion.java similarity index 85% rename from src/main/java/org/codehaus/mojo/buildhelper/utils/ParsedVersion.java rename to src/main/java/org/apache/maven/plugins/buildhelper/utils/ParsedVersion.java index 6bd772a..7f9fdc5 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/utils/ParsedVersion.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/utils/ParsedVersion.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper.utils; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper.utils; /* * The MIT License @@ -27,8 +45,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.maven.plugins.buildhelper.ParseVersionMojo; + /** - * This class will parse the version based on the given pattern in {@link org.codehaus.mojo.buildhelper.ParseVersionMojo}. + * This class will parse the version based on the given pattern in {@link ParseVersionMojo}. * * @author Karl Heinz Marbaise khmarbaise@apache.org * diff --git a/src/main/java/org/codehaus/mojo/buildhelper/utils/Resource.java b/src/main/java/org/apache/maven/plugins/buildhelper/utils/Resource.java similarity index 97% rename from src/main/java/org/codehaus/mojo/buildhelper/utils/Resource.java rename to src/main/java/org/apache/maven/plugins/buildhelper/utils/Resource.java index 8f70ab1..d2cae91 100644 --- a/src/main/java/org/codehaus/mojo/buildhelper/utils/Resource.java +++ b/src/main/java/org/apache/maven/plugins/buildhelper/utils/Resource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.codehaus.mojo.buildhelper.utils; +package org.apache.maven.plugins.buildhelper.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/codehaus/mojo/buildhelper/AbstractMojo.java b/src/main/java/org/codehaus/mojo/buildhelper/AbstractMojo.java deleted file mode 100644 index 5d4fb34..0000000 --- a/src/main/java/org/codehaus/mojo/buildhelper/AbstractMojo.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.codehaus.mojo.buildhelper; - -import org.apache.maven.api.di.Inject; -import org.apache.maven.api.plugin.Log; -import org.apache.maven.api.plugin.Mojo; - -public abstract class AbstractMojo implements Mojo { - - @Inject - Log log; - - public Log getLog() { - return log; - } -} diff --git a/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml index 439c6b7..6c90dd6 100644 --- a/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml +++ b/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml @@ -1,4 +1,22 @@ + diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm index 553254f..4425946 100644 --- a/src/site/apt/usage.apt.vm +++ b/src/site/apt/usage.apt.vm @@ -48,7 +48,7 @@ Usage - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -83,7 +83,7 @@ Usage - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -119,7 +119,7 @@ Usage - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -163,7 +163,7 @@ Usage ... - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -203,7 +203,7 @@ Usage - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -280,7 +280,7 @@ parsedVersion.osgiVersion - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -328,7 +328,7 @@ releasedVersion.qualifier - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -401,7 +401,7 @@ releasedVersion.qualifier - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -452,7 +452,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -489,7 +489,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -531,7 +531,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -582,7 +582,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -630,7 +630,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -662,7 +662,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -694,7 +694,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -738,7 +738,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} @@ -791,7 +791,7 @@ tomcat.http.port - org.codehaus.mojo + org.apache.maven.plugins build-helper-maven-plugin ${project.version} diff --git a/src/test/java/org/codehaus/mojo/buildhelper/FixtureUtils.java b/src/test/java/org/apache/maven/plugins/buildhelper/FixtureUtils.java similarity index 86% rename from src/test/java/org/codehaus/mojo/buildhelper/FixtureUtils.java rename to src/test/java/org/apache/maven/plugins/buildhelper/FixtureUtils.java index 900966e..f358b46 100644 --- a/src/test/java/org/codehaus/mojo/buildhelper/FixtureUtils.java +++ b/src/test/java/org/apache/maven/plugins/buildhelper/FixtureUtils.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License @@ -98,7 +116,11 @@ public static void createResources(File baseDir, File propertiesFile, String enc * @throws NumberFormatException If a non-empty property value cannot be parsed as an integer. */ public static void createResources(File baseDir, Properties properties, long baseTimestamp) throws IOException { + System.err.println("========================"); + System.err.println("Creating resources"); for (String propertyName : properties.stringPropertyNames()) { + String propertyValue = properties.getProperty(propertyName); + System.err.println(" - " + propertyName + " -> " + propertyValue); File file = new File(baseDir, propertyName); File parent = file.getParentFile(); if (parent != null) { @@ -107,7 +129,6 @@ public static void createResources(File baseDir, Properties properties, long bas file.createNewFile(); // If required, set the last modification timestamp. - String propertyValue = properties.getProperty(propertyName); if (!propertyValue.isEmpty()) { int offset = Integer.parseInt(propertyValue); long ts = baseTimestamp + (offset * 1000L); diff --git a/src/test/java/org/codehaus/mojo/buildhelper/ParseVersionTest.java b/src/test/java/org/apache/maven/plugins/buildhelper/ParseVersionTest.java similarity index 95% rename from src/test/java/org/codehaus/mojo/buildhelper/ParseVersionTest.java rename to src/test/java/org/apache/maven/plugins/buildhelper/ParseVersionTest.java index 89c267f..93aa0fc 100644 --- a/src/test/java/org/codehaus/mojo/buildhelper/ParseVersionTest.java +++ b/src/test/java/org/apache/maven/plugins/buildhelper/ParseVersionTest.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper; /* * The MIT License diff --git a/src/test/java/org/codehaus/mojo/buildhelper/versioning/ParsedVersionTest.java b/src/test/java/org/apache/maven/plugins/buildhelper/versioning/ParsedVersionTest.java similarity index 80% rename from src/test/java/org/codehaus/mojo/buildhelper/versioning/ParsedVersionTest.java rename to src/test/java/org/apache/maven/plugins/buildhelper/versioning/ParsedVersionTest.java index 285f017..5a9b023 100644 --- a/src/test/java/org/codehaus/mojo/buildhelper/versioning/ParsedVersionTest.java +++ b/src/test/java/org/apache/maven/plugins/buildhelper/versioning/ParsedVersionTest.java @@ -1,4 +1,22 @@ -package org.codehaus.mojo.buildhelper.versioning; +/* + * 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. + */ +package org.apache.maven.plugins.buildhelper.versioning; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +37,7 @@ * under the License. */ -import org.codehaus.mojo.buildhelper.utils.ParsedVersion; +import org.apache.maven.plugins.buildhelper.utils.ParsedVersion; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource;