(maven-jlink-plugin) branch master updated (845b275 -> a6e3a10)
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-jlink-plugin.git
from 845b275 Bump org.junit:junit-bom from 5.10.1 to 5.10.2
add a6e3a10 [MJLINK-80] Support additional resources
No new revisions were added by this update.
Summary of changes:
pom.xml| 5
.../pom.xml| 24 +-
.../src/jlink/resources/README.md | 18 ++
.../verify.groovy | 15 ++-
.../org/apache/maven/plugins/jlink/JLinkMojo.java | 29 ++
5 files changed, 71 insertions(+), 20 deletions(-)
copy src/it/projects/{MJLINK-52_classifiers =>
MJLINK-80_additionalResources}/pom.xml (77%)
create mode 100644
src/it/projects/MJLINK-80_additionalResources/src/jlink/resources/README.md
copy src/it/projects/{MJLINK-6_allowSetJmodPath =>
MJLINK-80_additionalResources}/verify.groovy (75%)
(maven-jlink-plugin) 01/01: [MJLINK-80] Support additional resources
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJLINK-80
in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git
commit 48a0e7fd231471f6dfedbceae0ac420ee403db16
Author: Robert Scholte
AuthorDate: Fri Feb 16 15:13:39 2024 +0100
[MJLINK-80] Support additional resources
---
pom.xml| 5 ++
.../projects/MJLINK-80_additionalResources/pom.xml | 54 ++
.../src/jlink/resources/README.md | 18
.../MJLINK-80_additionalResources/verify.groovy| 29
.../org/apache/maven/plugins/jlink/JLinkMojo.java | 29
5 files changed, 135 insertions(+)
diff --git a/pom.xml b/pom.xml
index acff4da..2841799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,11 @@
commons-io
2.11.0
+
+ org.apache.maven.shared
+ maven-filtering
+ 3.3.1
+
org.mockito
mockito-core
diff --git a/src/it/projects/MJLINK-80_additionalResources/pom.xml
b/src/it/projects/MJLINK-80_additionalResources/pom.xml
new file mode 100644
index 000..c8a6c99
--- /dev/null
+++ b/src/it/projects/MJLINK-80_additionalResources/pom.xml
@@ -0,0 +1,54 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+>
+ 4.0.0
+ org.apache.maven.plugins
+ maven-jlink-plugin-mjlink-80
+ 42.0.0
+ jlink
+ Test adding extra resources
+
+9
+UTF-8
+
+
+
+
+org.apache.maven.plugins
+maven-jlink-plugin
+@project.version@
+true
+
+
+ java.base
+
+
+
+ src/jlink/resources
+
+
+
+
+
+
+
diff --git
a/src/it/projects/MJLINK-80_additionalResources/src/jlink/resources/README.md
b/src/it/projects/MJLINK-80_additionalResources/src/jlink/resources/README.md
new file mode 100644
index 000..2ebf0fe
--- /dev/null
+++
b/src/it/projects/MJLINK-80_additionalResources/src/jlink/resources/README.md
@@ -0,0 +1,18 @@
+
+
+This application has been created with the JLink tool!
\ No newline at end of file
diff --git a/src/it/projects/MJLINK-80_additionalResources/verify.groovy
b/src/it/projects/MJLINK-80_additionalResources/verify.groovy
new file mode 100644
index 000..0a05897
--- /dev/null
+++ b/src/it/projects/MJLINK-80_additionalResources/verify.groovy
@@ -0,0 +1,29 @@
+
+/*
+ * 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.zip.*;
+
+assert new File( basedir, 'target/maven-jlink/default/README.md' ).exists()
+
+def file = new File( basedir, 'target/maven-jlink-plugin-mjlink-80-42.0.0.zip')
+
+assert new ZipFile(file).getEntry('README.md')
\ No newline at end of file
diff --git a/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
b/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
index fcb57c0..a73857c 100644
--- a/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
+++ b/src/main/java/org/apache/maven/plugins/jlink/JLinkMojo.java
@@ -53,6 +53,7 @@ import java.util.Optional;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
@@ -62,6 +63,9 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.filtering.MavenResourcesExecution;
+import org.apache.maven.shared.filtering
(maven-jlink-plugin) branch MJLINK-80 created (now 48a0e7f)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MJLINK-80 in repository https://gitbox.apache.org/repos/asf/maven-jlink-plugin.git at 48a0e7f [MJLINK-80] Support additional resources This branch includes the following new commits: new 48a0e7f [MJLINK-80] Support additional resources 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-scripting-plugin) 01/01: MSCRIPTING-10: Fix page not founds
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MSCRIPTING-10 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git commit 793c17bb2c9b38d9f73dd12b9ad9755e0f2987ab Author: Robert Scholte AuthorDate: Sun Nov 26 12:43:10 2023 +0100 MSCRIPTING-10: Fix page not founds --- pom.xml | 2 +- src/site/fml/faq.fml | 9 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ba9f07..bd4f902 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins -39 +41 ../../pom/maven/maven-plugins/pom.xml diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml index 257c4d4..b576faa 100644 --- a/src/site/fml/faq.fml +++ b/src/site/fml/faq.fml @@ -25,4 +25,13 @@ under the License. xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd; id="FAQ" title="Frequently Asked Questions"> + + + General + +There are no specific questions that have been asked frequently yet. + + + + \ No newline at end of file
(maven-scripting-plugin) branch MSCRIPTING-10 created (now 793c17b)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MSCRIPTING-10 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git at 793c17b MSCRIPTING-10: Fix page not founds This branch includes the following new commits: new 793c17b MSCRIPTING-10: Fix page not founds 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-site] branch master updated: Update security.md
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-site.git The following commit(s) were added to refs/heads/master by this push: new 43b724c8 Update security.md 43b724c8 is described below commit 43b724c88c9acd453ac22e0c011f3958d75e3dc6 Author: Robert Scholte AuthorDate: Mon Sep 26 10:27:11 2022 +0200 Update security.md --- content/markdown/security.md | 18 ++ 1 file changed, 18 insertions(+) diff --git a/content/markdown/security.md b/content/markdown/security.md index 1c7c550d..db7f5f3f 100644 --- a/content/markdown/security.md +++ b/content/markdown/security.md @@ -25,6 +25,24 @@ has been fixed. For more information about reporting vulnerabilities, see the [Apache Security Team](https://www.apache.org/security/) page. +### CVE-2021-26291 Apache Maven 3.8.1 + +Severity: Medium + +Vendor: The Apache Software Foundation + +Versions Affected: + +- Apache Maven 3.6.3 and earlier + +Description: More and more repositories use HTTPS nowadays, but this hasn't always been the case. This means that Maven Central contains POMs with custom repositories that refer to a URL over HTTP. +This makes downloads via such repository a target for a MITM attack. +At the same time, developers are probably not aware that for some downloads an insecure URL is being used. +Because uploaded POMs to Maven Central are immutable, a change for Maven was required. +To solve this, we extended the mirror configuration with `` parameter, +and we added a new `external:http:*` mirror selector (like existing `external:*`), meaning "any external URL using HTTP".\ +The decision was made to block such external HTTP repositories by default: this is done by providing a mirror in the `conf/settings.xml` blocking insecure HTTP external URLs. +Note: this is a vulnerability in case you're connectioning directly to remote repositories instead of using an artifact repository manager. ### Maven Dependency, EAR, Javadoc, WAR and Plugin Plugins
[maven-javadoc-plugin] branch MJAVADOC-704 deleted (was faa88c7)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MJAVADOC-704 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git. was faa88c7 [MJAVADOC-704] Require Maven 3.3.1 for toolchains This change permanently discards the following revisions: discard faa88c7 [MJAVADOC-704] Require Maven 3.3.1 for toolchains discard e87fc10 [MJAVADOC-704] Verify logging for usage toolchain discard c987b8d [MJAVADOC-704] Javadoc plugin does not respect jdkToolchain
[maven-javadoc-plugin] branch master updated: [MJAVADOC-704] Javadoc plugin does not respect jdkToolchain
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-javadoc-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new ee4132f [MJAVADOC-704] Javadoc plugin does not respect jdkToolchain
ee4132f is described below
commit ee4132f9d0f6f412784e108305524cf3b3a3009a
Author: rfscholte
AuthorDate: Mon Jan 17 16:22:58 2022 +0100
[MJAVADOC-704] Javadoc plugin does not respect jdkToolchain
---
.../MJAVADOC-704_toolchains/invoker.properties | 19 ++
src/it/projects/MJAVADOC-704_toolchains/pom.xml| 78 ++
.../src/main/java/com/foo/MyClass.java | 25 +++
.../src/main/java/module-info.java | 22 ++
.../projects/MJAVADOC-704_toolchains/verify.groovy | 23 +++
5 files changed, 167 insertions(+)
diff --git a/src/it/projects/MJAVADOC-704_toolchains/invoker.properties
b/src/it/projects/MJAVADOC-704_toolchains/invoker.properties
new file mode 100644
index 000..2342848
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/invoker.properties
@@ -0,0 +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.toolchain.jdk.version = 11
+invoker.maven.version = 3.3.1
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-704_toolchains/pom.xml
b/src/it/projects/MJAVADOC-704_toolchains/pom.xml
new file mode 100644
index 000..08e2c40
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/pom.xml
@@ -0,0 +1,78 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+ org.apache.maven.plugins.javadoc.it
+ mjavadoc704
+ 1.0-SNAPSHOT
+
+ https://issues.apache.org/jira/browse/MJAVADOC-704
+
+
+UTF-8
+
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.6
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+3.9.0
+
+ 11
+
+11
+
+
+
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+@project.version@
+
+
+
+ jar
+
+
+
+
+ 11
+
+11
+
+
+
+
+
+
+
diff --git
a/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
new file mode 100644
index 000..7370ac0
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
@@ -0,0 +1,25 @@
+package com.foo;
+
+/*
+ * 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.
+ */
+
+public class MyClass
+{
+
+}
diff --git
a/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
new file mode 100644
index 000..45f7f3d
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for add
[maven-javadoc-plugin] branch MJAVADOC-704 updated: [MJAVADOC-704] Require Maven 3.3.1 for toolchains
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-704 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git The following commit(s) were added to refs/heads/MJAVADOC-704 by this push: new faa88c7 [MJAVADOC-704] Require Maven 3.3.1 for toolchains faa88c7 is described below commit faa88c75c3850178de12cab55d085b82e72515aa Author: rfscholte AuthorDate: Mon Jan 17 15:41:54 2022 +0100 [MJAVADOC-704] Require Maven 3.3.1 for toolchains --- src/it/projects/MJAVADOC-704_toolchains/invoker.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/it/projects/MJAVADOC-704_toolchains/invoker.properties b/src/it/projects/MJAVADOC-704_toolchains/invoker.properties index 031550f..2342848 100644 --- a/src/it/projects/MJAVADOC-704_toolchains/invoker.properties +++ b/src/it/projects/MJAVADOC-704_toolchains/invoker.properties @@ -15,4 +15,5 @@ # specific language governing permissions and limitations # under the License. -invoker.toolchain.jdk.version = 11 \ No newline at end of file +invoker.toolchain.jdk.version = 11 +invoker.maven.version = 3.3.1 \ No newline at end of file
[maven-javadoc-plugin] branch MJAVADOC-704 updated: [MJAVADOC-704] Verify logging for usage toolchain
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-704 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git The following commit(s) were added to refs/heads/MJAVADOC-704 by this push: new e87fc10 [MJAVADOC-704] Verify logging for usage toolchain e87fc10 is described below commit e87fc10b2e83a95199564c4f8772e71ed468b0a4 Author: rfscholte AuthorDate: Mon Jan 17 14:38:09 2022 +0100 [MJAVADOC-704] Verify logging for usage toolchain --- .../projects/MJAVADOC-704_toolchains/verify.groovy | 23 ++ 1 file changed, 23 insertions(+) diff --git a/src/it/projects/MJAVADOC-704_toolchains/verify.groovy b/src/it/projects/MJAVADOC-704_toolchains/verify.groovy new file mode 100644 index 000..fedfda7 --- /dev/null +++ b/src/it/projects/MJAVADOC-704_toolchains/verify.groovy @@ -0,0 +1,23 @@ +/* + * 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. + */ + +def log = new File( basedir, 'build.log').text + +assert log.count( "[INFO] Toolchain in maven-compiler-plugin: JDK" ) == 2 +assert log.count( "[INFO] Toolchain in maven-javadoc-plugin: JDK" ) == 1 \ No newline at end of file
[maven-javadoc-plugin] 01/01: [MJAVADOC-704] Javadoc plugin does not respect jdkToolchain
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-704
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit c987b8d4c127d5d7baf0bbbdd2dfcfff842908c4
Author: rfscholte
AuthorDate: Mon Jan 17 14:28:14 2022 +0100
[MJAVADOC-704] Javadoc plugin does not respect jdkToolchain
---
.../MJAVADOC-704_toolchains/invoker.properties | 18 +
src/it/projects/MJAVADOC-704_toolchains/pom.xml| 78 ++
.../src/main/java/com/foo/MyClass.java | 25 +++
.../src/main/java/module-info.java | 22 ++
4 files changed, 143 insertions(+)
diff --git a/src/it/projects/MJAVADOC-704_toolchains/invoker.properties
b/src/it/projects/MJAVADOC-704_toolchains/invoker.properties
new file mode 100644
index 000..031550f
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/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 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.toolchain.jdk.version = 11
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-704_toolchains/pom.xml
b/src/it/projects/MJAVADOC-704_toolchains/pom.xml
new file mode 100644
index 000..08e2c40
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/pom.xml
@@ -0,0 +1,78 @@
+
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+ org.apache.maven.plugins.javadoc.it
+ mjavadoc704
+ 1.0-SNAPSHOT
+
+ https://issues.apache.org/jira/browse/MJAVADOC-704
+
+
+UTF-8
+
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.6
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-compiler-plugin
+3.9.0
+
+ 11
+
+11
+
+
+
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+@project.version@
+
+
+
+ jar
+
+
+
+
+ 11
+
+11
+
+
+
+
+
+
+
diff --git
a/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
new file mode 100644
index 000..7370ac0
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/com/foo/MyClass.java
@@ -0,0 +1,25 @@
+package com.foo;
+
+/*
+ * 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.
+ */
+
+public class MyClass
+{
+
+}
diff --git
a/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
new file mode 100644
index 000..45f7f3d
--- /dev/null
+++ b/src/it/projects/MJAVADOC-704_toolchains/src/main/java/module-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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 L
[maven-javadoc-plugin] branch MJAVADOC-704 created (now c987b8d)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MJAVADOC-704 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git. at c987b8d [MJAVADOC-704] Javadoc plugin does not respect jdkToolchain This branch includes the following new commits: new c987b8d [MJAVADOC-704] Javadoc plugin does not respect jdkToolchain 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-site] branch master updated: Update guide-maven-development.apt
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-site.git
The following commit(s) were added to refs/heads/master by this push:
new 3648afc Update guide-maven-development.apt
3648afc is described below
commit 3648afceb86b0f3c9a190ccdd1f6466d00e621f1
Author: Robert Scholte
AuthorDate: Sun Jan 16 12:04:05 2022 +0100
Update guide-maven-development.apt
---
content/apt/guides/development/guide-maven-development.apt | 4
1 file changed, 4 insertions(+)
diff --git a/content/apt/guides/development/guide-maven-development.apt
b/content/apt/guides/development/guide-maven-development.apt
index 344ba55..a39eee1 100644
--- a/content/apt/guides/development/guide-maven-development.apt
+++ b/content/apt/guides/development/guide-maven-development.apt
@@ -75,6 +75,10 @@ Developing Maven
The most convenient way is to create a GitHub fork from the Git repository
you are working with.
When you have either completed an issue or just want some feedback on the
work you have done, create a pull request.
We have a couple of guidelines when submitting contributions:
+
+ * Verify the status of the <<>> branch on
{{{https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-dist-tool/job/master/site/dist-tool-master-jobs.html}Maven
CI}}.
+ If it is not SUCCCESS, then first try to figure out the problem, don't
start with your own issue yet! You can use <<>> to figure out the
problematic commit and help
+ with that committer to solve the problem.
* Create your branch from <<>>, not from a tag. Otherwise, your patch
is outdated the moment you create it and might not be applicable
to the development head.
[maven-wrapper] branch drop-cli updated (b174964 -> 4f9378d)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch drop-cli in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git. from b174964 Remove unnecessary cli code add 50c474b Fix IT new 4f9378d Merge branch 'master' into drop-cli 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. Summary of changes: maven-wrapper-plugin/src/it/projects/type_script/verify.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven-wrapper] 01/01: Merge branch 'master' into drop-cli
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch drop-cli in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git commit 4f9378db1a02bc93ef34d4e4832554903354f3d7 Merge: b174964 50c474b Author: rfscholte AuthorDate: Sat Dec 11 13:22:28 2021 +0100 Merge branch 'master' into drop-cli maven-wrapper-plugin/src/it/projects/type_script/verify.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven-wrapper] branch master updated: Fix IT
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-wrapper.git
The following commit(s) were added to refs/heads/master by this push:
new 50c474b Fix IT
50c474b is described below
commit 50c474b1ea7cfd487e141782c1bb2e8ca7d1546e
Author: rfscholte
AuthorDate: Sat Dec 11 13:15:03 2021 +0100
Fix IT
---
maven-wrapper-plugin/src/it/projects/type_script/verify.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/maven-wrapper-plugin/src/it/projects/type_script/verify.groovy
b/maven-wrapper-plugin/src/it/projects/type_script/verify.groovy
index 46a6f78..cc72df5 100644
--- a/maven-wrapper-plugin/src/it/projects/type_script/verify.groovy
+++ b/maven-wrapper-plugin/src/it/projects/type_script/verify.groovy
@@ -23,5 +23,5 @@ assert new File(basedir,'mvnw.cmd').exists()
assert !(new File(basedir,'mvnwDebug').exists())
assert !(new File(basedir,'mvnwDebug.cmd').exists())
assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
-assert new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists()
-assert new File(basedir, 'build.log').text.contains('[INFO] Unpacked bin type
wrapper distribution
org.apache.maven.wrapper:maven-wrapper-distribution:zip:bin:')
\ No newline at end of file
+assert !new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists()
+assert new File(basedir, 'build.log').text.contains('[INFO] Unpacked script
type wrapper distribution
org.apache.maven.wrapper:maven-wrapper-distribution:zip:script:')
\ No newline at end of file
[maven-wrapper] branch drop-cli created (now b174964)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch drop-cli in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git. at b174964 Remove unnecessary cli code This branch includes the following new commits: new b174964 Remove unnecessary cli code 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-wrapper] 01/01: Remove unnecessary cli code
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch drop-cli
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git
commit b1749640a83d3ba7e6c61a1daf6527719560e0fe
Author: rfscholte
AuthorDate: Sat Dec 11 13:02:05 2021 +0100
Remove unnecessary cli code
---
.../org/apache/maven/wrapper/MavenWrapperMain.java | 32 -
.../maven/wrapper/SystemPropertiesHandler.java | 77 ---
.../wrapper/cli/AbstractCommandLineConverter.java | 53 --
.../AbstractPropertiesCommandLineConverter.java| 66 --
.../wrapper/cli/CommandLineArgumentException.java | 39 --
.../maven/wrapper/cli/CommandLineConverter.java| 41 --
.../maven/wrapper/cli/CommandLineOption.java | 139 -
.../maven/wrapper/cli/CommandLineParser.java | 675 -
.../maven/wrapper/cli/ParsedCommandLine.java | 140 -
.../maven/wrapper/cli/ParsedCommandLineOption.java | 59 --
.../cli/ProjectPropertiesCommandLineConverter.java | 46 --
.../cli/SystemPropertiesCommandLineConverter.java | 46 --
.../maven/wrapper/SystemPropertiesHandlerTest.java | 71 ---
13 files changed, 1484 deletions(-)
diff --git
a/maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
b/maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
index ea5a1d7..e7a9601 100644
--- a/maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
+++ b/maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
@@ -23,12 +23,8 @@ import java.io.File;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Map;
import java.util.Properties;
-import org.apache.maven.wrapper.cli.CommandLineParser;
-import org.apache.maven.wrapper.cli.SystemPropertiesCommandLineConverter;
-
/**
* Main entry point for the Maven Wrapper, delegating wrapper execution to
{@link WrapperExecutor}.
*
@@ -58,44 +54,16 @@ public class MavenWrapperMain
{
File wrapperJar = wrapperJar();
File propertiesFile = wrapperProperties( wrapperJar );
-File rootDir = rootDir( wrapperJar );
String wrapperVersion = wrapperVersion();
Logger.info( "Apache Maven Wrapper " + wrapperVersion );
-Properties systemProperties = System.getProperties();
-systemProperties.putAll( parseSystemPropertiesFromArgs( args ) );
-
-addSystemProperties( rootDir );
-
WrapperExecutor wrapperExecutor =
WrapperExecutor.forWrapperPropertiesFile( propertiesFile, System.out );
wrapperExecutor.execute( args, new Installer( new DefaultDownloader(
"mvnw", wrapperVersion ),
new PathAssembler(
mavenUserHome() ) ),
new BootstrapMainStarter() );
}
-private static Map parseSystemPropertiesFromArgs( String[]
args )
-{
-SystemPropertiesCommandLineConverter converter = new
SystemPropertiesCommandLineConverter();
-CommandLineParser commandLineParser = new CommandLineParser();
-converter.configure( commandLineParser );
-commandLineParser.allowUnknownOptions();
-return converter.convert( commandLineParser.parse( args ) );
-}
-
-private static void addSystemProperties( File rootDir )
-{
-System.getProperties().putAll(
SystemPropertiesHandler.getSystemProperties( new File( mavenUserHome(),
-
"maven.properties" ) ) );
-System.getProperties().putAll(
SystemPropertiesHandler.getSystemProperties( new File( rootDir,
-
"maven.properties" ) ) );
-}
-
-private static File rootDir( File wrapperJar )
-{
-return wrapperJar.getParentFile().getParentFile().getParentFile();
-}
-
private static File wrapperProperties( File wrapperJar )
{
return new File( wrapperJar.getParent(),
wrapperJar.getName().replaceFirst( "\\.jar$", ".properties" ) );
diff --git
a/maven-wrapper/src/main/java/org/apache/maven/wrapper/SystemPropertiesHandler.java
b/maven-wrapper/src/main/java/org/apache/maven/wrapper/SystemPropertiesHandler.java
deleted file mode 100644
index ac45478..000
---
a/maven-wrapper/src/main/java/org/apache/maven/wrapper/SystemPropertiesHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.apache.maven.wrapper;
-
-/*
- * 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
[maven-wrapper] branch adopt-changes-maven-core deleted (was b88acc2)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch adopt-changes-maven-core in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git. was b88acc2 Apply code changes done while Maven Wrapper was module of Maven Core This change permanently discards the following revisions: discard b88acc2 Apply code changes done while Maven Wrapper was module of Maven Core
[maven-wrapper] branch master updated: Add IT for type script
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-wrapper.git
The following commit(s) were added to refs/heads/master by this push:
new 76eef35 Add IT for type script
76eef35 is described below
commit 76eef35b7d14e2f8c9c46ea1ee36682a81713066
Author: rfscholte
AuthorDate: Sat Dec 11 12:56:06 2021 +0100
Add IT for type script
---
.../src/it/projects/type_script/pom.xml| 29 ++
.../src/it/projects/type_script/test.properties| 18 ++
.../src/it/projects/type_script/verify.groovy | 27
3 files changed, 74 insertions(+)
diff --git a/maven-wrapper-plugin/src/it/projects/type_script/pom.xml
b/maven-wrapper-plugin/src/it/projects/type_script/pom.xml
new file mode 100644
index 000..ed54d55
--- /dev/null
+++ b/maven-wrapper-plugin/src/it/projects/type_script/pom.xml
@@ -0,0 +1,29 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+ org.apache.maven.plugins.it.wrapper
+ extension
+ 1.0.0-SNAPSHOT
+ pom
+
\ No newline at end of file
diff --git a/maven-wrapper-plugin/src/it/projects/type_script/test.properties
b/maven-wrapper-plugin/src/it/projects/type_script/test.properties
new file mode 100644
index 000..1821680
--- /dev/null
+++ b/maven-wrapper-plugin/src/it/projects/type_script/test.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 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.
+
+type=script
\ No newline at end of file
diff --git a/maven-wrapper-plugin/src/it/projects/type_script/verify.groovy
b/maven-wrapper-plugin/src/it/projects/type_script/verify.groovy
new file mode 100644
index 000..46a6f78
--- /dev/null
+++ b/maven-wrapper-plugin/src/it/projects/type_script/verify.groovy
@@ -0,0 +1,27 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+assert new File(basedir,'mvnw').exists()
+assert new File(basedir,'mvnw.cmd').exists()
+assert !(new File(basedir,'mvnwDebug').exists())
+assert !(new File(basedir,'mvnwDebug.cmd').exists())
+assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
+assert new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists()
+assert new File(basedir, 'build.log').text.contains('[INFO] Unpacked bin type
wrapper distribution
org.apache.maven.wrapper:maven-wrapper-distribution:zip:bin:')
\ No newline at end of file
[maven-wrapper] 01/01: Apply code changes done while Maven Wrapper was module of Maven Core
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch adopt-changes-maven-core
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git
commit b88acc28212a15f74872d1cc8b8ae3bfcf3ade30
Author: rfscholte
AuthorDate: Fri Dec 10 14:57:48 2021 +0100
Apply code changes done while Maven Wrapper was module of Maven Core
---
maven-wrapper/pom.xml | 37 +-
.../apache/maven/wrapper/BootstrapMainStarter.java | 11 +-
.../apache/maven/wrapper/DefaultDownloader.java| 88 +--
.../java/org/apache/maven/wrapper/Downloader.java | 26 +-
.../java/org/apache/maven/wrapper/Installer.java | 198 +++---
.../org/apache/maven/wrapper/MavenWrapperMain.java | 112 +---
.../org/apache/maven/wrapper/PathAssembler.java| 71 +--
.../maven/wrapper/SystemPropertiesHandler.java | 77 ---
.../apache/maven/wrapper/WrapperConfiguration.java | 2 +-
.../org/apache/maven/wrapper/WrapperExecutor.java | 50 +-
.../wrapper/cli/AbstractCommandLineConverter.java | 53 --
.../AbstractPropertiesCommandLineConverter.java| 66 --
.../wrapper/cli/CommandLineArgumentException.java | 39 --
.../maven/wrapper/cli/CommandLineConverter.java| 41 --
.../maven/wrapper/cli/CommandLineOption.java | 139 -
.../maven/wrapper/cli/CommandLineParser.java | 675 -
.../maven/wrapper/cli/ParsedCommandLine.java | 140 -
.../maven/wrapper/cli/ParsedCommandLineOption.java | 59 --
.../cli/ProjectPropertiesCommandLineConverter.java | 46 --
.../cli/SystemPropertiesCommandLineConverter.java | 46 --
.../org/apache/maven/wrapper/DownloaderTest.java | 70 ++-
.../org/apache/maven/wrapper/InstallerTest.java| 315 +-
.../apache/maven/wrapper/PathAssemblerTest.java| 180 +++---
.../maven/wrapper/SystemPropertiesHandlerTest.java | 71 ---
.../apache/maven/wrapper/WrapperExecutorTest.java | 299 -
pom.xml| 2 +-
26 files changed, 685 insertions(+), 2228 deletions(-)
diff --git a/maven-wrapper/pom.xml b/maven-wrapper/pom.xml
index 84df636..a0ae664 100644
--- a/maven-wrapper/pom.xml
+++ b/maven-wrapper/pom.xml
@@ -35,15 +35,21 @@ under the License.
+ org.junit.jupiter
+ junit-jupiter-engine
+ 5.8.0
+ test
+
+
junit
junit
4.13.2
test
-
+
org.hamcrest
- hamcrest-all
- 1.3
+ hamcrest
+ 2.2
test
@@ -52,18 +58,6 @@ under the License.
4.1.0
test
-
- commons-lang
- commons-lang
- 2.6
- test
-
-
- commons-io
- commons-io
- 2.6
- test
-
org.apache.ant
@@ -85,6 +79,19 @@ under the License.
+org.apache.maven.plugins
+maven-compiler-plugin
+
+
+default-testCompile
+
+ 8
+ 8
+
+
+
+
+
org.apache.maven.plugins
maven-enforcer-plugin
diff --git
a/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
b/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
index acc56f3..fc59058 100644
---
a/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
+++
b/maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.file.Path;
/**
* Maven starter, from a provided Maven home directory.
@@ -31,17 +32,17 @@ import java.net.URLClassLoader;
*/
public class BootstrapMainStarter
{
-public void start( String[] args, File mavenHome )
+public void start( String[] args, Path mavenHome )
throws Exception
{
-File mavenJar = findLauncherJar( mavenHome );
-URLClassLoader contextClassLoader = new URLClassLoader( new URL[] {
mavenJar.toURI().toURL() },
+Path mavenJar = findLauncherJar( mavenHome.toFile() ).toPath();
+URLClassLoader contextClassLoader = new URLClassLoader( new URL[] {
mavenJar.toUri().toURL() },
ClassLoader.getSystemClassLoader().getParent() );
Thread.currentThread().setContextClassLoader( contextClassLoader );
Class mainClass = contextClassLoader.loadClass(
"org.codehaus.plexus.classworlds.launcher.Launcher" );
-System.setProperty( "maven.home", mavenHome.getAbsolutePath() );
-System.setProperty( "classworlds.conf", new File( mavenHome,
"/bin/m2.conf" ).getAbsolutePath() );
+System.setProperty( "maven.home",
mavenHome.toAbsolutePath().toString() );
+System.setProperty( "classworlds.co
[maven-wrapper] branch adopt-changes-maven-core created (now b88acc2)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch adopt-changes-maven-core in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git. at b88acc2 Apply code changes done while Maven Wrapper was module of Maven Core This branch includes the following new commits: new b88acc2 Apply code changes done while Maven Wrapper was module of Maven Core 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-wrapper] branch stabilize deleted (was e5ff329)
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-wrapper.git. was e5ff329 Use jdk defaults for Jenkins 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-wrapper] branch master updated (d5335b7 -> e5ff329)
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-wrapper.git. from d5335b7 [MWRAPPER-34] update documentation: now Java 7 everywhere add e5ff329 Use jdk defaults for Jenkins No new revisions were added by this update. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-wrapper] 01/01: Use jdk defaults for Jenkins
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-wrapper.git commit e5ff32953d4c52c508e1dbfb596c2f49a19c5fd3 Author: rfscholte AuthorDate: Fri Dec 10 13:38:00 2021 +0100 Use jdk defaults for Jenkins --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 755ac1d..e9f05f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpPlgnBuild(jdk:['8','11','17','18']) +asfMavenTlpPlgnBuild()
[maven-wrapper] branch stabilize created (now e5ff329)
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-wrapper.git. at e5ff329 Use jdk defaults for Jenkins This branch includes the following new commits: new e5ff329 Use jdk defaults for Jenkins 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-scripting-plugin] branch MSCRIPTING-8 deleted (was 9a55c37)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MSCRIPTING-8 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git. was 9a55c37 MSCRIPTING-8: Fix JavaDoc This change permanently discards the following revisions: discard 9a55c37 MSCRIPTING-8: Fix JavaDoc discard bae2bb5 Merge branch 'MSCRIPTING-8' of https://gitbox.apache.org/repos/asf/maven-scripting-plugin into MSCRIPTING-8 discard cbbc5e8 MSCRIPTING-8: Fix JavaDoc discard 63d8d3e [MSCRIPTING-8] Support scriptResource discard 1fe9bd1 [MSCRIPTING-8] Support scriptResource
[maven-jenkins-lib] branch master updated: Generate site with both JDK 8 and 17, as they behave very differently
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new cfcdc70 Generate site with both JDK 8 and 17, as they behave very
differently
cfcdc70 is described below
commit cfcdc70bb254be482a9e809208c1c8e27194266e
Author: rfscholte
AuthorDate: Tue Dec 7 10:13:45 2021 +0100
Generate site with both JDK 8 and 17, as they behave very differently
---
vars/asfMavenTlpPlgnBuild.groovy | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index d96de6d..f6b206b 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -42,8 +42,8 @@ def call(Map params = [:]) {
// def failFast = params.containsKey('failFast') ? params.failFast : true
// Just temporarily
def failFast = false;
-def siteJdk = params.containsKey('siteJdk') ? params.siteJdk : '17'
-def siteMvn = params.containsKey('siteMvn') ? params.siteJdk : '3.6.x'
+def siteJdks = params.containsKey('siteJdk') ? params.siteJdk : ['8','17']
+def siteMvn = params.containsKey('siteMvn') ? params.siteMvn : '3.6.x'
def tmpWs = params.containsKey('tmpWs') ? params.tmpWs : false
taskContext['failFast'] = failFast;
@@ -64,8 +64,10 @@ def call(Map params = [:]) {
doCreateTask( os, jdk, mvn, tasks, first, 'build', taskContext )
}
- // doesn't work for multimodules yet
- doCreateTask( os, siteJdk, siteMvn, tasks, first, 'site', taskContext )
+ for (def jdk in siteJdks) {
+// doesn't work for multimodules yet
+doCreateTask( os, jdk, siteMvn, tasks, first, 'site', taskContext )
+ }
// run with apache-release profile, consider it a dryRun with SNAPSHOTs
// doCreateTask( os, siteJdk, siteMvn, tasks, first, 'release',
taskContext )
[maven-scripting-plugin] branch master updated: [MSCRIPTING-8] Support scriptResource
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-scripting-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 028a900 [MSCRIPTING-8] Support scriptResource
028a900 is described below
commit 028a9003433ade64782ab9c13ae5c679f003f3e3
Author: rfscholte
AuthorDate: Tue Dec 7 09:56:32 2021 +0100
[MSCRIPTING-8] Support scriptResource
---
pom.xml| 56 ++---
src/it/mrm/repository/_mscripting-8.jar| Bin 0 -> 867 bytes
.../repository/mscripting-8.jar/script.groovy} | 41 ---
.../pom.xml => mrm/repository/mscripting-8.pom}| 80 +
src/it/{ => mrm}/settings.xml | 27 -
.../{ => projects}/groovy-script-file-name/pom.xml | 0
.../groovy-script-file-name/test.groov | 0
src/it/{ => projects}/groovy-script-file/pom.xml | 0
.../{ => projects}/groovy-script-file/test.groovy | 0
.../groovy-script-resource}/pom.xml| 107 +
src/it/{ => projects}/groovy-script/pom.xml| 0
.../apache/maven/plugins/scripting/EvalMojo.java | 13 ++-
.../plugins/scripting/ResourceScriptEvaluator.java | 128 +
src/site/markdown/usage.md.vm | 29 -
14 files changed, 332 insertions(+), 149 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13fb174..1b90110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,25 +121,47 @@ under the License.
run-its
-
-
-
- org.apache.maven.plugins
- maven-invoker-plugin
-
-src/it
-
${project.build.directory}/it
-setup
-verify
-
${project.build.directory}/local-repo
-src/it/settings.xml
+
+
+org.apache.maven.plugins
+maven-invoker-plugin
+
+ src/it/projects
+ ${project.build.directory}/it
+ setup
+ verify
+
${project.build.directory}/local-repo
+ src/it/mrm/settings.xml
+
+${mrm.repository.url}
+
+
+scripting:eval
+
+
+
+
+org.codehaus.mojo
+mrm-maven-plugin
+1.3.0
+
+
- scripting:eval
+ start
+ stop
-
-
-
-
+
+
+
+
+
+ src/it/mrm/repository
+
+
+
+
+
+
diff --git a/src/it/mrm/repository/_mscripting-8.jar
b/src/it/mrm/repository/_mscripting-8.jar
new file mode 100644
index 000..4bc8711
Binary files /dev/null and b/src/it/mrm/repository/_mscripting-8.jar differ
diff --git a/src/it/groovy-script-file/test.groovy
b/src/it/mrm/repository/mscripting-8.jar/script.groovy
similarity index 92%
copy from src/it/groovy-script-file/test.groovy
copy to src/it/mrm/repository/mscripting-8.jar/script.groovy
index 94d935c..a77c5f8 100644
--- a/src/it/groovy-script-file/test.groovy
+++ b/src/it/mrm/repository/mscripting-8.jar/script.groovy
@@ -1,21 +1,20 @@
-/*
- * 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.
- */
-
-
-(1..10).sum() + ' ' + project.artifactId
\ 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/license
[maven-scripting-plugin] branch MSCRIPTING-8 updated: MSCRIPTING-8: Fix JavaDoc
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MSCRIPTING-8 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git The following commit(s) were added to refs/heads/MSCRIPTING-8 by this push: new 9a55c37 MSCRIPTING-8: Fix JavaDoc 9a55c37 is described below commit 9a55c37375b6e5dc0a8f1d043f2fe02d5b4f8e36 Author: rfscholte AuthorDate: Tue Dec 7 08:58:43 2021 +0100 MSCRIPTING-8: Fix JavaDoc --- .../org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java b/src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java index 8a517ab..5321226 100644 --- a/src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java +++ b/src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java @@ -31,8 +31,9 @@ import javax.script.ScriptEngineManager; import javax.script.ScriptException; /** - * Evaluates a script held in a resource. Use the engine name to override the engine if the file name does not refer/decode - * to a valid engine name or not define any at all. + * Evaluates a script held in a resource. Use the engine name to override the engine if the resource name does not + * refer/decode to a valid engine name or not define any at all. + * * @author Robert Scholte */ public class ResourceScriptEvaluator extends AbstractScriptEvaluator
[maven-scripting-plugin] 02/03: MSCRIPTING-8: Fix JavaDoc
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSCRIPTING-8
in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git
commit cbbc5e8ab117bf9a7427adf9efd3636ff95a13fe
Author: rfscholte
AuthorDate: Mon Dec 6 23:37:54 2021 +0100
MSCRIPTING-8: Fix JavaDoc
---
.../org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java
b/src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java
index 13d537f..8a517ab 100644
---
a/src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java
+++
b/src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java
@@ -31,7 +31,7 @@ import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
/**
- * Evaluates a script held in a file. Use the engine name to override the
engine if the file name does not refer/decode
+ * Evaluates a script held in a resource. Use the engine name to override the
engine if the file name does not refer/decode
* to a valid engine name or not define any at all.
* @author Robert Scholte
*/
@@ -50,7 +50,7 @@ public class ResourceScriptEvaluator extends
AbstractScriptEvaluator
/**
* @param engineName optional engine name, used to override the engine
selection from the file extension
- * @param scriptFile not null
+ * @param resourceName not null
*/
public ResourceScriptEvaluator( String engineName, String resourceName )
{
[maven-scripting-plugin] 01/03: [MSCRIPTING-8] Support scriptResource
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSCRIPTING-8
in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git
commit 63d8d3e398d8c58511840a651e7efca488d6a757
Author: rfscholte
AuthorDate: Mon Dec 6 20:56:23 2021 +0100
[MSCRIPTING-8] Support scriptResource
---
pom.xml| 56 ++---
src/it/mrm/repository/_mscripting-8.jar| Bin 0 -> 867 bytes
.../repository/mscripting-8.jar/script.groovy} | 41 ---
.../pom.xml => mrm/repository/mscripting-8.pom}| 80 +
src/it/{ => mrm}/settings.xml | 27 -
.../{ => projects}/groovy-script-file-name/pom.xml | 0
.../groovy-script-file-name/test.groov | 0
src/it/{ => projects}/groovy-script-file/pom.xml | 0
.../{ => projects}/groovy-script-file/test.groovy | 0
.../groovy-script-resource}/pom.xml| 107 -
src/it/{ => projects}/groovy-script/pom.xml| 0
.../apache/maven/plugins/scripting/EvalMojo.java | 13 ++-
.../plugins/scripting/ResourceScriptEvaluator.java | 127 +
src/site/markdown/usage.md.vm | 29 -
14 files changed, 331 insertions(+), 149 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13fb174..1b90110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,25 +121,47 @@ under the License.
run-its
-
-
-
- org.apache.maven.plugins
- maven-invoker-plugin
-
-src/it
-
${project.build.directory}/it
-setup
-verify
-
${project.build.directory}/local-repo
-src/it/settings.xml
+
+
+org.apache.maven.plugins
+maven-invoker-plugin
+
+ src/it/projects
+ ${project.build.directory}/it
+ setup
+ verify
+
${project.build.directory}/local-repo
+ src/it/mrm/settings.xml
+
+${mrm.repository.url}
+
+
+scripting:eval
+
+
+
+
+org.codehaus.mojo
+mrm-maven-plugin
+1.3.0
+
+
- scripting:eval
+ start
+ stop
-
-
-
-
+
+
+
+
+
+ src/it/mrm/repository
+
+
+
+
+
+
diff --git a/src/it/mrm/repository/_mscripting-8.jar
b/src/it/mrm/repository/_mscripting-8.jar
new file mode 100644
index 000..4bc8711
Binary files /dev/null and b/src/it/mrm/repository/_mscripting-8.jar differ
diff --git a/src/it/groovy-script-file/test.groovy
b/src/it/mrm/repository/mscripting-8.jar/script.groovy
similarity index 92%
copy from src/it/groovy-script-file/test.groovy
copy to src/it/mrm/repository/mscripting-8.jar/script.groovy
index 94d935c..a77c5f8 100644
--- a/src/it/groovy-script-file/test.groovy
+++ b/src/it/mrm/repository/mscripting-8.jar/script.groovy
@@ -1,21 +1,20 @@
-/*
- * 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.
- */
-
-
-(1..10).sum() + ' ' + project.artifactId
\ 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
[maven-scripting-plugin] 03/03: Merge branch 'MSCRIPTING-8' of https://gitbox.apache.org/repos/asf/maven-scripting-plugin into MSCRIPTING-8
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MSCRIPTING-8 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git commit bae2bb5eca56b80207ab91fb9d9845b8d02a4017 Merge: cbbc5e8 1fe9bd1 Author: rfscholte AuthorDate: Mon Dec 6 23:39:04 2021 +0100 Merge branch 'MSCRIPTING-8' of https://gitbox.apache.org/repos/asf/maven-scripting-plugin into MSCRIPTING-8 # Conflicts: # src/main/java/org/apache/maven/plugins/scripting/ResourceScriptEvaluator.java
[maven-scripting-plugin] branch MSCRIPTING-8 updated (1fe9bd1 -> bae2bb5)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MSCRIPTING-8 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git. from 1fe9bd1 [MSCRIPTING-8] Support scriptResource add 314fd6e [MSCRIPTING-6] add missing download page new 63d8d3e [MSCRIPTING-8] Support scriptResource new cbbc5e8 MSCRIPTING-8: Fix JavaDoc new bae2bb5 Merge branch 'MSCRIPTING-8' of https://gitbox.apache.org/repos/asf/maven-scripting-plugin into MSCRIPTING-8 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../plugins/scripting/ResourceScriptEvaluator.java | 4 +- src/site/xdoc/download.xml.vm | 126 + 2 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 src/site/xdoc/download.xml.vm
[maven-scripting-plugin] 01/01: [MSCRIPTING-8] Support scriptResource
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSCRIPTING-8
in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git
commit 1fe9bd1ab1cb7f53d41ceaf92d6e5942adeec2fe
Author: rfscholte
AuthorDate: Mon Dec 6 20:56:23 2021 +0100
[MSCRIPTING-8] Support scriptResource
---
pom.xml| 56 ++---
src/it/mrm/repository/_mscripting-8.jar| Bin 0 -> 867 bytes
.../repository/mscripting-8.jar/script.groovy} | 41 ---
.../pom.xml => mrm/repository/mscripting-8.pom}| 80 +
src/it/{ => mrm}/settings.xml | 27 -
.../{ => projects}/groovy-script-file-name/pom.xml | 0
.../groovy-script-file-name/test.groov | 0
src/it/{ => projects}/groovy-script-file/pom.xml | 0
.../{ => projects}/groovy-script-file/test.groovy | 0
.../groovy-script-resource}/pom.xml| 107 -
src/it/{ => projects}/groovy-script/pom.xml| 0
.../apache/maven/plugins/scripting/EvalMojo.java | 13 ++-
.../plugins/scripting/ResourceScriptEvaluator.java | 127 +
src/site/markdown/usage.md.vm | 29 -
14 files changed, 331 insertions(+), 149 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13fb174..1b90110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,25 +121,47 @@ under the License.
run-its
-
-
-
- org.apache.maven.plugins
- maven-invoker-plugin
-
-src/it
-
${project.build.directory}/it
-setup
-verify
-
${project.build.directory}/local-repo
-src/it/settings.xml
+
+
+org.apache.maven.plugins
+maven-invoker-plugin
+
+ src/it/projects
+ ${project.build.directory}/it
+ setup
+ verify
+
${project.build.directory}/local-repo
+ src/it/mrm/settings.xml
+
+${mrm.repository.url}
+
+
+scripting:eval
+
+
+
+
+org.codehaus.mojo
+mrm-maven-plugin
+1.3.0
+
+
- scripting:eval
+ start
+ stop
-
-
-
-
+
+
+
+
+
+ src/it/mrm/repository
+
+
+
+
+
+
diff --git a/src/it/mrm/repository/_mscripting-8.jar
b/src/it/mrm/repository/_mscripting-8.jar
new file mode 100644
index 000..4bc8711
Binary files /dev/null and b/src/it/mrm/repository/_mscripting-8.jar differ
diff --git a/src/it/groovy-script-file/test.groovy
b/src/it/mrm/repository/mscripting-8.jar/script.groovy
similarity index 92%
copy from src/it/groovy-script-file/test.groovy
copy to src/it/mrm/repository/mscripting-8.jar/script.groovy
index 94d935c..a77c5f8 100644
--- a/src/it/groovy-script-file/test.groovy
+++ b/src/it/mrm/repository/mscripting-8.jar/script.groovy
@@ -1,21 +1,20 @@
-/*
- * 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.
- */
-
-
-(1..10).sum() + ' ' + project.artifactId
\ 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
[maven-scripting-plugin] branch MSCRIPTING-8 created (now 1fe9bd1)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MSCRIPTING-8 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git. at 1fe9bd1 [MSCRIPTING-8] Support scriptResource This branch includes the following new commits: new 1fe9bd1 [MSCRIPTING-8] Support scriptResource 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-scripting-plugin] branch MSCRIPTING-5 deleted (was 02e4621)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MSCRIPTING-5 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git. was 02e4621 [MSCRIPTING-5] Links on about page not working 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-scripting-plugin] branch master updated (c8b9b7b -> 02e4621)
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-scripting-plugin.git.
from c8b9b7b update CI url
add 02e4621 [MSCRIPTING-5] Links on about page not working
No new revisions were added by this update.
Summary of changes:
.../{markdown/script-context.md => fml/faq.fml}| 14 ++-
src/site/markdown/index.md.vm | 8 +-
.../pom.xml => site/markdown/usage.md.vm} | 127 -
3 files changed, 85 insertions(+), 64 deletions(-)
copy src/site/{markdown/script-context.md => fml/faq.fml} (67%)
copy src/{it/groovy-script/pom.xml => site/markdown/usage.md.vm} (52%)
[maven-scripting-plugin] branch MSCRIPTING-5 created (now 02e4621)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MSCRIPTING-5 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git. at 02e4621 [MSCRIPTING-5] Links on about page not working This branch includes the following new commits: new 02e4621 [MSCRIPTING-5] Links on about page not working 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-scripting-plugin] 01/01: [MSCRIPTING-5] Links on about page not working
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSCRIPTING-5
in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git
commit 02e462130d300ef04aba10d4d5cd01c217621fab
Author: rfscholte
AuthorDate: Mon Dec 6 19:57:32 2021 +0100
[MSCRIPTING-5] Links on about page not working
---
src/site/fml/faq.fml | 28 +
src/site/markdown/index.md.vm | 8 ++---
src/site/markdown/usage.md.vm | 72 +++
3 files changed, 104 insertions(+), 4 deletions(-)
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
new file mode 100644
index 000..257c4d4
--- /dev/null
+++ b/src/site/fml/faq.fml
@@ -0,0 +1,28 @@
+
+
+
+
+
+http://maven.apache.org/FML/1.0.1;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0.1
http://maven.apache.org/xsd/fml-1.0.1.xsd;
+ id="FAQ" title="Frequently Asked Questions">
+
+
\ No newline at end of file
diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm
index 705ae37..598af0d 100644
--- a/src/site/markdown/index.md.vm
+++ b/src/site/markdown/index.md.vm
@@ -34,18 +34,18 @@ Usage
[usage page](./usage.html).
In case you still have questions regarding the plugin's usage, please have a
look at the
- [FAQ](./faq.html) and feel free to contact the [user mailing
list](./mail-lists.html).
+ [FAQ](./faq.html) and feel free to contact the [user mailing
list](./mailing-lists.html).
The posts to the mailing list are archived and could already contain the
answer to your
question as part of an older thread. Hence, it is also worth
browsing/searching
- the [mail archive](./mail-lists.html).
+ the [mail archive](./mailing-lists.html).
If you feel like the plugin is missing a feature or has a defect, you can
fill a
- feature request or bug report in our [issue tracker](./issue-tracking.html).
+ feature request or bug report in our [issue
tracker](./issue-management.html).
When creating a new issue, please provide a comprehensive description of your
concern. Especially for fixing bugs it is crucial that the developers can
reproduce your problem. For this reason, entire debug logs, POMs or most
preferably little demo projects attached to the issue are very much
appreciated.
Of course, patches are welcome, too. Contributors can check out the project
from
- our [source repository](./source-repository.html) and will find
supplementary
+ our [source repository](./scm.html) and will find supplementary
information in the
[guide to helping with
Maven](http://maven.apache.org/guides/development/guide-helping.html).
diff --git a/src/site/markdown/usage.md.vm b/src/site/markdown/usage.md.vm
new file mode 100644
index 000..809bc10
--- /dev/null
+++ b/src/site/markdown/usage.md.vm
@@ -0,0 +1,72 @@
+# Apache Maven Scripting Plugin
+
+
+Usage
+-
+
+This plugin contains generic code to evaluate any script that supports JSR223.
+It is a matter of adding the right dependency and configure the script to
evaluate.
+
+Inline script
+
+Use the script-tag to specify your script. Make sure you also define the
engineName.
+
+
+org.apache.maven.plugins
+maven-scripting-plugin
+${project.version}
+
+ groovy
+
+ <![CDATA[
+// your groovy script
+ ]]>
+
+
+
+
+
+org.codehaus.groovy
+groovy-jsr223
+2.4.7
+
+
+
+
+Script from File
+
+Use the scriptFile-tag to refer to your script. The engine is based on the
file-extension, but can be specified using the engineName-tag.
+
+
+org.apache.maven.plugins
+maven-scripting-plugin
+${project.version}
+
+ path/to/script.groovy
+
+
+
+
+org.codehaus.groovy
+groovy-jsr223
+2.4.7
+
+
+
\ No newline at end of file
[maven-release] branch master updated: [MRELEASE-1053] scm element removed during release:prepare when parent != reactor root
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-release.git
The following commit(s) were added to refs/heads/master by this push:
new 67dc2f8 [MRELEASE-1053] scm element removed during release:prepare
when parent != reactor root
67dc2f8 is described below
commit 67dc2f854e01ec33d0dbc021305ac99f5472ecce
Author: Konrad Windszus
AuthorDate: Sun Dec 5 14:03:49 2021 +0100
[MRELEASE-1053] scm element removed during release:prepare when parent !=
reactor root
Signed-off-by: rfscholte
---
.../prepare/MRELEASE-1053/module-a/pom.xml | 39 ++
.../apache/maven/plugin/release/module/a/App.java | 32
.../maven/plugin/release/module/a/AppTest.java | 57 +
.../prepare/MRELEASE-1053/module-parent/pom.xml| 59 ++
.../src/it/projects/prepare/MRELEASE-1053/pom.xml | 37 ++
.../projects/prepare/MRELEASE-1053/verify.groovy | 31
.../plugins/release/AbstractScmReleaseMojo.java| 2 +-
7 files changed, 256 insertions(+), 1 deletion(-)
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
new file mode 100644
index 000..522ad94
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
@@ -0,0 +1,39 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+org.apache.maven.plugin.release
+mrelease-1053-parent
+1.0-SNAPSHOT
+../module-parent/pom.xml
+
+ org.apache.maven.plugin.release
+ module-a
+ 1.0-SNAPSHOT
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
new file mode 100644
index 000..05ca6ec
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
@@ -0,0 +1,32 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+public static void main( String[] args )
+{
+System.out.println( "Hello World!" );
+}
+}
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
new file mode 100644
index 000..ca41b5f
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
@@ -0,0 +1,57 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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
[maven-release] 01/01: - Populate scm info from all modules
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-1053
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 0fc4d64970ae0bfe0a719369be9f450a999d7ae7
Author: Konrad Windszus
AuthorDate: Fri Nov 5 17:37:36 2021 +0100
- Populate scm info from all modules
Previously scm information was only detected in execution root
---
.../prepare/MRELEASE-1053/module-a/pom.xml | 39 ++
.../apache/maven/plugin/release/module/a/App.java | 32
.../maven/plugin/release/module/a/AppTest.java | 57 +
.../prepare/MRELEASE-1053/module-parent/pom.xml| 59 ++
.../src/it/projects/prepare/MRELEASE-1053/pom.xml | 37 ++
.../projects/prepare/MRELEASE-1053/verify.groovy | 31
.../plugins/release/AbstractScmReleaseMojo.java| 2 +-
7 files changed, 256 insertions(+), 1 deletion(-)
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
new file mode 100644
index 000..522ad94
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
@@ -0,0 +1,39 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+org.apache.maven.plugin.release
+mrelease-1053-parent
+1.0-SNAPSHOT
+../module-parent/pom.xml
+
+ org.apache.maven.plugin.release
+ module-a
+ 1.0-SNAPSHOT
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
new file mode 100644
index 000..05ca6ec
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
@@ -0,0 +1,32 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+public static void main( String[] args )
+{
+System.out.println( "Hello World!" );
+}
+}
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
new file mode 100644
index 000..ca41b5f
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
@@ -0,0 +1,57 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+extends TestCase
+{
+/**
+ * Create the test case
+ *
+
[maven-release] branch MRELEASE-1053 created (now 0fc4d64)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1053 in repository https://gitbox.apache.org/repos/asf/maven-release.git. at 0fc4d64 - Populate scm info from all modules This branch includes the following new commits: new 0fc4d64 - Populate scm info from all modules 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-release] branch MRELEASE-1053 deleted (was cd06dc5)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1053 in repository https://gitbox.apache.org/repos/asf/maven-release.git. was cd06dc5 - Populate scm info from all modules This change permanently discards the following revisions: discard cd06dc5 - Populate scm info from all modules
[maven-release] 01/01: - Populate scm info from all modules
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-1053
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit cd06dc50057e79823b0ff7d582123450479d48ba
Author: Konrad Windszus
AuthorDate: Fri Nov 5 17:37:36 2021 +0100
- Populate scm info from all modules
Previously scm information was only detected in execution root
---
.../prepare/MRELEASE-1053/module-a/pom.xml | 39 ++
.../apache/maven/plugin/release/module/a/App.java | 32
.../maven/plugin/release/module/a/AppTest.java | 57 +
.../prepare/MRELEASE-1053/module-parent/pom.xml| 59 ++
.../src/it/projects/prepare/MRELEASE-1053/pom.xml | 37 ++
.../projects/prepare/MRELEASE-1053/verify.groovy | 31
.../plugins/release/AbstractScmReleaseMojo.java| 2 +-
7 files changed, 256 insertions(+), 1 deletion(-)
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
new file mode 100644
index 000..19b6018
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+org.apache.maven.plugin.release
+mrelease-1053-parent
+1.0-SNAPSHOT
+../module-parent/pom.xml
+
+ 4.0.0
+ org.apache.maven.plugin.release
+ module-a
+ 1.0-SNAPSHOT
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
new file mode 100644
index 000..05ca6ec
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
@@ -0,0 +1,32 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+public static void main( String[] args )
+{
+System.out.println( "Hello World!" );
+}
+}
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
new file mode 100644
index 000..ca41b5f
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
@@ -0,0 +1,57 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+extends TestCase
+{
+/**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+public AppTest( String testName )
+{
+super( testName );
+}
+
+/**
+ * @return the suite of tests b
[maven-release] branch MRELEASE-1053 created (now cd06dc5)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1053 in repository https://gitbox.apache.org/repos/asf/maven-release.git. at cd06dc5 - Populate scm info from all modules This branch includes the following new commits: new cd06dc5 - Populate scm info from all modules 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-release] branch MRELEASE-1053 deleted (was 5b8a82e)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1053 in repository https://gitbox.apache.org/repos/asf/maven-release.git. was 5b8a82e - Populate scm info from all modules This change permanently discards the following revisions: discard 5b8a82e - Populate scm info from all modules
[maven-release] 01/01: - Populate scm info from all modules
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-1053
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 5b8a82e6c014c4f38b0e8663f42e47ddf43532fb
Author: Konrad Windszus
AuthorDate: Fri Nov 5 17:37:36 2021 +0100
- Populate scm info from all modules
Previously scm information was only detected in execution root
---
.../prepare/MRELEASE-1053/module-a/pom.xml | 39 ++
.../apache/maven/plugin/release/module/a/App.java | 32
.../maven/plugin/release/module/a/AppTest.java | 57 +
.../prepare/MRELEASE-1053/module-parent/pom.xml| 59 ++
.../src/it/projects/prepare/MRELEASE-1053/pom.xml | 37 ++
.../projects/prepare/MRELEASE-1053/verify.groovy | 31
.../plugins/release/AbstractScmReleaseMojo.java| 2 +-
7 files changed, 256 insertions(+), 1 deletion(-)
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
new file mode 100644
index 000..19b6018
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/pom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+org.apache.maven.plugin.release
+mrelease-1053-parent
+1.0-SNAPSHOT
+../module-parent/pom.xml
+
+ 4.0.0
+ org.apache.maven.plugin.release
+ module-a
+ 1.0-SNAPSHOT
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
new file mode 100644
index 000..05ca6ec
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/main/java/org/apache/maven/plugin/release/module/a/App.java
@@ -0,0 +1,32 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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.
+ */
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+public static void main( String[] args )
+{
+System.out.println( "Hello World!" );
+}
+}
diff --git
a/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
new file mode 100644
index 000..ca41b5f
--- /dev/null
+++
b/maven-release-plugin/src/it/projects/prepare/MRELEASE-1053/module-a/src/test/java/org/apache/maven/plugin/release/module/a/AppTest.java
@@ -0,0 +1,57 @@
+package org.apache.maven.plugin.release.module.a;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+extends TestCase
+{
+/**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+public AppTest( String testName )
+{
+super( testName );
+}
+
+/**
+ * @return the suite of tests b
[maven-release] branch MRELEASE-1053 created (now 5b8a82e)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1053 in repository https://gitbox.apache.org/repos/asf/maven-release.git. at 5b8a82e - Populate scm info from all modules This branch includes the following new commits: new 5b8a82e - Populate scm info from all modules 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-site] branch master updated: Maven Shared Resources 4
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-site.git
The following commit(s) were added to refs/heads/master by this push:
new cf1681a Maven Shared Resources 4
cf1681a is described below
commit cf1681a945a6ddef230f1c1a2076dbdb20132de5
Author: Robert Scholte
AuthorDate: Fri Oct 15 15:26:49 2021 +0200
Maven Shared Resources 4
---
content/apt/shared/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/shared/index.apt b/content/apt/shared/index.apt
index e053a1c..5061d01 100644
--- a/content/apt/shared/index.apt
+++ b/content/apt/shared/index.apt
@@ -69,7 +69,7 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-shared-jar/} <<>>}} |
1.2 | 2015-12-31| Utilities which help identify the contents
of a JAR, including Java class analysis and Maven metadata analysis. |
{{{https://gitbox.apache.org/repos/asf/maven-shared-jar.git}Git}} /
{{{https://github.com/apache/maven-shared-jar/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-shared-jar}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-shared-resources/} <<>>}} |
3| 2021-01-10| This is a collection of templates that are
specific to the Maven project. |
{{{https://gitbox.apache.org/repos/asf/maven-shared-resources.git}Git}} /
{{{https://github.com/apache/maven-shared-resources/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-shared-resources}JIRA}}
+| {{{/shared/maven-shared-resources/} <<>>}} |
4| 2021-10-12| This is a collection of templates that are
specific to the Maven project. |
{{{https://gitbox.apache.org/repos/asf/maven-shared-resources.git}Git}} /
{{{https://github.com/apache/maven-shared-resources/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-shared-resources}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-shared-utils/} <<>>}} |
3.3.4| 2021-04-30| Utilities functions for use within Maven. |
{{{https://gitbox.apache.org/repos/asf/maven-shared-utils.git}Git}} /
{{{https://github.com/apache/maven-shared-utils/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-shared-utils}JIRA}}
*+--+---+--++-+
[maven-help-plugin] branch master updated (58041c7 -> e74888b)
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-help-plugin.git.
from 58041c7 Dependabot should ignore Maven APIs/SPIs
add e74888b Introduce mock repository manager
No new revisions were added by this update.
Summary of changes:
pom.xml| 42 ++
src/it/{ => mrm}/settings.xml | 15 ++--
.../active-profiles/invoker.properties | 0
.../{system => projects/active-profiles}/pom.xml | 0
.../{ => projects}/active-profiles/verify.groovy | 0
.../active-profiles_multimodule/invoker.properties | 0
.../active-profiles_multimodule/module/pom.xml | 0
.../active-profiles_multimodule/pom.xml| 0
.../active-profiles_multimodule/verify.groovy | 0
.../all-profiles-parent-pom/child/pom.xml | 0
.../all-profiles-parent-pom}/invoker.properties| 0
.../{ => projects}/all-profiles-parent-pom/pom.xml | 0
.../all-profiles-parent-pom/verify.groovy | 0
.../all-profiles}/invoker.properties | 0
src/it/{ => projects}/all-profiles/pom.xml | 0
src/it/{ => projects}/all-profiles/verify.groovy | 0
.../describe-cmd-invalid}/invoker.properties | 0
.../describe-cmd-invalid}/pom.xml | 0
.../describe-cmd-invalid/test.properties | 0
.../invoker.properties | 0
.../describe-cmd-with-goal-invalid}/pom.xml| 0
.../describe-cmd-with-goal-invalid/test.properties | 0
.../invoker.properties | 0
.../describe-cmd-with-goal-report/pom.xml | 0
.../describe-cmd-with-goal-report/verify.groovy| 0
.../describe-cmd-with-goal}/invoker.properties | 0
.../describe-cmd-with-goal}/pom.xml| 0
.../describe-cmd-with-goal/test.properties | 0
.../describe-cmd-with-goal/verify.groovy | 0
.../{ => projects}/describe-cmd/invoker.properties | 0
.../describe-cmd}/pom.xml | 0
.../describe-cmd/test-deploy.properties| 0
.../describe-cmd/test-site.properties | 0
src/it/{ => projects}/describe-cmd/verify.groovy | 0
.../describe-ga}/invoker.properties| 0
.../describe-ga}/pom.xml | 0
src/it/{ => projects}/describe-ga/test.properties | 0
.../describe-gav}/invoker.properties | 0
.../describe-gav}/pom.xml | 0
src/it/{ => projects}/describe-gav/test.properties | 0
.../invoker.properties | 0
.../describe-plugin-in-plugin-management/pom.xml | 0
.../test.properties| 0
.../verify.groovy | 0
.../invoker.properties | 0
.../describe-plugin-without-name}/pom.xml | 0
.../describe-plugin-without-name/test.properties | 0
.../describe-plugin-without-name/verify.groovy | 0
.../invoker.properties | 0
.../describe-prefix-and-invalid-mojo}/pom.xml | 0
.../test.properties| 0
.../describe-prefix-and-invalid-mojo/verify.groovy | 0
.../describe-prefix-and-mojo}/invoker.properties | 0
.../describe-prefix-and-mojo}/pom.xml | 0
.../describe-prefix-and-mojo/test.properties | 0
.../describe-prefix}/invoker.properties| 0
.../describe-prefix}/pom.xml | 0
.../{ => projects}/describe-prefix/test.properties | 0
.../effective-pom-artifact}/invoker.properties | 0
.../{ => projects}/effective-pom-artifact/pom.xml | 0
.../effective-pom-artifact}/test.properties| 0
.../effective-pom-artifact/verify.groovy | 0
.../effective-pom-from-lifecycle}/module/pom.xml | 0
.../effective-pom-from-lifecycle/pom.xml | 0
.../effective-pom-from-lifecycle/verify.groovy | 0
.../invoker.properties | 0
.../module/pom.xml | 0
.../effective-pom-multimodule-artifact}/pom.xml| 0
.../test.properties| 0
.../verify.groovy | 0
.../invoker.properties | 0
.../module/pom.xml | 0
.../pom.xml| 0
.../verify.groovy | 0
.../effective-pom-multimodule}/invoker.properties | 0
.../effective-pom-multimodule}/module/pom.xml | 0
.../effective-pom-multimodule}/pom.xml | 0
.../effective-pom-multimodule}/verify.groovy | 0
.../effective-pom-verbose/invoker.properties | 0
.../{ => projects}/effective-pom-verbose/pom.xml | 0
[maven-help-plugin] 01/01: Introduce mock repository manager
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch mrm
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
commit e74888bd9e81552cd87cb1ddbb852acb902c7b6c
Author: rfscholte
AuthorDate: Fri Oct 15 13:39:17 2021 +0200
Introduce mock repository manager
---
pom.xml| 42 ++
src/it/{ => mrm}/settings.xml | 15 ++--
.../active-profiles/invoker.properties | 0
.../{system => projects/active-profiles}/pom.xml | 0
.../{ => projects}/active-profiles/verify.groovy | 0
.../active-profiles_multimodule/invoker.properties | 0
.../active-profiles_multimodule/module/pom.xml | 0
.../active-profiles_multimodule/pom.xml| 0
.../active-profiles_multimodule/verify.groovy | 0
.../all-profiles-parent-pom/child/pom.xml | 0
.../all-profiles-parent-pom}/invoker.properties| 0
.../{ => projects}/all-profiles-parent-pom/pom.xml | 0
.../all-profiles-parent-pom/verify.groovy | 0
.../all-profiles}/invoker.properties | 0
src/it/{ => projects}/all-profiles/pom.xml | 0
src/it/{ => projects}/all-profiles/verify.groovy | 0
.../describe-cmd-invalid}/invoker.properties | 0
.../describe-cmd-invalid}/pom.xml | 0
.../describe-cmd-invalid/test.properties | 0
.../invoker.properties | 0
.../describe-cmd-with-goal-invalid}/pom.xml| 0
.../describe-cmd-with-goal-invalid/test.properties | 0
.../invoker.properties | 0
.../describe-cmd-with-goal-report/pom.xml | 0
.../describe-cmd-with-goal-report/verify.groovy| 0
.../describe-cmd-with-goal}/invoker.properties | 0
.../describe-cmd-with-goal}/pom.xml| 0
.../describe-cmd-with-goal/test.properties | 0
.../describe-cmd-with-goal/verify.groovy | 0
.../{ => projects}/describe-cmd/invoker.properties | 0
.../describe-cmd}/pom.xml | 0
.../describe-cmd/test-deploy.properties| 0
.../describe-cmd/test-site.properties | 0
src/it/{ => projects}/describe-cmd/verify.groovy | 0
.../describe-ga}/invoker.properties| 0
.../describe-ga}/pom.xml | 0
src/it/{ => projects}/describe-ga/test.properties | 0
.../describe-gav}/invoker.properties | 0
.../describe-gav}/pom.xml | 0
src/it/{ => projects}/describe-gav/test.properties | 0
.../invoker.properties | 0
.../describe-plugin-in-plugin-management/pom.xml | 0
.../test.properties| 0
.../verify.groovy | 0
.../invoker.properties | 0
.../describe-plugin-without-name}/pom.xml | 0
.../describe-plugin-without-name/test.properties | 0
.../describe-plugin-without-name/verify.groovy | 0
.../invoker.properties | 0
.../describe-prefix-and-invalid-mojo}/pom.xml | 0
.../test.properties| 0
.../describe-prefix-and-invalid-mojo/verify.groovy | 0
.../describe-prefix-and-mojo}/invoker.properties | 0
.../describe-prefix-and-mojo}/pom.xml | 0
.../describe-prefix-and-mojo/test.properties | 0
.../describe-prefix}/invoker.properties| 0
.../describe-prefix}/pom.xml | 0
.../{ => projects}/describe-prefix/test.properties | 0
.../effective-pom-artifact}/invoker.properties | 0
.../{ => projects}/effective-pom-artifact/pom.xml | 0
.../effective-pom-artifact}/test.properties| 0
.../effective-pom-artifact/verify.groovy | 0
.../effective-pom-from-lifecycle}/module/pom.xml | 0
.../effective-pom-from-lifecycle/pom.xml | 0
.../effective-pom-from-lifecycle/verify.groovy | 0
.../invoker.properties | 0
.../module/pom.xml | 0
.../effective-pom-multimodule-artifact}/pom.xml| 0
.../test.properties| 0
.../verify.groovy | 0
.../invoker.properties | 0
.../module/pom.xml | 0
.../pom.xml| 0
.../verify.groovy | 0
.../effective-pom-multimodule}/invoker.properties | 0
.../effective-pom-multimodule}/module/pom.xml | 0
.../effective-pom-multimodule}/pom.xml | 0
.../effective-pom-multimodule}/verify.groovy | 0
.../effective-pom-verbose/invoker.properties | 0
.../{ => projects}/effective-pom-verbose/pom.xml | 0
.../effective-pom}/invoker.prop
[maven-help-plugin] branch mrm created (now e74888b)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch mrm in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git. at e74888b Introduce mock repository manager This branch includes the following new commits: new e74888b Introduce mock repository manager 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-artifact-plugin] branch stabilize deleted (was 75b9787)
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-artifact-plugin.git. was 75b9787 Fix compare-mono/verify.groovy for Windows 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-artifact-plugin] branch master updated (584a72e -> 75b9787)
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-artifact-plugin.git. from 584a72e [MARTIFACT-25] check pom.xml against reference .pom add 75b9787 Fix compare-mono/verify.groovy for Windows No new revisions were added by this update. Summary of changes: src/it/compare-mono/verify.groovy | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-)
[maven-artifact-plugin] branch stabilize created (now 75b9787)
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-artifact-plugin.git. at 75b9787 Fix compare-mono/verify.groovy for Windows This branch includes the following new commits: new 75b9787 Fix compare-mono/verify.groovy for Windows 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-artifact-plugin] 01/01: Fix compare-mono/verify.groovy for Windows
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-artifact-plugin.git
commit 75b97874ddbc97473d8b47be3d6229ab427a7c13
Author: rfscholte
AuthorDate: Fri Oct 15 11:56:27 2021 +0200
Fix compare-mono/verify.groovy for Windows
---
src/it/compare-mono/verify.groovy | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/it/compare-mono/verify.groovy
b/src/it/compare-mono/verify.groovy
index 93f0bbf..09c3c4f 100644
--- a/src/it/compare-mono/verify.groovy
+++ b/src/it/compare-mono/verify.groovy
@@ -30,4 +30,9 @@ assert compare.contains( "ok=1" )
assert compare.contains( "ko=1" )
assert compare.contains( 'okFiles="mono-1.0-SNAPSHOT.pom"' )
assert compare.contains( 'koFiles="mono-1.0-SNAPSHOT.jar"' )
-assert compare.contains( '# diffoscope target/reference/mono-1.0-SNAPSHOT.jar
target/mono-1.0-SNAPSHOT.jar' )
+if( File.separator == '/' ) {
+ assert compare.contains( '# diffoscope
target/reference/mono-1.0-SNAPSHOT.jar target/mono-1.0-SNAPSHOT.jar' )
+} else {
+ assert compare.contains( '# diffoscope
target\\reference\\mono-1.0-SNAPSHOT.jar target\\mono-1.0-SNAPSHOT.jar' )
+}
+
[maven-help-plugin] branch master updated: Dependabot should ignore Maven APIs/SPIs
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-help-plugin.git The following commit(s) were added to refs/heads/master by this push: new 58041c7 Dependabot should ignore Maven APIs/SPIs 58041c7 is described below commit 58041c74642daa66017c42f56f01613ef0f9e313 Author: rfscholte AuthorDate: Fri Oct 15 11:51:36 2021 +0200 Dependabot should ignore Maven APIs/SPIs --- .github/dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 29eccbf..3df6f10 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,6 +23,8 @@ updates: time: '04:00' open-pull-requests-limit: 10 ignore: +# ignore Maven APIs/SPIs +- dependency-name: org.apache:maven:* # ignore Java 8+ dependencies - dependency-name: org.mockito:mockito-core versions:
[maven-help-plugin] branch stabilize deleted (was 8f44d54)
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-help-plugin.git. was 8f44d54 Remove tagletArtifacts 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-help-plugin] branch master updated (4aa8512 -> 8f44d54)
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-help-plugin.git. from 4aa8512 Revert "[MPH-181] Require Java 8" add 8f44d54 Remove tagletArtifacts No new revisions were added by this update. Summary of changes: pom.xml | 8 1 file changed, 8 insertions(+)
[maven-help-plugin] 01/01: Remove tagletArtifacts
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-help-plugin.git commit 8f44d54bd123f691e12156b97d63cb5a1e003016 Author: rfscholte AuthorDate: Fri Oct 15 11:34:20 2021 +0200 Remove tagletArtifacts --- pom.xml | 8 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 142d159..fc34dee 100644 --- a/pom.xml +++ b/pom.xml @@ -229,6 +229,14 @@ maven-enforcer-plugin 3.0.0-M3 + + org.apache.maven.plugins + maven-javadoc-plugin + 3.3.1 + + + +
[maven-help-plugin] branch stabilize created (now 8f44d54)
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-help-plugin.git. at 8f44d54 Remove tagletArtifacts This branch includes the following new commits: new 8f44d54 Remove tagletArtifacts 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] 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-doap-plugin] branch stabilize deleted (was 5473f9b)
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-doap-plugin.git. was 5473f9b Fix JavaDoc This change permanently discards the following revisions: discard 5473f9b Fix JavaDoc discard 74521c9 Fix JavaDoc
[maven-doap-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-doap-plugin.git The following commit(s) were added to refs/heads/master by this push: new 608228e Fix JavaDoc 608228e is described below commit 608228e80ced47f17c4f8b0753a338291667b6d0 Author: rfscholte AuthorDate: Wed Oct 13 20:20:13 2021 +0200 Fix JavaDoc --- .../org/apache/maven/plugin/doap/DoapMojo.java | 8 ++-- src/main/mdo/asfextOptions.mdo | 10 ++--- src/main/mdo/doapOptions.mdo | 48 +++--- .../org/apache/maven/plugin/doap/DoapUtilTest.java | 2 +- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java index f11166d..211374a 100644 --- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java +++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java @@ -81,10 +81,12 @@ import java.util.Set; import java.util.TimeZone; /** + * * Generate a http://usefulinc.com/ns/doap;>Description of a Project (DOAP) file from the main information - * found in a POM. - * Note: The generated file is tailored for use by projects at http://projects.apache.org/doap.html;>Apache. + * found in a POM. + * + * Note: The generated file is tailored for use by projects at + * http://projects.apache.org/doap.html;>Apache. * * @author Jason van Zyl * @author mailto:vincent.sive...@gmail.com;>Vincent Siveton diff --git a/src/main/mdo/asfextOptions.mdo b/src/main/mdo/asfextOptions.mdo index 420f8e7..0efaaf2 100644 --- a/src/main/mdo/asfextOptions.mdo +++ b/src/main/mdo/asfextOptions.mdo @@ -43,7 +43,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< xmlnsPrefix - 1.0.0 String @@ -51,7 +51,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< xmlnsNamespaceURI - 1.0.0 String @@ -66,7 +66,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< pmc - 1.0.0 @@ -76,7 +76,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< name - 1.0.0 @@ -95,7 +95,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< chair - 1.0.0 diff --git a/src/main/mdo/doapOptions.mdo b/src/main/mdo/doapOptions.mdo index e8d7a5e..5acbf60 100644 --- a/src/main/mdo/doapOptions.mdo +++ b/src/main/mdo/doapOptions.mdo @@ -47,7 +47,7 @@ some POM options. xmlnsNamespaceURI - 1.0.0 String @@ -71,7 +71,7 @@ some POM options. bugDatabase - 1.0.0 @@ -81,8 +81,8 @@ some POM options. category - 1.0.0 @@ -92,7 +92,7 @@ some POM options. created - 1.0.0 @@ -102,7 +102,7 @@ some POM options. description - 1.0.0 @@ -112,7 +112,7 @@ some POM options. downloadPage - 1.0.0 @@ -122,7 +122,7 @@ some POM options. downloadMirror - 1.0.0 @@ -131,7 +131,7 @@ some POM options. homepage - 1.0.0 @@ -141,7 +141,7 @@ some POM options. implementations - 1.0.0 @@ -159,7 +159,7 @@ some POM options. license - 1.0.0 @@ -169,8 +169,8 @@ some POM options. mailingList - 1.0.0 @@ -180,7 +180,7 @@ some POM options. name - 1.0.0 @@ -198,7 +198,7 @@ some POM options. os - 1.0.0 @@ -207,7 +207,7 @@ some POM options. platform - 1.0.0 @@ -216,8 +216,8 @@ some POM options. programmingLanguage - 1.0.0 @@ -227,7 +227,7 @@ some POM options. scmAnonymous - 1.0.0 @@ -277,7 +277,7 @@ some POM options. vendor - 1.0.0 @@ -345,8 +345,8 @@ some POM options.
[maven-doap-plugin] branch stabilize updated: 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-doap-plugin.git The following commit(s) were added to refs/heads/stabilize by this push: new 5473f9b Fix JavaDoc 5473f9b is described below commit 5473f9bd35e30ea3e4f670150d01c222e1d7711c Author: rfscholte AuthorDate: Tue Oct 12 21:04:58 2021 +0200 Fix JavaDoc --- src/main/java/org/apache/maven/plugin/doap/DoapMojo.java | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java index 41faca1..211374a 100644 --- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java +++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java @@ -81,10 +81,12 @@ import java.util.Set; import java.util.TimeZone; /** - * Generate a http://usefulinc.com/ns/doap;>Description of a Project (DOAP) file from the main information - * found in a POM. - * Note: The generated file is tailored for use by projects at http://projects.apache.org/doap.html;>Apache. + * + * Generate a http://usefulinc.com/ns/doap;>Description of a Project (DOAP) file from the main information + * found in a POM. + * + * Note: The generated file is tailored for use by projects at + * http://projects.apache.org/doap.html;>Apache. * * @author Jason van Zyl * @author mailto:vincent.sive...@gmail.com;>Vincent Siveton
[maven-doap-plugin] branch stabilize created (now 74521c9)
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-doap-plugin.git. at 74521c9 Fix JavaDoc This branch includes the following new commits: new 74521c9 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-doap-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-doap-plugin.git commit 74521c92224a987f8195266ee8071228bd87020d Author: rfscholte AuthorDate: Tue Oct 12 20:36:23 2021 +0200 Fix JavaDoc --- .../org/apache/maven/plugin/doap/DoapMojo.java | 4 +- src/main/mdo/asfextOptions.mdo | 10 ++--- src/main/mdo/doapOptions.mdo | 48 +++--- .../org/apache/maven/plugin/doap/DoapUtilTest.java | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java index f11166d..41faca1 100644 --- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java +++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java @@ -81,8 +81,8 @@ import java.util.Set; import java.util.TimeZone; /** - * Generate a http://usefulinc.com/ns/doap;>Description of a Project (DOAP) file from the main information - * found in a POM. + * Generate a http://usefulinc.com/ns/doap;>Description of a Project (DOAP) file from the main information + * found in a POM. * Note: The generated file is tailored for use by projects at http://projects.apache.org/doap.html;>Apache. * diff --git a/src/main/mdo/asfextOptions.mdo b/src/main/mdo/asfextOptions.mdo index 420f8e7..0efaaf2 100644 --- a/src/main/mdo/asfextOptions.mdo +++ b/src/main/mdo/asfextOptions.mdo @@ -43,7 +43,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< xmlnsPrefix - 1.0.0 String @@ -51,7 +51,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< xmlnsNamespaceURI - 1.0.0 String @@ -66,7 +66,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< pmc - 1.0.0 @@ -76,7 +76,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< name - 1.0.0 @@ -95,7 +95,7 @@ http://svn.apache.org/repos/asf/infrastructure/site-tools/trunk/projects/asfext< chair - 1.0.0 diff --git a/src/main/mdo/doapOptions.mdo b/src/main/mdo/doapOptions.mdo index e8d7a5e..5acbf60 100644 --- a/src/main/mdo/doapOptions.mdo +++ b/src/main/mdo/doapOptions.mdo @@ -47,7 +47,7 @@ some POM options. xmlnsNamespaceURI - 1.0.0 String @@ -71,7 +71,7 @@ some POM options. bugDatabase - 1.0.0 @@ -81,8 +81,8 @@ some POM options. category - 1.0.0 @@ -92,7 +92,7 @@ some POM options. created - 1.0.0 @@ -102,7 +102,7 @@ some POM options. description - 1.0.0 @@ -112,7 +112,7 @@ some POM options. downloadPage - 1.0.0 @@ -122,7 +122,7 @@ some POM options. downloadMirror - 1.0.0 @@ -131,7 +131,7 @@ some POM options. homepage - 1.0.0 @@ -141,7 +141,7 @@ some POM options. implementations - 1.0.0 @@ -159,7 +159,7 @@ some POM options. license - 1.0.0 @@ -169,8 +169,8 @@ some POM options. mailingList - 1.0.0 @@ -180,7 +180,7 @@ some POM options. name - 1.0.0 @@ -198,7 +198,7 @@ some POM options. os - 1.0.0 @@ -207,7 +207,7 @@ some POM options. platform - 1.0.0 @@ -216,8 +216,8 @@ some POM options. programmingLanguage - 1.0.0 @@ -227,7 +227,7 @@ some POM options. scmAnonymous - 1.0.0 @@ -277,7 +277,7 @@ some POM options. vendor - 1.0.0 @@ -345,8 +345,8 @@ some POM options.
[maven-remote-resources-plugin] branch stabilize deleted (was 731df1e)
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-remote-resources-plugin.git. was 731df1e 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-remote-resources-plugin] branch master updated (d5667e1 -> 731df1e)
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-remote-resources-plugin.git. from d5667e1 [MRRESOURCES-118] Require Maven 3.2.0 (fix previous commit) add 731df1e Fix JavaDoc No new revisions were added by this update. Summary of changes: .../maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-)
[maven-docck-plugin] branch stabilize deleted (was 08fe1a8)
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-docck-plugin.git. was 08fe1a8 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-docck-plugin] branch master updated (1e08962 -> 08fe1a8)
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-docck-plugin.git. from 1e08962 update CI url add 08fe1a8 Fix JavaDoc No new revisions were added by this update. Summary of changes: .../org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java | 2 -- 1 file changed, 2 deletions(-)
[maven-docck-plugin] branch stabilize created (now 08fe1a8)
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-docck-plugin.git. at 08fe1a8 Fix JavaDoc This branch includes the following new commits: new 08fe1a8 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-docck-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-docck-plugin.git commit 08fe1a8c8c4cfaafae6c6d51bc1109c570a59a78 Author: rfscholte AuthorDate: Mon Oct 11 20:27:15 2021 +0200 Fix JavaDoc --- .../org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java b/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java index a6fa77b..f826ed6 100644 --- a/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java +++ b/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java @@ -88,8 +88,6 @@ public abstract class AbstractCheckDocumentationMojo /** * Directory where the site source for the project is located. - * - * @todo should be determined programmatically */ @Parameter( property = "siteDirectory", defaultValue = "src/site" ) protected String siteDirectory;
[maven-remote-resources-plugin] branch stabilize created (now 731df1e)
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-remote-resources-plugin.git. at 731df1e Fix JavaDoc This branch includes the following new commits: new 731df1e 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-remote-resources-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-remote-resources-plugin.git
commit 731df1e3ceaa400c7e0875ed5f1ab99bb1e756d4
Author: rfscholte
AuthorDate: Mon Oct 11 20:16:19 2021 +0200
Fix JavaDoc
---
.../maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
b/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
index a2d7f72..5f990c6 100644
---
a/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
+++
b/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
@@ -128,7 +128,6 @@ import
org.codehaus.plexus.util.xml.pull.XmlPullParserException;
* Resources that end in ".vm" are treated as Velocity templates. For those,
the ".vm" is stripped off for the final
* artifact name and it's fed through Velocity to have properties expanded,
conditions processed, etc...
*
- *
* Resources that don't end in ".vm" are copied "as is".
*/
// NOTE: Removed the following in favor of maven-artifact-resolver library,
for MRRESOURCES-41
@@ -157,11 +156,10 @@ public class ProcessRemoteResourcesMojo
*
*
* delimiters
- * delimiter${*}/delimiter
- * delimiter@/delimiter
+ * delimiter${*}/delimiter
+ * delimiter@/delimiter
* /delimiters
*
- *
* Since the '@' delimiter is the same on both ends, we don't need to
specify '@*@' (though we can).
*
* @since 1.1
[maven-javadoc-plugin] branch stabilize deleted (was 85cce39)
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-javadoc-plugin.git. was 85cce39 Add verbose logging to flaky unittest This change permanently discards the following revisions: discard 85cce39 Add verbose logging to flaky unittest discard 50e4dd6 Upgrade commons-io Add assert to JavadocReportTest.testTaglets to identify problem of flaky test discard 664f37b Use test constructor instead of conditional setup
[maven-javadoc-plugin] branch stabilize updated: Add verbose logging to flaky unittest
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-javadoc-plugin.git The following commit(s) were added to refs/heads/stabilize by this push: new 85cce39 Add verbose logging to flaky unittest 85cce39 is described below commit 85cce39482fa8361e6b47693200fa5645bc2c358 Author: rfscholte AuthorDate: Fri Oct 8 19:53:51 2021 +0200 Add verbose logging to flaky unittest --- src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml b/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml index c9d3988..7ae9e37 100644 --- a/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml +++ b/src/test/resources/unit/taglet-test/taglet-test-plugin-config.xml @@ -47,7 +47,7 @@ under the License. false protected true - false + true true ISO-8859-1 false
[maven-javadoc-plugin] branch stabilize updated: Upgrade commons-io Add assert to JavadocReportTest.testTaglets to identify problem of flaky test
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-javadoc-plugin.git
The following commit(s) were added to refs/heads/stabilize by this push:
new 50e4dd6 Upgrade commons-io Add assert to
JavadocReportTest.testTaglets to identify problem of flaky test
50e4dd6 is described below
commit 50e4dd67c3cac2b7faa5104ce7c4a7f831ac3781
Author: rfscholte
AuthorDate: Fri Oct 8 17:39:24 2021 +0200
Upgrade commons-io
Add assert to JavadocReportTest.testTaglets to identify problem of flaky
test
---
pom.xml | 2 +-
src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cfd801f..1a8c5d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,7 +303,7 @@ under the License.
commons-io
commons-io
- 2.8.0
+ 2.11.0
org.codehaus.plexus
diff --git
a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 5b00634..dba1838 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -654,6 +654,8 @@ public class JavadocReportTest
{
return;
}
+
+assertThat( new File( localRepo,
"org/tullmann/taglets/1.0/taglets-1.0.jar" ) ).exists();
Path testPom = unit.resolve(
"taglet-test/taglet-test-plugin-config.xml" );
JavadocReport mojo = lookupMojo( testPom );
[maven-release] branch stabilize deleted (was cd9b87c)
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-release.git. was cd9b87c Workaround for MNG-7289 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-release] branch master updated (6acc4ea -> cd9b87c)
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-release.git. from 6acc4ea Bump maven-plugin-plugin from 3.6.0 to 3.6.1 add cd9b87c Workaround for MNG-7289 No new revisions were added by this update. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-javadoc-plugin] 01/01: Use test constructor instead of conditional setup
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-javadoc-plugin.git
commit 664f37bb35cf4b4f12cf166002a7e586445dbb78
Author: rfscholte
AuthorDate: Fri Oct 8 13:39:58 2021 +0200
Use test constructor instead of conditional setup
---
.../maven/plugins/javadoc/JavadocReportTest.java | 37 --
1 file changed, 6 insertions(+), 31 deletions(-)
diff --git
a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index 3dc5ffd..5b00634 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -43,6 +43,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
@@ -80,22 +81,14 @@ public class JavadocReportTest
public static final String OPTIONS_UMLAUT_ENCODING = "Options Umlaut
Encoding ö ä ü ß";
-/** flag to copy repo only one time */
-private static boolean TEST_REPO_CREATED = false;
+private final Path unit;
-private Path unit;
-
-private File localRepo;
+private final File localRepo;
private static final Logger LOGGER = LoggerFactory.getLogger(
JavadocReportTest.class );
-
-/** {@inheritDoc} */
-@Override
-protected void setUp()
-throws Exception
+
+public JavadocReportTest() throws Exception
{
-super.setUp();
-
unit = new File( getBasedir(), "src/test/resources/unit" ).toPath();
localRepo = new File( getBasedir(), "target/local-repo/" );
@@ -103,7 +96,6 @@ public class JavadocReportTest
createTestRepo();
}
-
private JavadocReport lookupMojo( Path testPom )
throws Exception
{
@@ -130,11 +122,6 @@ public class JavadocReportTest
private void createTestRepo()
throws IOException
{
-if ( TEST_REPO_CREATED )
-{
-return;
-}
-
localRepo.mkdirs();
//
--
@@ -195,15 +182,12 @@ public class JavadocReportTest
file.delete();
}
}
-
-TEST_REPO_CREATED = true;
}
/**
* Convenience method that reads the contents of the specified file object
into a string with a
* space as line separator.
*
- * @see #LINE_SEPARATOR
* @param file the file to be read
* @return a String object that contains the contents of the file
* @throws IOException if any
@@ -218,7 +202,6 @@ public class JavadocReportTest
* Convenience method that reads the contents of the specified file object
into a string with a
* space as line separator.
*
- * @see #LINE_SEPARATOR
* @param file the file to be read
* @param cs charset to use
* @return a String object that contains the contents of the file
@@ -227,15 +210,7 @@ public class JavadocReportTest
private static String readFile( Path file, Charset cs )
throws IOException
{
-StringBuilder str = new StringBuilder( (int) Files.size( file ) );
-
-for ( String strTmp : Files.readAllLines( file, cs ) )
-{
-str.append( LINE_SEPARATOR);
-str.append( strTmp );
-}
-
-return str.toString();
+return Files.readAllLines( file, cs ).stream().collect(
Collectors.joining( " " ) );
}
/**
[maven-javadoc-plugin] branch stabilize created (now 664f37b)
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-javadoc-plugin.git. at 664f37b Use test constructor instead of conditional setup This branch includes the following new commits: new 664f37b Use test constructor instead of conditional setup 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-jenkins-lib] branch master updated: More recent version for site generation
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 8923b2d More recent version for site generation
8923b2d is described below
commit 8923b2d7bff33e3ccc1c0d00095951b1e13832f8
Author: rfscholte
AuthorDate: Fri Oct 8 13:33:38 2021 +0200
More recent version for site generation
---
vars/asfMavenTlpPlgnBuild.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 9afe422..9fc9229 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -43,7 +43,7 @@ def call(Map params = [:]) {
// Just temporarily
def failFast = false;
def siteJdk = params.containsKey('siteJdk') ? params.siteJdk : '8'
-def siteMvn = params.containsKey('siteMvn') ? params.siteJdk : '3.5.x'
+def siteMvn = params.containsKey('siteMvn') ? params.siteJdk : '3.6.x'
def tmpWs = params.containsKey('tmpWs') ? params.tmpWs : false
taskContext['failFast'] = failFast;
[maven-release] 01/01: Workaround for MNG-7289
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-release.git commit cd9b87cb1ccea56e52cfdcf7924e1a3e38353686 Author: rfscholte AuthorDate: Fri Oct 8 12:56:22 2021 +0200 Workaround for MNG-7289 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b4e13d9..91e7c96 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpPlgnBuild(jdk:['8','11','16']) +asfMavenTlpPlgnBuild(siteWithPackage:true)
[maven-release] branch stabilize created (now cd9b87c)
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-release.git. at cd9b87c Workaround for MNG-7289 This branch includes the following new commits: new cd9b87c Workaround for MNG-7289 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-jenkins-lib] branch master updated: Add workaround for MNG-7289
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 7bf20e4 Add workaround for MNG-7289
7bf20e4 is described below
commit 7bf20e411bf45ec575359bbf2a261204f49c3d06
Author: rfscholte
AuthorDate: Fri Oct 8 12:52:57 2021 +0200
Add workaround for MNG-7289
---
vars/asfMavenTlpPlgnBuild.groovy | 4
1 file changed, 4 insertions(+)
diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 771278d..9afe422 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -49,6 +49,7 @@ def call(Map params = [:]) {
taskContext['failFast'] = failFast;
taskContext['tmpWs'] = tmpWs;
taskContext['archives'] = params.archives
+taskContext['siteWithPackage'] = params.containsKey('siteWithPackage') ?
params.siteWithPackage : false // workaround for MNG-7289
Map tasks = [failFast: failFast]
boolean first = true
@@ -138,6 +139,9 @@ def doCreateTask( os, jdk, maven, tasks, first, plan,
taskContext )
}
}
else if (plan == 'site') {
+ if (taskContext.siteWithPackage) {
+cmd += 'package'
+ }
cmd += 'site'
cmd += '-Preporting'
}
[maven-archetype] branch master updated (5b7bdab -> 74df483)
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-archetype.git. from 5b7bdab Bump maven-invoker from 3.0.1 to 3.1.0 (#76) add 74df483 Revert "Bump maven-invoker from 3.0.1 to 3.1.0 (#76)" No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-archetype] branch revert-76-dependabot/maven/org.apache.maven.shared-maven-invoker-3.1.0 created (now 8b14be2)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch revert-76-dependabot/maven/org.apache.maven.shared-maven-invoker-3.1.0 in repository https://gitbox.apache.org/repos/asf/maven-archetype.git. at 8b14be2 Revert "Bump maven-invoker from 3.0.1 to 3.1.0 (#76)" This branch includes the following new commits: new 8b14be2 Revert "Bump maven-invoker from 3.0.1 to 3.1.0 (#76)" 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-archetype] 01/01: Revert "Bump maven-invoker from 3.0.1 to 3.1.0 (#76)"
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch revert-76-dependabot/maven/org.apache.maven.shared-maven-invoker-3.1.0 in repository https://gitbox.apache.org/repos/asf/maven-archetype.git commit 8b14be261bfb0708c7cfc8941ea987afecc047dc Author: Robert Scholte AuthorDate: Fri Oct 8 10:48:37 2021 +0200 Revert "Bump maven-invoker from 3.0.1 to 3.1.0 (#76)" This reverts commit 5b7bdab2b848941ee2b653a5027363685fbfb030. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e84205e..96b7266 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ org.apache.maven.shared maven-invoker -3.1.0 +3.0.1 org.apache.maven.shared
[maven-clean-plugin] branch master updated (4b10101 -> b7c6daf)
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-clean-plugin.git. from 4b10101 update CI url add b7c6daf Remove tagletArtifact from maven-javadoc-plugin No new revisions were added by this update. Summary of changes: pom.xml | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
[maven-clean-plugin] branch stabilize deleted (was b7c6daf)
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-clean-plugin.git. was b7c6daf Remove tagletArtifact from maven-javadoc-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
