[maven] branch MNG-6914_2 updated: [MNG-6914] add more details about MavenWrapperDownloader.java
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6914_2 in repository https://gitbox.apache.org/repos/asf/maven.git The following commit(s) were added to refs/heads/MNG-6914_2 by this push: new eaa9709 [MNG-6914] add more details about MavenWrapperDownloader.java eaa9709 is described below commit eaa97096252aeba129f27a0296caa12988c39b5c Author: Hervé Boutemy AuthorDate: Fri Oct 15 07:50:54 2021 +0200 [MNG-6914] add more details about MavenWrapperDownloader.java --- apache-maven-wrapper/src/site/apt/index.apt.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-maven-wrapper/src/site/apt/index.apt.vm b/apache-maven-wrapper/src/site/apt/index.apt.vm index 5931d9a..3945a9c 100644 --- a/apache-maven-wrapper/src/site/apt/index.apt.vm +++ b/apache-maven-wrapper/src/site/apt/index.apt.vm @@ -39,13 +39,13 @@ mvnwDebug.cmd .mvn/wrapper/maven-wrapper.properties - - <<>>: in addition to <<>>, provides <<>> binary: + - <<>>: in addition to <<>>, provides <<>> binary directly so it does not require to be downloaded: .mvn/wrapper/maven-wrapper.jar - - <<>>: in addition to <<>>, provides <<>> source: + - <<>>: in addition to <<>>, provides <<>> source that will be compiled by the scripts then executed to download <<>>: .mvn/wrapper/MavenWrapperDownloader.java
[maven-gh-actions-shared] branch main updated: fix goals
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git
The following commit(s) were added to refs/heads/main by this push:
new 5ebf541 fix goals
5ebf541 is described below
commit 5ebf54151db1b60d0fe17a344a01a34986d50f62
Author: Olivier Lamy
AuthorDate: Fri Oct 15 13:09:47 2021 +1000
fix goals
Signed-off-by: Olivier Lamy
---
.github/workflows/maven-verify-with-its.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/maven-verify-with-its.yml
b/.github/workflows/maven-verify-with-its.yml
index ab95d35..b2b5bb9 100644
--- a/.github/workflows/maven-verify-with-its.yml
+++ b/.github/workflows/maven-verify-with-its.yml
@@ -92,7 +92,7 @@ jobs:
cache: 'maven'
- name: Build with Maven
-run: mvn --errors --batch-mode --show-version -P run-its
-D"invoker.streamLogsOnFailures" verify
+run: mvn ${{ inputs.maven_args }}
- name: Build Maven Site
-run: mvn ${{ inputs.maven_args }}
+run: mvn ${{ inputs.maven_args }} site
[maven-gh-actions-shared] branch main updated: mvn args as an input
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git
The following commit(s) were added to refs/heads/main by this push:
new 6ff7b64 mvn args as an input
6ff7b64 is described below
commit 6ff7b64f453f3a31ea749fb379468e17c5b50b84
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:58:04 2021 +1000
mvn args as an input
Signed-off-by: Olivier Lamy
---
.github/workflows/maven-verify-with-its.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/maven-verify-with-its.yml
b/.github/workflows/maven-verify-with-its.yml
index 8bb287c..ab95d35 100644
--- a/.github/workflows/maven-verify-with-its.yml
+++ b/.github/workflows/maven-verify-with-its.yml
@@ -64,7 +64,7 @@ jobs:
cache: 'maven'
- name: Build with Maven
-run: mvn --errors --batch-mode --show-version -P run-its
-D"invoker.streamLogsOnFailures" verify
+run: mvn ${{ inputs.maven_args }}
verify:
needs: build
[maven-gh-actions-shared] branch main updated: mvn args as an input
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git
The following commit(s) were added to refs/heads/main by this push:
new 65f62be mvn args as an input
65f62be is described below
commit 65f62beec595dbfb961d2dcc257451240af94242
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:57:03 2021 +1000
mvn args as an input
Signed-off-by: Olivier Lamy
---
.github/workflows/maven-verify-with-its.yml | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/maven-verify-with-its.yml
b/.github/workflows/maven-verify-with-its.yml
index 4424a40..8bb287c 100644
--- a/.github/workflows/maven-verify-with-its.yml
+++ b/.github/workflows/maven-verify-with-its.yml
@@ -20,6 +20,12 @@ name: Verify
on:
workflow_call:
inputs:
+ maven_args:
+description: The arguments to pass to Maven when building the code
+required: false
+default: --errors --batch-mode --show-version -P run-its
-D"invoker.streamLogsOnFailures" verify
+type: string
+
os-matrix:
description: 'os matrix as json array'
default: '[ "ubuntu-latest", "windows-latest", "macOS-latest" ]'
@@ -89,4 +95,4 @@ jobs:
run: mvn --errors --batch-mode --show-version -P run-its
-D"invoker.streamLogsOnFailures" verify
- name: Build Maven Site
-run: mvn --errors --batch-mode --show-version site
+run: mvn ${{ inputs.maven_args }}
[maven-assembly-plugin] branch master updated: use default shared action
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 0060765 use default shared action
0060765 is described below
commit 00607650a19c5f1fe7b978a812df3d7f739033dd
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:52:11 2021 +1000
use default shared action
Signed-off-by: Olivier Lamy
---
.github/workflows/maven.yml | 25 ++---
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8994aa7..04dabf2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,26 +21,5 @@ on: [push, pull_request]
jobs:
build:
-
-strategy:
- matrix:
-os: [ubuntu-latest, windows-latest, macOS-latest]
-java: [8, 11, 17]
-jdk: [temurin, zulu]
- fail-fast: false
-
-runs-on: ${{ matrix.os }}
-
-steps:
- - name: Checkout
-uses: actions/checkout@v2.3.4
-
- - name: Set up JDK
-uses: actions/setup-java@v2
-with:
- distribution: ${{ matrix.jdk }}
- java-version: ${{ matrix.java }}
- cache: 'maven'
-
- - name: Build with Maven
-run: mvn verify --errors --batch-mode --show-version -P run-its
+name: Verify
+uses:
apache/maven-gh-actions-shared/.github/workflows/maven-verify-with-its.yml@main
[maven-jar-plugin] branch master updated: use shared gh action (#24)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 9c93c7e use shared gh action (#24)
9c93c7e is described below
commit 9c93c7e20cda6a64d6eec663d1ba2f687b79a3d1
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:47:12 2021 +1000
use shared gh action (#24)
Signed-off-by: Olivier Lamy
---
.github/workflows/maven.yml | 25 ++---
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8994aa7..04dabf2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,26 +21,5 @@ on: [push, pull_request]
jobs:
build:
-
-strategy:
- matrix:
-os: [ubuntu-latest, windows-latest, macOS-latest]
-java: [8, 11, 17]
-jdk: [temurin, zulu]
- fail-fast: false
-
-runs-on: ${{ matrix.os }}
-
-steps:
- - name: Checkout
-uses: actions/checkout@v2.3.4
-
- - name: Set up JDK
-uses: actions/setup-java@v2
-with:
- distribution: ${{ matrix.jdk }}
- java-version: ${{ matrix.java }}
- cache: 'maven'
-
- - name: Build with Maven
-run: mvn verify --errors --batch-mode --show-version -P run-its
+name: Verify
+uses:
apache/maven-gh-actions-shared/.github/workflows/maven-verify-with-its.yml@main
[maven-jar-plugin] branch test-gh-action-shared updated: fix error
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch test-gh-action-shared
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
The following commit(s) were added to refs/heads/test-gh-action-shared by this
push:
new 9c6b7bb fix error
9c6b7bb is described below
commit 9c6b7bb673a1dde21c5694ae129fa5cd855a0a34
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:43:18 2021 +1000
fix error
Signed-off-by: Olivier Lamy
---
src/main/java/org/apache/maven/plugins/jar/JarMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
b/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
index 4073e2b..4172028 100644
--- a/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
@@ -50,7 +50,7 @@ public class JarMojo
* If you try to do that a second time without using a classifier the
build will fail.
*/
@Parameter
-private Stringde classifier;
+private String classifier;
/**
* {@inheritDoc}
[maven-gh-actions-shared] branch main updated: display jdk distribution name
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git
The following commit(s) were added to refs/heads/main by this push:
new 77e1966 display jdk distribution name
77e1966 is described below
commit 77e1966d18ad84c20830404b0e9ed69dad049f53
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:42:45 2021 +1000
display jdk distribution name
Signed-off-by: Olivier Lamy
---
.github/workflows/maven-verify-with-its.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/maven-verify-with-its.yml
b/.github/workflows/maven-verify-with-its.yml
index 761a92d..4424a40 100644
--- a/.github/workflows/maven-verify-with-its.yml
+++ b/.github/workflows/maven-verify-with-its.yml
@@ -62,7 +62,7 @@ jobs:
verify:
needs: build
-name: ${{ matrix.os }} jdk-${{ matrix.jdk }}
+name: ${{ matrix.os }} jdk-${{ matrix.jdk }}-${{ matrix.distribution }}
runs-on: ${{ matrix.os }}
[maven-jar-plugin] branch test-gh-action-shared updated: test error
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch test-gh-action-shared
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
The following commit(s) were added to refs/heads/test-gh-action-shared by this
push:
new f196273 test error
f196273 is described below
commit f196273fdca9ab2fd5b099d40f594734c9eb6991
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:41:32 2021 +1000
test error
Signed-off-by: Olivier Lamy
---
src/main/java/org/apache/maven/plugins/jar/JarMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
b/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
index 4172028..4073e2b 100644
--- a/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
@@ -50,7 +50,7 @@ public class JarMojo
* If you try to do that a second time without using a classifier the
build will fail.
*/
@Parameter
-private String classifier;
+private Stringde classifier;
/**
* {@inheritDoc}
[maven-gh-actions-shared] branch main updated: not ignoring dependabot
This is an automated email from the ASF dual-hosted git repository. olamy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git The following commit(s) were added to refs/heads/main by this push: new a28c53c not ignoring dependabot a28c53c is described below commit a28c53c5c2427604f0d3d035ffb49a64b9d0fcce Author: Olivier Lamy AuthorDate: Fri Oct 15 11:40:39 2021 +1000 not ignoring dependabot Signed-off-by: Olivier Lamy --- README.md | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index dd50b5e..af90a07 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,7 @@ Create GitHub workflow in project with content: ```yaml name: Verify -on: - push: -branches-ignore: - - dependabot/** - - pull_request: +on: [push, pull_request] jobs: build:
[maven-jar-plugin] branch test-gh-action-shared created (now 63f534a)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch test-gh-action-shared in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git. at 63f534a test shared action This branch includes the following new commits: new 63f534a test shared action The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-jar-plugin] 01/01: test shared action
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch test-gh-action-shared
in repository https://gitbox.apache.org/repos/asf/maven-jar-plugin.git
commit 63f534ae99c26dabd3042e20b21af65837c94c36
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:38:17 2021 +1000
test shared action
Signed-off-by: Olivier Lamy
---
.github/workflows/maven.yml | 25 ++---
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8994aa7..04dabf2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,26 +21,5 @@ on: [push, pull_request]
jobs:
build:
-
-strategy:
- matrix:
-os: [ubuntu-latest, windows-latest, macOS-latest]
-java: [8, 11, 17]
-jdk: [temurin, zulu]
- fail-fast: false
-
-runs-on: ${{ matrix.os }}
-
-steps:
- - name: Checkout
-uses: actions/checkout@v2.3.4
-
- - name: Set up JDK
-uses: actions/setup-java@v2
-with:
- distribution: ${{ matrix.jdk }}
- java-version: ${{ matrix.java }}
- cache: 'maven'
-
- - name: Build with Maven
-run: mvn verify --errors --batch-mode --show-version -P run-its
+name: Verify
+uses:
apache/maven-gh-actions-shared/.github/workflows/maven-verify-with-its.yml@main
[maven-gh-actions-shared] branch main updated: add a first fail fast build and make jdk distribution matrix as well with one per default
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git
The following commit(s) were added to refs/heads/main by this push:
new b66262f add a first fail fast build and make jdk distribution matrix
as well with one per default
b66262f is described below
commit b66262f74f76553b3d9d4eff20fbb1696861f157
Author: Olivier Lamy
AuthorDate: Fri Oct 15 11:35:27 2021 +1000
add a first fail fast build and make jdk distribution matrix as well with
one per default
Signed-off-by: Olivier Lamy
---
.github/workflows/maven-verify-with-its.yml | 27 ++-
.gitignore | 1 +
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/maven-verify-with-its.yml
b/.github/workflows/maven-verify-with-its.yml
index a24464d..761a92d 100644
--- a/.github/workflows/maven-verify-with-its.yml
+++ b/.github/workflows/maven-verify-with-its.yml
@@ -35,9 +35,33 @@ on:
default: '[]'
type: string
+ jdk-distribution-matrix:
+description: "jdk distribution matrix"
+default: '[ "temurin" ]'
+type: string
+
jobs:
+ build:
+name: fail-fast-build
+runs-on: ubuntu-latest
+
+steps:
+ - name: Checkout
+uses: actions/checkout@v2.3.4
+
+ - name: Set up JDK
+uses: actions/setup-java@v2.3.1
+with:
+ java-version: 8
+ distribution: 'temurin'
+ cache: 'maven'
+
+ - name: Build with Maven
+run: mvn --errors --batch-mode --show-version -P run-its
-D"invoker.streamLogsOnFailures" verify
+
verify:
+needs: build
name: ${{ matrix.os }} jdk-${{ matrix.jdk }}
runs-on: ${{ matrix.os }}
@@ -47,6 +71,7 @@ jobs:
matrix:
os: ${{ fromJSON( inputs.os-matrix ) }}
jdk: ${{ fromJSON( inputs.jdk-matrix ) }}
+distribution: ${{ fromJSON( inputs.jdk-distribution-matrix ) }}
exclude: ${{ fromJSON( inputs.matrix-exclude ) }}
steps:
@@ -57,7 +82,7 @@ jobs:
uses: actions/setup-java@v2.3.1
with:
java-version: ${{ matrix.jdk }}
- distribution: 'temurin'
+ distribution: ${{ matrix.distribution }}
cache: 'maven'
- name: Build with Maven
diff --git a/.gitignore b/.gitignore
index 485dee6..c38fa4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
.idea
+*.iml
[maven-gh-actions-shared] branch main updated: first workflow
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git
The following commit(s) were added to refs/heads/main by this push:
new eee837a first workflow
eee837a is described below
commit eee837abbc62df4e1097841b7cec8c5db6b30e2a
Author: Slawomir Jaranowski
AuthorDate: Thu Oct 14 22:41:33 2021 +0200
first workflow
---
.github/workflows/maven-verify-with-its.yml | 67 +
.gitignore | 1 +
LICENSE | 202
README.md | 43 +-
4 files changed, 312 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/maven-verify-with-its.yml
b/.github/workflows/maven-verify-with-its.yml
new file mode 100644
index 000..a24464d
--- /dev/null
+++ b/.github/workflows/maven-verify-with-its.yml
@@ -0,0 +1,67 @@
+# 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: Verify
+
+on:
+ workflow_call:
+inputs:
+ os-matrix:
+description: 'os matrix as json array'
+default: '[ "ubuntu-latest", "windows-latest", "macOS-latest" ]'
+type: string
+
+ jdk-matrix:
+description: 'jdk matrix as json array'
+default: '[ "8", "11", "17" ]'
+type: string
+
+ matrix-exclude:
+description: 'exclude for matrix as json'
+default: '[]'
+type: string
+
+jobs:
+
+ verify:
+name: ${{ matrix.os }} jdk-${{ matrix.jdk }}
+
+runs-on: ${{ matrix.os }}
+
+strategy:
+ fail-fast: true
+ matrix:
+os: ${{ fromJSON( inputs.os-matrix ) }}
+jdk: ${{ fromJSON( inputs.jdk-matrix ) }}
+exclude: ${{ fromJSON( inputs.matrix-exclude ) }}
+
+steps:
+ - name: Checkout
+uses: actions/checkout@v2.3.4
+
+ - name: Set up JDK
+uses: actions/setup-java@v2.3.1
+with:
+ java-version: ${{ matrix.jdk }}
+ distribution: 'temurin'
+ cache: 'maven'
+
+ - name: Build with Maven
+run: mvn --errors --batch-mode --show-version -P run-its
-D"invoker.streamLogsOnFailures" verify
+
+ - name: Build Maven Site
+run: mvn --errors --batch-mode --show-version site
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..485dee6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..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
[maven-linkcheck-plugin] branch stabilize deleted (was 8a2510c)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-linkcheck-plugin.git. was 8a2510c Rewrite getExcludedPages() This change permanently discards the following revisions: discard 8a2510c Rewrite getExcludedPages() discard 9966a20 Fix JavaDoc
[maven-linkcheck-plugin] branch master updated: Fix JavaDoc
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-linkcheck-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 3953483 Fix JavaDoc
3953483 is described below
commit 39534833f284dfdcb3a8c491062c04452f2c15a4
Author: rfscholte
AuthorDate: Thu Oct 14 19:18:04 2021 +0200
Fix JavaDoc
---
.../apache/maven/plugins/linkcheck/LinkcheckReport.java | 17 ++---
.../org/apache/maven/plugins/linkcheck/SiteInvoker.java | 7 ---
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
b/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
index e758e0f..54f4eb0 100644
--- a/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
+++ b/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
@@ -40,8 +40,6 @@ import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
@@ -345,7 +343,7 @@ public class LinkcheckReport
basedir = new File( linkcheckOutput.getParentFile(), "tmpsite" );
basedir.mkdirs();
-List documents = null;
+List documents = null;
try
{
documents = FileUtils.getFiles( basedir, "**/*.html", null );
@@ -357,7 +355,7 @@ public class LinkcheckReport
}
// if the site was not already generated, invoke it
-if ( documents == null || ( documents != null && documents.size()
== 0 ) )
+if ( documents == null || documents.size() == 0 )
{
getLog().info( "Invoking the maven-site-plugin to ensure that
all files are generated..." );
@@ -432,13 +430,10 @@ public class LinkcheckReport
*/
private String[] getExcludedPages()
{
-List pagesToExclude =
-( excludedPages != null ? new ArrayList( Arrays.asList(
excludedPages ) ) : new ArrayList() );
-
-// Exclude this report
-pagesToExclude.add( getOutputName() + ".html" );
-
-return (String[]) pagesToExclude.toArray( new
String[pagesToExclude.size()] );
+String[] pagesToExclude = new String[excludedPages.length + 1];
+System.arraycopy( excludedPages, 0, pagesToExclude, 0,
excludedPages.length );
+pagesToExclude[excludedPages.length] = getOutputName() + ".html";
+return pagesToExclude;
}
// --
diff --git a/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
b/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
index 317469d..38eab4d 100644
--- a/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
+++ b/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
@@ -71,11 +71,12 @@ public class SiteInvoker
}
/**
- * Invoke Maven for the site phase for a temporary Maven
project using
+ * Invoke Maven for the site phase for a temporary Maven
project using
* tmpReportingOutputDirectory as
${project.reporting.outputDirectory}. This is a
- * workaround to be sure that all site files have been correctly
generated.
+ * workaround to be sure that all site files have been correctly generated.
+ *
* Note 1: the Maven Home should be defined in the
maven.home Java system property or defined in
- * M2_HOME system env variables. Note 2: we can't use
siteOutputDirectory param
+ * M2_HOME system env variables. Note 2: we can't use
siteOutputDirectory param
* from site plugin because some plugins
${project.reporting.outputDirectory} in their conf.
*
* @param project the MavenProject to invoke the site on. Not null.
[maven-linkcheck-plugin] branch stabilize updated: Rewrite getExcludedPages()
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch stabilize
in repository https://gitbox.apache.org/repos/asf/maven-linkcheck-plugin.git
The following commit(s) were added to refs/heads/stabilize by this push:
new 8a2510c Rewrite getExcludedPages()
8a2510c is described below
commit 8a2510cffe1ce9566bd7282fc9d42407c9d073fa
Author: rfscholte
AuthorDate: Thu Oct 14 19:12:14 2021 +0200
Rewrite getExcludedPages()
---
.../org/apache/maven/plugins/linkcheck/LinkcheckReport.java | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
b/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
index 3b2b6ff..54f4eb0 100644
--- a/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
+++ b/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
@@ -40,8 +40,6 @@ import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
@@ -432,13 +430,10 @@ public class LinkcheckReport
*/
private String[] getExcludedPages()
{
-List pagesToExclude =
-( excludedPages != null ? new ArrayList( Arrays.asList(
excludedPages ) ) : new ArrayList() );
-
-// Exclude this report
-pagesToExclude.add( getOutputName() + ".html" );
-
-return (String[]) pagesToExclude.toArray( new
String[pagesToExclude.size()] );
+String[] pagesToExclude = new String[excludedPages.length + 1];
+System.arraycopy( excludedPages, 0, pagesToExclude, 0,
excludedPages.length );
+pagesToExclude[excludedPages.length] = getOutputName() + ".html";
+return pagesToExclude;
}
// --
[maven-linkcheck-plugin] branch stabilize created (now 9966a20)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-linkcheck-plugin.git. at 9966a20 Fix JavaDoc This branch includes the following new commits: new 9966a20 Fix JavaDoc The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-linkcheck-plugin] 01/01: Fix JavaDoc
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch stabilize
in repository https://gitbox.apache.org/repos/asf/maven-linkcheck-plugin.git
commit 9966a20bca56b5c4618eac4a78b72e89416268d7
Author: rfscholte
AuthorDate: Thu Oct 14 18:57:35 2021 +0200
Fix JavaDoc
---
.../java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java | 8
src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java | 7 ---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
b/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
index e758e0f..3b2b6ff 100644
--- a/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
+++ b/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
@@ -345,7 +345,7 @@ public class LinkcheckReport
basedir = new File( linkcheckOutput.getParentFile(), "tmpsite" );
basedir.mkdirs();
-List documents = null;
+List documents = null;
try
{
documents = FileUtils.getFiles( basedir, "**/*.html", null );
@@ -357,7 +357,7 @@ public class LinkcheckReport
}
// if the site was not already generated, invoke it
-if ( documents == null || ( documents != null && documents.size()
== 0 ) )
+if ( documents == null || documents.size() == 0 )
{
getLog().info( "Invoking the maven-site-plugin to ensure that
all files are generated..." );
@@ -432,8 +432,8 @@ public class LinkcheckReport
*/
private String[] getExcludedPages()
{
-List pagesToExclude =
-( excludedPages != null ? new ArrayList( Arrays.asList(
excludedPages ) ) : new ArrayList() );
+List pagesToExclude =
+( excludedPages != null ? new ArrayList( Arrays.asList(
excludedPages ) ) : new ArrayList() );
// Exclude this report
pagesToExclude.add( getOutputName() + ".html" );
diff --git a/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
b/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
index 317469d..38eab4d 100644
--- a/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
+++ b/src/main/java/org/apache/maven/plugins/linkcheck/SiteInvoker.java
@@ -71,11 +71,12 @@ public class SiteInvoker
}
/**
- * Invoke Maven for the site phase for a temporary Maven
project using
+ * Invoke Maven for the site phase for a temporary Maven
project using
* tmpReportingOutputDirectory as
${project.reporting.outputDirectory}. This is a
- * workaround to be sure that all site files have been correctly
generated.
+ * workaround to be sure that all site files have been correctly generated.
+ *
* Note 1: the Maven Home should be defined in the
maven.home Java system property or defined in
- * M2_HOME system env variables. Note 2: we can't use
siteOutputDirectory param
+ * M2_HOME system env variables. Note 2: we can't use
siteOutputDirectory param
* from site plugin because some plugins
${project.reporting.outputDirectory} in their conf.
*
* @param project the MavenProject to invoke the site on. Not null.
[maven-changelog-plugin] branch stabilize deleted (was 9afa37d)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git. was 9afa37d Fix JavaDoc The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-changelog-plugin] branch master updated (cfc27f5 -> 9afa37d)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git. from cfc27f5 update CI url add 9afa37d Fix JavaDoc No new revisions were added by this update. Summary of changes: .../maven/plugin/changelog/ChangeLogReport.java| 34 ++ 1 file changed, 15 insertions(+), 19 deletions(-)
[maven-changelog-plugin] branch stabilize created (now 9afa37d)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git. at 9afa37d Fix JavaDoc This branch includes the following new commits: new 9afa37d Fix JavaDoc The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-changelog-plugin] 01/01: Fix JavaDoc
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-changelog-plugin.git commit 9afa37dad2fe0e3ccf9d7c8c105ecfb5a43eadb7 Author: rfscholte AuthorDate: Thu Oct 14 18:37:14 2021 +0200 Fix JavaDoc --- .../maven/plugin/changelog/ChangeLogReport.java| 34 ++ 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java index 95ac89e..34a845b 100644 --- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java +++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java @@ -343,20 +343,17 @@ public class ChangeLogReport private String issueLinkUrl; /** - * A template string that is used to create the changeset URL. - * + * A template string that is used to create the changeset URL. * If not defined no change set link will be created. - * + * * There is one special token that you can use in your template: * * %REV% - this is the changeset revision * - * - * Example: + * Example: * http://fisheye.sourceforge.net/changelog/a-project/?cs=%REV% * - * - * Note: If you don't supply the %REV% token in your template, + * Note: If you don't supply the %REV% token in your template, * the revision will simply be appended to your template URL. * * @@ -366,27 +363,25 @@ public class ChangeLogReport protected String displayChangeSetDetailUrl; /** - * A template string that is used to create the revision aware URL to + * A template string that is used to create the revision aware URL to * the file details in a similar fashion to the displayFileDetailUrl. * When a report contains both file and file revision information, as in the * Change Log report, this template string can be used to create a revision * aware URL to the file details. - * - * If not defined this template string defaults to the same value as the + * + * If not defined this template string defaults to the same value as the * displayFileDetailUrl and thus revision number aware links will * not be used. - * + * * There are two special tokens that you can use in your template: * * %FILE% - this is the path to a file * %REV% - this is the revision of the file * - * - * Example: + * Example: * http://fisheye.sourceforge.net/browse/a-project/%FILE%?r=%REV% * - * - * Note: If you don't supply the %FILE% token in your template, + * Note: If you don't supply the %FILE% token in your template, * the path of the file will simply be appended to your template URL. * * @@ -514,10 +509,11 @@ public class ChangeLogReport } /** - * populates the changedSets field by either connecting to the SCM or using an existing XML generated in a previous + * Populates the changedSets field by either connecting to the SCM or using an existing XML generated in a previous * run of the report * - * @throws MavenReportException + * @return a List of ChangeLogSets + * @throws MavenReportException if any exception occurs */ protected List getChangedSets() throws MavenReportException @@ -634,7 +630,7 @@ public class ChangeLogReport * creates a ChangeLog object and then connects to the SCM to generate the changed sets * * @return changedlogsets generated from the SCM - * @throws MavenReportException + * @throws MavenReportException if any exception occurs */ protected List generateChangeSetsFromSCM() throws MavenReportException @@ -1891,7 +1887,7 @@ public class ChangeLogReport } /** - * @param locale + * @param locale the locale for the scm-activity resource bundle * @return the current bundle */ protected ResourceBundle getBundle( Locale locale )
[maven-plugin-tools] branch drop-legacy updated (b6d8a12 -> 63e3ff7)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-legacy in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. from b6d8a12 Add TODO add 63e3ff7 Up junit as well No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-plugin-tools] branch drop-legacy updated (5176f01 -> b6d8a12)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-legacy in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. from 5176f01 Make it junit4 add b6d8a12 Add TODO No new revisions were added by this update. Summary of changes: maven-plugin-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-plugin-tools] branch drop-legacy updated (c446395 -> 5176f01)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-legacy in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. from c446395 Rollback parent change add 5176f01 Make it junit4 No new revisions were added by this update. Summary of changes: .../java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
[maven-plugin-tools] branch drop-legacy updated (e16b741 -> c446395)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-legacy in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. from e16b741 Drop legacy add c446395 Rollback parent change No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-plugin-tools] 01/01: Drop legacy
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch drop-legacy
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit e16b741b09e5817e38c517978f0c071e9a4c95d9
Author: Tamas Cservenak
AuthorDate: Thu Oct 14 14:08:52 2021 +0200
Drop legacy
Plugin used a lot of legacy code, misused Mojo test case
and used old Junit 3.x TestCase, and missed some
dependencies (junit mostly).
---
maven-plugin-plugin/pom.xml| 32 +++---
maven-plugin-tools-annotations/pom.xml | 5
maven-plugin-tools-api/pom.xml | 5
.../maven/tools/plugin/util/PluginUtilsTest.java | 4 +--
maven-plugin-tools-generators/pom.xml | 19 -
.../tools/plugin/generator/GeneratorUtilsTest.java | 14 --
maven-plugin-tools-java/pom.xml| 12
.../javadoc/JavaMojoDescriptorExtractorTest.java | 6 ++--
maven-script/maven-plugin-tools-model/pom.xml | 5
maven-script/maven-script-ant/pom.xml | 6
maven-script/maven-script-beanshell/pom.xml| 6
pom.xml| 22 +--
12 files changed, 87 insertions(+), 49 deletions(-)
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 8b37b79..d78200a 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -102,6 +102,12 @@
org.apache.maven.doxia
doxia-sink-api
${doxiaVersion}
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
org.apache.maven.doxia
@@ -123,19 +129,24 @@
org.apache.maven
maven-plugin-api
+
+ compile
org.apache.maven
maven-model
+ provided
org.apache.maven
maven-repository-metadata
${mavenVersion}
+ provided
org.apache.maven
maven-artifact
+ provided
@@ -151,19 +162,13 @@
plexus-utils
- org.sonatype.sisu
- sisu-inject-plexus
- 1.4.2
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
+ provided
org.codehaus.plexus
plexus-velocity
-
-
- velocity
- velocity
-
-
@@ -172,7 +177,14 @@
plexus-build-api
0.0.7
-
+
+
+
+ junit
+ junit
+ test
+
+
org.apache.maven.plugin-tools
diff --git a/maven-plugin-tools-annotations/pom.xml
b/maven-plugin-tools-annotations/pom.xml
index 92c9de8..1a9e3ec 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -76,11 +76,6 @@
- org.sonatype.sisu
- sisu-inject-plexus
- 1.4.2
-
-
org.codehaus.plexus
plexus-archiver
diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index 36eac5e..78cffce 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -61,11 +61,6 @@
org.codehaus.plexus
plexus-utils
-
- org.sonatype.sisu
- sisu-inject-plexus
- 1.4.2
-
diff --git
a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
index a5c740b..5b94fd1 100644
---
a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
+++
b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java
@@ -19,14 +19,14 @@ package org.apache.maven.tools.plugin.util;
* under the License.
*/
+import junit.framework.TestCase;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
/**
* @author jdcasey
*/
public class PluginUtilsTest
-extends AbstractMojoTestCase
+extends TestCase
{
public void testShouldTrimArtifactIdToFindPluginId()
{
diff --git a/maven-plugin-tools-generators/pom.xml
b/maven-plugin-tools-generators/pom.xml
index b854127..e784974 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -62,12 +62,6 @@
org.codehaus.plexus
plexus-velocity
-
-
- velocity
- velocity
-
-
@@ -94,10 +88,21 @@
+ junit
+ junit
+ test
+
+
org.apache.maven.reporting
maven-reporting-impl
- 2.1
+ 3.0.0
test
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
org.apache.maven.plugin-testing
diff --git
[maven-plugin-tools] branch drop-legacy created (now e16b741)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-legacy in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. at e16b741 Drop legacy This branch includes the following new commits: new e16b741 Drop legacy The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-plugin-tools] branch master updated: Update ITs (#41)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git The following commit(s) were added to refs/heads/master by this push: new 02af518 Update ITs (#41) 02af518 is described below commit 02af518cb18c2a37db187084f329f3872447384f Author: Tamas Cservenak AuthorDate: Thu Oct 14 14:04:34 2021 +0200 Update ITs (#41) They used ancient maven API and expect things to be on classpath, that is not the case anymore. Changed fixed mvn version to param, and added maven-core as dependency as the class is in maven-core. --- .../src/it/annotation-with-inheritance-reactor/pom.xml | 7 ++- maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml | 7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml index ad37af0..a4236d2 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml @@ -42,7 +42,12 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ + + + org.apache.maven + maven-core + @mavenVersion@ org.apache.maven.plugin-tools diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml index 4921b29..3cb72fe 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml @@ -43,7 +43,12 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ + + + org.apache.maven + maven-core + @mavenVersion@ org.apache.maven
[maven-plugin-tools] 01/01: Update ITs
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch fix-its in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git commit 1f75062b8f9ae35634c305037ee541700c2c28d1 Author: Tamas Cservenak AuthorDate: Thu Oct 14 12:52:46 2021 +0200 Update ITs They used ancient maven API and expect things to be on classpath, that is not the case anymore. Changed fixed mvn version to param, and added maven-core as dependency as the class is in maven-core. --- .../src/it/annotation-with-inheritance-reactor/pom.xml | 7 ++- maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml | 7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml index ad37af0..a4236d2 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/pom.xml @@ -42,7 +42,12 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ + + + org.apache.maven + maven-core + @mavenVersion@ org.apache.maven.plugin-tools diff --git a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml index 4921b29..3cb72fe 100644 --- a/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml +++ b/maven-plugin-plugin/src/it/annotation-with-inheritance/pom.xml @@ -43,7 +43,12 @@ under the License. org.apache.maven maven-plugin-api - 2.0 + @mavenVersion@ + + + org.apache.maven + maven-core + @mavenVersion@ org.apache.maven
[maven-plugin-tools] branch fix-its created (now 1f75062)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch fix-its in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. at 1f75062 Update ITs This branch includes the following new commits: new 1f75062 Update ITs The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-parent] branch reshuffle-dep-mgmt created (now c6461f6)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch reshuffle-dep-mgmt in repository https://gitbox.apache.org/repos/asf/maven-parent.git. at c6461f6 Reshuffle depMgmt No new revisions were added by this update.
[maven-parent] branch drop-legacy-dependencies-profile updated (9158df6 -> 3eca81a)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-legacy-dependencies-profile in repository https://gitbox.apache.org/repos/asf/maven-parent.git. from 9158df6 Drop legacy profile add 3eca81a Make possible to mark module as not included in this check No new revisions were added by this update. Summary of changes: pom.xml | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-)
[maven-parent] 01/01: Drop legacy profile
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch drop-legacy-dependencies-profile in repository https://gitbox.apache.org/repos/asf/maven-parent.git commit 9158df60ea694250ef7bf878b81906cd177e3b60 Author: Tamas Cservenak AuthorDate: Thu Oct 14 11:03:53 2021 +0200 Drop legacy profile A "helper" profile that is meant to help for downstream projects to ensure they are not depending on anything legacy, so to say that they are future-proof. --- pom.xml | 48 1 file changed, 48 insertions(+) diff --git a/pom.xml b/pom.xml index 94f0fe1..2d8c9b7 100644 --- a/pom.xml +++ b/pom.xml @@ -1205,6 +1205,54 @@ under the License. + + drop-legacy-dependencies + + + +org.apache.maven.plugins +maven-enforcer-plugin + + +drop-legacy-dependencies + + enforce + + + + + + + + org.codehaus.plexus:plexus-container-default + +org.sonatype.sisu:sisu-inject-bean +org.sonatype.sisu:sisu-inject-plexus + +org.sonatype.aether:* + +org.sonatype.plexus:* + + org.apache.maven:maven-plugin-api:[,3.2.5) + + + +org.sonatype.plexus:plexus-build-api + + org.sonatype.plexus:plexus-sec-dispatcher +org.sonatype.plexus:plexus-cipher + + + + true + + + + + + + + jdk-toolchain
[maven-parent] branch drop-legacy-dependencies-profile created (now 9158df6)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch drop-legacy-dependencies-profile in repository https://gitbox.apache.org/repos/asf/maven-parent.git. at 9158df6 Drop legacy profile This branch includes the following new commits: new 9158df6 Drop legacy profile The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-parent] branch fix-enforcer updated (b23ddfe -> 54a7ea6)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch fix-enforcer in repository https://gitbox.apache.org/repos/asf/maven-parent.git. from b23ddfe Fix enforcer plugin add 54a7ea6 Actually move all to pluginMgmt No new revisions were added by this update. Summary of changes: pom.xml | 32 1 file changed, 16 insertions(+), 16 deletions(-)
[maven-parent] 01/01: Fix enforcer plugin
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a commit to branch fix-enforcer in repository https://gitbox.apache.org/repos/asf/maven-parent.git commit b23ddfe3052a9cca3b2af5c1dd551e90d97829ce Author: Tamas Cservenak AuthorDate: Thu Oct 14 10:25:05 2021 +0200 Fix enforcer plugin Enforcer as is causes that downstream in case of update POM must completely redefine plugin, thus, loosing all the benefits of parent POM pluginMgmt. Move plugin definition to pluginMgmt instead to fully define it and it's dependines in plugin section. Keep execution in plugin section. Update to latest enforcer as well. -- See for example https://github.com/apache/maven-resolver/pull/129 --- pom.xml | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 94f0fe1..92f9cce 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,6 +1104,18 @@ under the License. + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0 + + + org.codehaus.mojo + extra-enforcer-rules + 1.4 + + + @@ -1138,13 +1150,6 @@ under the License. - - -org.codehaus.mojo -extra-enforcer-rules -1.3 - - org.apache.rat
[maven-parent] branch fix-enforcer created (now b23ddfe)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch fix-enforcer in repository https://gitbox.apache.org/repos/asf/maven-parent.git. at b23ddfe Fix enforcer plugin This branch includes the following new commits: new b23ddfe Fix enforcer plugin The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-plugin-tools] branch master updated: [MPLUGIN-370] Check that Maven dependencies are provided scope (#38)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
The following commit(s) were added to refs/heads/master by this push:
new e40a388 [MPLUGIN-370] Check that Maven dependencies are provided
scope (#38)
e40a388 is described below
commit e40a3880bb997ea7afb8fcc29f8cff81c69b99c8
Author: Tamas Cservenak
AuthorDate: Thu Oct 14 09:57:44 2021 +0200
[MPLUGIN-370] Check that Maven dependencies are provided scope (#38)
This PR has two changes:
* removed maven-artifact from maven-plugin-annotations (to not pull in
whole artifact just for 6 constants, thay may also cause havoc if
plugin developer does NOT declare maven-artifact with proper version)
* generator mojo now yells if ANY of the core dependencies are not
in provided scope.
---
maven-plugin-annotations/pom.xml | 7 --
.../maven/plugins/annotations/ResolutionScope.java | 15 ++--
maven-plugin-plugin/pom.xml| 2 +
.../invoker.properties | 18 +
.../it/mplugin-370-maven-deps-scope-bad/pom.xml| 94 ++
.../org/apache/maven/plugin/coreit/FirstMojo.java | 53
.../mplugin-370-maven-deps-scope-bad/verify.groovy | 22 +
.../invoker.properties | 18 +
.../it/mplugin-370-maven-deps-scope-good/pom.xml | 94 ++
.../org/apache/maven/plugin/coreit/FirstMojo.java | 53
.../verify.groovy | 22 +
.../maven/plugin/plugin/AbstractGeneratorMojo.java | 47 ++-
12 files changed, 427 insertions(+), 18 deletions(-)
diff --git a/maven-plugin-annotations/pom.xml b/maven-plugin-annotations/pom.xml
index 5ba9594..2969f33 100644
--- a/maven-plugin-annotations/pom.xml
+++ b/maven-plugin-annotations/pom.xml
@@ -31,11 +31,4 @@
Maven Plugin Tools Java Annotations
Java annotations to use in Mojos
-
-
- org.apache.maven
- maven-artifact
- 3.0
-
-
diff --git
a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
index f8eaf61..e2bcd6a 100644
---
a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
+++
b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
@@ -19,12 +19,13 @@ package org.apache.maven.plugins.annotations;
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-
/**
* Dependencies resolution scopes available before
* mojo
execution.
*
+ * Important note: The {@code id} values of this enum correspond to constants
of
+ * {@code org.apache.maven.artifact.Artifact} class and MUST BE KEPT IN SYNC.
+ *
* @author Hervé Boutemy
* @since 3.0
*/
@@ -38,28 +39,28 @@ public enum ResolutionScope
* compile resolution scope
* = compile + system + provided
dependencies
*/
-COMPILE( Artifact.SCOPE_COMPILE ),
+COMPILE( "compile" ),
/**
* compile+runtime resolution scope (Maven 3 only)
* = compile + system + provided +
runtime dependencies
*/
-COMPILE_PLUS_RUNTIME( Artifact.SCOPE_COMPILE_PLUS_RUNTIME ),
+COMPILE_PLUS_RUNTIME( "compile+runtime" ),
/**
* runtime resolution scope
* = compile + runtime dependencies
*/
-RUNTIME( Artifact.SCOPE_RUNTIME ),
+RUNTIME( "runtime" ),
/**
* runtime+system resolution scope (Maven 3 only)
* = compile + system + runtime
dependencies
*/
-RUNTIME_PLUS_SYSTEM( Artifact.SCOPE_RUNTIME_PLUS_SYSTEM ),
+RUNTIME_PLUS_SYSTEM( "runtime+system" ),
/**
* test resolution scope
* = compile + system + provided +
runtime + test
* dependencies
*/
-TEST( Artifact.SCOPE_TEST );
+TEST( "test" );
private final String id;
diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index 8b37b79..19ce510 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -47,10 +47,12 @@
org.apache.maven
maven-core
+ provided
org.apache.maven
maven-compat
+ provided
org.apache.maven.plugin-tools
diff --git
a/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/invoker.properties
b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/invoker.properties
new file mode 100644
index 000..c959b53
--- /dev/null
+++
b/maven-plugin-plugin/src/it/mplugin-370-maven-deps-scope-bad/invoker.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding
[maven-gh-actions-shared] branch main created (now b5478f4)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git. at b5478f4 first commit This branch includes the following new commits: new b5478f4 first commit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-gh-actions-shared] 01/01: first commit
This is an automated email from the ASF dual-hosted git repository. olamy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git commit b5478f457f6dc2e654d9de17bb7e88b21f862807 Author: Olivier Lamy AuthorDate: Thu Oct 14 17:46:04 2021 +1000 first commit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md new file mode 100644 index 000..39fc18c --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# maven-gh-actions-shared
[maven-plugin-tools] branch mplugin-370-check-maven-dep-scope updated (49c3d30 -> 2b43ace)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch mplugin-370-check-maven-dep-scope in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. from 49c3d30 Use native newlines for console messages add 8cb102a remove jdk 7 https.protocols configuration add 2bf1277 [MPLUGIN-374] deprecate unused requiresReports flag add cf1db12 Update maven.yml add dab99ff Merge remote-tracking branch 'origin/master' into mplugin-370-check-maven-dep-scope add b1b7bda Tidy up, rename script variable for log add 2b43ace Narrow more the condition No new revisions were added by this update. Summary of changes: .github/workflows/maven.yml | 2 +- .../src/main/java/org/apache/maven/plugins/annotations/Mojo.java| 3 +++ maven-plugin-plugin/pom.xml | 1 - .../src/it/mplugin-370-maven-deps-scope-bad/verify.groovy | 6 +++--- .../src/it/mplugin-370-maven-deps-scope-good/verify.groovy | 6 +++--- .../java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java | 1 + 6 files changed, 11 insertions(+), 8 deletions(-)
