[maven-javadoc-plugin] branch master updated (506cb74e -> 0c6b32fb)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git from 506cb74e [MJAVADOC-696] Invalid anchors in Javadoc and plugin mojo add 0c6b32fb [MJAVADOC-714] Upgrade to Maven 3.2.5 No new revisions were added by this update. Summary of changes: pom.xml| 43 +- .../javadoc/AggregatorJavadocReportTest.java | 535 +++-- .../maven/plugins/javadoc/JavadocReportTest.java | 49 +- .../tagletArtifacts-test-plugin-config.xml | 5 - 4 files changed, 309 insertions(+), 323 deletions(-)
[maven-javadoc-plugin] 01/01: [MJAVADOC-714] Upgrade to Maven 3.2.5
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 0c6b32fb5ec9c31b4e38d9f32616ff51102623da
Author: Michael Osipov
AuthorDate: Sat Apr 16 23:53:29 2022 +0200
[MJAVADOC-714] Upgrade to Maven 3.2.5
This closes #134
---
pom.xml| 43 +-
.../javadoc/AggregatorJavadocReportTest.java | 535 +++--
.../maven/plugins/javadoc/JavadocReportTest.java | 49 +-
.../tagletArtifacts-test-plugin-config.xml | 5 -
4 files changed, 309 insertions(+), 323 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5d520501..5f4a94e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,11 +67,11 @@ under the License.
8
-3.0
+3.2.5
1.11.1
1.11.1
2.4
-1.13.1
+1.0.0.v20140518
1.1.0
9.4.43.v20210629
@@ -132,33 +132,33 @@ under the License.
-org.sonatype.aether
+org.eclipse.aether
aether-api
-${sonatypeAetherVersion}
+${aetherVersion}
-org.sonatype.aether
-aether-connector
-${sonatypeAetherVersion}
+org.eclipse.aether
+aether-connector-basic
+${aetherVersion}
-org.sonatype.aether
-aether-connector-wagon
-${sonatypeAetherVersion}
+org.eclipse.aether
+aether-transport-wagon
+${aetherVersion}
-org.sonatype.aether
+org.eclipse.aether
aether-impl
-${sonatypeAetherVersion}
+${aetherVersion}
-org.sonatype.aether
+org.eclipse.aether
aether-util
-${sonatypeAetherVersion}
+${aetherVersion}
-
+
org.apache.maven
@@ -331,7 +331,7 @@ under the License.
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 2.1
+ 3.3.0
test
@@ -365,8 +365,13 @@ under the License.
test
- org.sonatype.aether
- aether-connector-wagon
+ org.eclipse.aether
+ aether-connector-basic
+ test
+
+
+ org.eclipse.aether
+ aether-transport-wagon
test
@@ -468,7 +473,7 @@ under the License.
${maven.home}
${https.protocols}
-
+
true
diff --git
a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
index 7f58c9de..338bdc23 100644
---
a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
+++
b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
@@ -1,267 +1,268 @@
-package org.apache.maven.plugins.javadoc;
-
-/*
- * 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.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.languages.java.version.JavaVersion;
-import org.codehaus.plexus.util.FileUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
-
-public class AggregatorJavadocReportTest
-extends AbstractMojoTestCase
-{
-private static final char LINE_SEPARATOR = ' ';
-
-/** flag to copy repo only one time */
-private static boolean TEST_REPO_CREATED = false;
-
-private File unit;
-
-private File localRepo;
-
-/** {@inheritDoc} */
-@Override
-protected void setUp()
-throws Exception
-{
-super.setUp();
-
-unit = new File( getBasedir(), "sr
[maven-javadoc-plugin] branch maven-3.2.5 updated (0c52a25b -> 0c6b32fb)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git discard 0c52a25b [MJAVADOC-714] Upgrade to Maven 3.2.5 new 0c6b32fb [MJAVADOC-714] Upgrade to Maven 3.2.5 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0c52a25b) \ N -- N -- N refs/heads/maven-3.2.5 (0c6b32fb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: pom.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
[maven-javadoc-plugin] branch maven-3.2.5 updated (b373c6c8 -> 0c52a25b)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git discard b373c6c8 Clean up and add omit 3fcf7d5a Update testing harness omit 5ac3a397 Switch to org.eclipse omit 8a8c37b3 start new 0c52a25b [MJAVADOC-714] Upgrade to Maven 3.2.5 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b373c6c8) \ N -- N -- N refs/heads/maven-3.2.5 (0c52a25b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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-javadoc-plugin] 01/01: [MJAVADOC-714] Upgrade to Maven 3.2.5
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 0c52a25b8fcaff24d2f4574666f72a86ce751971
Author: Michael Osipov
AuthorDate: Sat Apr 16 23:53:29 2022 +0200
[MJAVADOC-714] Upgrade to Maven 3.2.5
This closes #134
---
pom.xml| 49 +-
.../javadoc/AggregatorJavadocReportTest.java | 535 +++--
.../maven/plugins/javadoc/JavadocReportTest.java | 49 +-
.../tagletArtifacts-test-plugin-config.xml | 5 -
4 files changed, 312 insertions(+), 326 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5d520501..a8507b12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,11 +67,11 @@ under the License.
8
-3.0
+3.2.5
1.11.1
1.11.1
2.4
-1.13.1
+1.0.0.v20140518
1.1.0
9.4.43.v20210629
@@ -132,33 +132,33 @@ under the License.
-org.sonatype.aether
+org.eclipse.aether
aether-api
-${sonatypeAetherVersion}
+${aetherVersion}
-org.sonatype.aether
-aether-connector
-${sonatypeAetherVersion}
+org.eclipse.aether
+aether-connector-basic
+${aetherVersion}
-org.sonatype.aether
-aether-connector-wagon
-${sonatypeAetherVersion}
+org.eclipse.aether
+aether-transport-wagon
+${aetherVersion}
-org.sonatype.aether
+org.eclipse.aether
aether-impl
-${sonatypeAetherVersion}
+${aetherVersion}
-org.sonatype.aether
+org.eclipse.aether
aether-util
-${sonatypeAetherVersion}
+${aetherVersion}
-
+
org.apache.maven
@@ -331,7 +331,7 @@ under the License.
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 2.1
+ 3.3.0
test
@@ -364,11 +364,6 @@ under the License.
4.1.0
test
-
- org.sonatype.aether
- aether-connector-wagon
- test
-
org.apache.maven.wagon
wagon-http
@@ -376,6 +371,16 @@ under the License.
shaded
test
+
+ org.eclipse.aether
+ aether-connector-basic
+ test
+
+
+ org.eclipse.aether
+ aether-transport-wagon
+ test
+
org.assertj
assertj-core
@@ -468,7 +473,7 @@ under the License.
${maven.home}
${https.protocols}
-
+
true
diff --git
a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
index 7f58c9de..338bdc23 100644
---
a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
+++
b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
@@ -1,267 +1,268 @@
-package org.apache.maven.plugins.javadoc;
-
-/*
- * 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.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.languages.java.version.JavaVersion;
-import org.codehaus.plexus.util.FileUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
-
-public class AggregatorJavadocReportTest
-extends AbstractMojoTestCase
-{
-private static final char LINE_SEPARATOR = ' ';
-
-/** flag to copy repo only one time */
-private static boolean TEST_REPO_CREATED = false;
-
-private File unit;
-
[maven-javadoc-plugin] branch maven-3.2.5 updated: Clean up and add
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git The following commit(s) were added to refs/heads/maven-3.2.5 by this push: new b373c6c8 Clean up and add b373c6c8 is described below commit b373c6c832b1c5186d88a534ea48c63ba02be5a8 Author: Michael Osipov AuthorDate: Sun Apr 17 01:48:50 2022 +0200 Clean up and add --- pom.xml | 10 ++ .../maven/plugins/javadoc/JavadocReportTest.java | 20 ++-- .../tagletArtifacts-test-plugin-config.xml | 5 - 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 3254dfb7..a8507b12 100644 --- a/pom.xml +++ b/pom.xml @@ -371,6 +371,16 @@ under the License. shaded test + + org.eclipse.aether + aether-connector-basic + test + + + org.eclipse.aether + aether-transport-wagon + test + org.assertj assertj-core 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 3eac8534..4200ec05 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java @@ -1209,24 +1209,8 @@ public class JavadocReportTest assertThat( optionsFile ).exists(); String options = readFile( optionsFile ); // count -taglet -assertThat( StringUtils.countMatches( options, LINE_SEPARATOR + "-taglet" + LINE_SEPARATOR ) ).isEqualTo( 22 ); -assertThat( options ).contains( "org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet" ) -.contains( "org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet" ) +assertThat( StringUtils.countMatches( options, LINE_SEPARATOR + "-taglet" + LINE_SEPARATOR ) ).isEqualTo( 3 ); +assertThat( options ) .contains( "org.codehaus.plexus.javadoc.PlexusConfigurationTaglet" ) .contains( "org.codehaus.plexus.javadoc.PlexusRequirementTaglet" ) .contains( "org.codehaus.plexus.javadoc.PlexusComponentTaglet" ); diff --git a/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml b/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml index 0656dc06..8639b557 100644 --- a/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml +++ b/src/test/resources/unit/tagletArtifacts-test/tagletArtifacts-test-plugin-config.xml @@ -65,11 +65,6 @@ under the License. true true - - org.apache.maven.plugin-tools - maven-plugin-tools-javadoc - 3.5 - org.codehaus.plexus plexus-javadoc
[maven-javadoc-plugin] branch maven-3.2.5 updated (5ac3a397 -> 3fcf7d5a)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git from 5ac3a397 Switch to org.eclipse add 3fcf7d5a Update testing harness No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-javadoc-plugin] branch maven-3.2.5 updated (8a8c37b3 -> 5ac3a397)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git from 8a8c37b3 start add 5ac3a397 Switch to org.eclipse No new revisions were added by this update. Summary of changes: .../javadoc/AggregatorJavadocReportTest.java | 5 +++- .../maven/plugins/javadoc/JavadocReportTest.java | 27 -- 2 files changed, 19 insertions(+), 13 deletions(-)
[maven-javadoc-plugin] branch maven-3.2.5 created (now 8a8c37b3)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git at 8a8c37b3 start This branch includes the following new commits: new 8a8c37b3 start 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-javadoc-plugin] 01/01: start
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 8a8c37b32e0bf5f5c6ea657d1355284f9ec496ef
Author: Michael Osipov
AuthorDate: Sat Apr 16 23:53:29 2022 +0200
start
---
pom.xml| 37 +-
.../javadoc/AggregatorJavadocReportTest.java | 532 ++---
.../maven/plugins/javadoc/JavadocReportTest.java | 2 -
3 files changed, 281 insertions(+), 290 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5d520501..295ddf97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,11 +67,11 @@ under the License.
8
-3.0
+3.2.5
1.11.1
1.11.1
2.4
-1.13.1
+1.0.0.v20140518
1.1.0
9.4.43.v20210629
@@ -132,33 +132,33 @@ under the License.
-org.sonatype.aether
+org.eclipse.aether
aether-api
-${sonatypeAetherVersion}
+${aetherVersion}
-org.sonatype.aether
-aether-connector
-${sonatypeAetherVersion}
+org.eclipse.aether
+aether-connector-basic
+${aetherVersion}
-org.sonatype.aether
-aether-connector-wagon
-${sonatypeAetherVersion}
+org.eclipse.aether
+aether-transport-wagon
+${aetherVersion}
-org.sonatype.aether
+org.eclipse.aether
aether-impl
-${sonatypeAetherVersion}
+${aetherVersion}
-org.sonatype.aether
+org.eclipse.aether
aether-util
-${sonatypeAetherVersion}
+${aetherVersion}
-
+
org.apache.maven
@@ -364,11 +364,6 @@ under the License.
4.1.0
test
-
- org.sonatype.aether
- aether-connector-wagon
- test
-
org.apache.maven.wagon
wagon-http
@@ -468,7 +463,7 @@ under the License.
${maven.home}
${https.protocols}
-
+
true
diff --git
a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
index 7f58c9de..ae7e0736 100644
---
a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
+++
b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
@@ -1,267 +1,265 @@
-package org.apache.maven.plugins.javadoc;
-
-/*
- * 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.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.languages.java.version.JavaVersion;
-import org.codehaus.plexus.util.FileUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
-
-public class AggregatorJavadocReportTest
-extends AbstractMojoTestCase
-{
-private static final char LINE_SEPARATOR = ' ';
-
-/** flag to copy repo only one time */
-private static boolean TEST_REPO_CREATED = false;
-
-private File unit;
-
-private File localRepo;
-
-/** {@inheritDoc} */
-@Override
-protected void setUp()
-throws Exception
-{
-super.setUp();
-
-unit = new File( getBasedir(), "src/test/resources/unit" );
-
-localRepo = new File( getBasedir(), "target/local-repo/" );
-
-createTestRepo();
-}
-
-private JavadocReport lookupMojo( File testPom )
-throws Exception
-{
-JavadocReport mojo = (JavadocReport) lookupMojo( "aggregate", testPom
);
-
-MojoExecution mojoExec = new MojoExecution( ne
[maven-resolver] branch dynamic-lrm updated (f6dc4e49 -> 877baa5a)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from f6dc4e49 Fix API and simplify add 877baa5a Add javadoc to key method No new revisions were added by this update. Summary of changes: .../aether/internal/impl/LocalPathPrefixComposer.java| 4 ++-- .../aether/internal/impl/SimpleLocalRepositoryManager.java | 12 +--- 2 files changed, 11 insertions(+), 5 deletions(-)
[maven-resolver] branch dynamic-lrm updated (4c4e8cf9 -> f6dc4e49)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 4c4e8cf9 Explain better this check, and prevent extra work for nothing add f6dc4e49 Fix API and simplify No new revisions were added by this update. Summary of changes: .../eclipse/aether/impl/guice/AetherModule.java| 8 +-- .../impl/EnhancedLocalRepositoryManager.java | 6 +- .../EnhancedLocalRepositoryManagerFactory.java | 4 -- .../internal/impl/LocalPathPrefixComposer.java | 11 ++-- .../LocalPathPrefixComposerFactorySupport.java | 10 +++ .../impl/NoopLocalPathPrefixComposerFactory.java | 5 +- .../impl/SplitLocalPathPrefixComposerFactory.java | 31 + ...itRepositoryLocalPathPrefixComposerFactory.java | 77 -- .../EnhancedSplitLocalRepositoryManagerTest.java | 6 +- 9 files changed, 42 insertions(+), 116 deletions(-) delete mode 100644 maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SplitRepositoryLocalPathPrefixComposerFactory.java
[maven-site-plugin] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 039b29b9 [maven-release-plugin] prepare for next development iteration
039b29b9 is described below
commit 039b29b9667be0261a27b3bc6a758e14c923fd9c
Author: Michael Osipov
AuthorDate: Sat Apr 16 23:02:17 2022 +0200
[maven-release-plugin] prepare for next development iteration
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a5a155e0..d8afa459 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
maven-site-plugin
- 3.12.0
+ 3.12.1-SNAPSHOT
maven-plugin
Apache Maven Site Plugin
@@ -177,7 +177,7 @@ under the License.
scm:git:https://gitbox.apache.org/repos/asf/maven-site-plugin.git
scm:git:https://gitbox.apache.org/repos/asf/maven-site-plugin.git
https://github.com/apache/maven-site-plugin/tree/${project.scm.tag}
-maven-site-plugin-3.12.0
+HEAD
JIRA
@@ -212,7 +212,7 @@ under the License.
3.2.2
2.22.2
2.22.2
-
2022-04-16T21:01:45Z
+
2022-04-16T21:02:16Z
[maven-site-plugin] annotated tag maven-site-plugin-3.12.0 created (now be238b3b)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to annotated tag maven-site-plugin-3.12.0 in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git at be238b3b (tag) tagging 8c597d8db03633feb010cacb2a036b1cceb29aee (commit) replaces maven-site-plugin-3.11.0 by Michael Osipov on Sat Apr 16 23:02:12 2022 +0200 - Log - [maven-release-plugin] copy for tag maven-site-plugin-3.12.0 --- No new revisions were added by this update.
[maven-site-plugin] branch master updated: [maven-release-plugin] prepare release maven-site-plugin-3.12.0
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 8c597d8d [maven-release-plugin] prepare release
maven-site-plugin-3.12.0
8c597d8d is described below
commit 8c597d8db03633feb010cacb2a036b1cceb29aee
Author: Michael Osipov
AuthorDate: Sat Apr 16 23:02:07 2022 +0200
[maven-release-plugin] prepare release maven-site-plugin-3.12.0
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a7f64ae9..a5a155e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
maven-site-plugin
- 3.12.0-SNAPSHOT
+ 3.12.0
maven-plugin
Apache Maven Site Plugin
@@ -177,7 +177,7 @@ under the License.
scm:git:https://gitbox.apache.org/repos/asf/maven-site-plugin.git
scm:git:https://gitbox.apache.org/repos/asf/maven-site-plugin.git
https://github.com/apache/maven-site-plugin/tree/${project.scm.tag}
-HEAD
+maven-site-plugin-3.12.0
JIRA
@@ -212,7 +212,7 @@ under the License.
3.2.2
2.22.2
2.22.2
-
2022-02-13T11:25:26Z
+
2022-04-16T21:01:45Z
[maven-resolver] branch dynamic-lrm updated (2a5f0218 -> 4c4e8cf9)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch dynamic-lrm in repository https://gitbox.apache.org/repos/asf/maven-resolver.git from 2a5f0218 Refactor more, add more toggles add 0247c100 MD snapshot check: the old one was correct add 4c4e8cf9 Explain better this check, and prevent extra work for nothing No new revisions were added by this update. Summary of changes: .../internal/impl/EnhancedLocalRepositoryManager.java | 10 ++ .../impl/LocalPathPrefixComposerFactorySupport.java | 5 + .../internal/impl/SimpleLocalRepositoryManager.java | 19 --- 3 files changed, 19 insertions(+), 15 deletions(-)
[maven-site-plugin] branch master updated (bf434e5d -> 32be6ad8)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git from bf434e5d [MSITE-891] Upgrade plugins in ITs add 32be6ad8 [MSITE-888] Upgrade to Maven 3.2.5 No new revisions were added by this update. Summary of changes: pom.xml | 16 ++-- .../maven/plugins/site/deploy/SiteDeployMojoTest.java| 6 +++--- 2 files changed, 17 insertions(+), 5 deletions(-)
[maven-site-plugin] 01/01: [MSITE-888] Upgrade to Maven 3.2.5
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 32be6ad8b99916dec6f908484f2d690044bf0b47
Author: Tamas Cservenak
AuthorDate: Tue Feb 22 16:39:45 2022 +0100
[MSITE-888] Upgrade to Maven 3.2.5
This closes #73
---
pom.xml | 16 ++--
.../maven/plugins/site/deploy/SiteDeployMojoTest.java| 6 +++---
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 27cc1546..a7f64ae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,7 @@ under the License.
-3.0.5
+3.2.5
8
@@ -252,6 +252,12 @@ under the License.
${mavenVersion}
provided
+
+ org.apache.maven
+ maven-aether-provider
+ ${mavenVersion}
+ provided
+
org.apache.maven
maven-model
@@ -401,6 +407,12 @@ under the License.
org.apache.maven.doxia
doxia-integration-tools
${doxiaSitetoolsVersion}
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
@@ -501,7 +513,7 @@ under the License.
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 2.1
+ 3.3.0
test
diff --git
a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
index 59f41b44..c512ef03 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugins.site.deploy;
import org.apache.maven.artifact.manager.WagonManager;
//import org.apache.maven.wagon.repository.Repository;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,7 +32,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith( JUnit4.class )
public class SiteDeployMojoTest
-extends PlexusTestCase
+extends AbstractMojoTestCase
{
private WagonManager wagonManager;
@@ -102,7 +102,7 @@ public class SiteDeployMojoTest
public void
testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts2()
{
wagonManager.
-
+
wagonManager.addProxy( "scp", "localhost", 8080, "my-user",
"my-password", "*mycompany" );
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository,
wagonManager );
assertNotNull( "ProxyInfo must be found because 'repository-host' not
in nonProxyHosts list", proxyInfo );
[maven-site-plugin] branch maven-3.2.5 updated (c965c21f -> 32be6ad8)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git omit c965c21f Fix test omit 7794b991 Upgrade to maven 3.2.5 + Java8 add 522eddd7 [MSITE-889] Upgrade Plexus Utils to 3.3.1 add 606a3270 [MSITE-857] Jetty engine fails to resolve web.xml DTD behind corporate proxy add 5f10ad14 [MSITE-890] Upgrade Jetty to 9.4.46.v20220331 add bf434e5d [MSITE-891] Upgrade plugins in ITs new 32be6ad8 [MSITE-888] Upgrade to Maven 3.2.5 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c965c21f) \ N -- N -- N refs/heads/maven-3.2.5 (32be6ad8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: pom.xml| 13 +++-- src/it/projects/full-reporting/pom.xml | 6 ++ src/main/resources/run/web.xml | 10 +- 3 files changed, 18 insertions(+), 11 deletions(-)
[maven-site-plugin] branch master updated (522eddd7 -> bf434e5d)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git from 522eddd7 [MSITE-889] Upgrade Plexus Utils to 3.3.1 new 606a3270 [MSITE-857] Jetty engine fails to resolve web.xml DTD behind corporate proxy new 5f10ad14 [MSITE-890] Upgrade Jetty to 9.4.46.v20220331 new bf434e5d [MSITE-891] Upgrade plugins in ITs 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: pom.xml| 10 +- src/it/projects/full-reporting/pom.xml | 6 ++ src/main/resources/run/web.xml | 10 +- 3 files changed, 16 insertions(+), 10 deletions(-)
[maven-site-plugin] 03/03: [MSITE-891] Upgrade plugins in ITs
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git commit bf434e5d0e37ce85392a96587ad2f4ec58c63641 Author: Michael Osipov AuthorDate: Sat Apr 16 22:35:50 2022 +0200 [MSITE-891] Upgrade plugins in ITs --- pom.xml| 8 src/it/projects/full-reporting/pom.xml | 6 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 23422c7e..27cc1546 100644 --- a/pom.xml +++ b/pom.xml @@ -205,11 +205,11 @@ under the License. 3.5.1 1.7.36 -2.9.1 +3.1.2 3.3.2 -3.11.0 -3.1.1 -3.2.1 +3.16.0 +3.2.0 +3.2.2 2.22.2 2.22.2 2022-02-13T11:25:26Z diff --git a/src/it/projects/full-reporting/pom.xml b/src/it/projects/full-reporting/pom.xml index f5399a67..25e958e8 100644 --- a/src/it/projects/full-reporting/pom.xml +++ b/src/it/projects/full-reporting/pom.xml @@ -69,6 +69,9 @@ under the License. org.apache.maven.plugins maven-checkstyle-plugin @checkstylePluginVersion@ + + sun_checks.xml + org.apache.maven.plugins @@ -128,6 +131,9 @@ under the License. org.apache.maven.plugins maven-checkstyle-plugin @checkstylePluginVersion@ + + sun_checks.xml + org.codehaus.mojo
[maven-site-plugin] 02/03: [MSITE-890] Upgrade Jetty to 9.4.46.v20220331
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git commit 5f10ad146fec988f892a56b82b83e5c41ede3604 Author: Michael Osipov AuthorDate: Sat Apr 16 21:54:55 2022 +0200 [MSITE-890] Upgrade Jetty to 9.4.46.v20220331 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31d4173c..23422c7e 100644 --- a/pom.xml +++ b/pom.xml @@ -201,7 +201,7 @@ under the License. 1.11.1 1.11.1 -9.4.44.v20210927 +9.4.46.v20220331 3.5.1 1.7.36
[maven-site-plugin] 01/03: [MSITE-857] Jetty engine fails to resolve web.xml DTD behind corporate proxy
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git commit 606a327097202f3f90bfd60e66a7c4cb6a53d004 Author: Michael Osipov AuthorDate: Sat Apr 16 21:52:38 2022 +0200 [MSITE-857] Jetty engine fails to resolve web.xml DTD behind corporate proxy Upgrade web.xml to Servlet 3.1 which Jetty will serve its schema from a bundled catalog and avoid outbound connections. --- src/main/resources/run/web.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/run/web.xml b/src/main/resources/run/web.xml index 66bf8ee9..9b8e3325 100644 --- a/src/main/resources/run/web.xml +++ b/src/main/resources/run/web.xml @@ -17,11 +17,11 @@ specific language governing permissions and limitations under the License. --> -http://java.sun.com/dtd/web-app_2_3.dtd"; > - - +http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee + http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; + version="3.1"> doxia org.apache.maven.plugins.site.run.DoxiaFilter
[maven-site-plugin] branch dependabot/maven/jettyVersion-11.0.9 updated (b11631d6 -> 0115c718)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/jettyVersion-11.0.9 in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git discard b11631d6 Bump jettyVersion from 9.4.44.v20210927 to 11.0.9 add 522eddd7 [MSITE-889] Upgrade Plexus Utils to 3.3.1 add 0115c718 Bump jettyVersion from 9.4.44.v20210927 to 11.0.9 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b11631d6) \ N -- N -- N refs/heads/dependabot/maven/jettyVersion-11.0.9 (0115c718) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-resolver] branch dynamic-lrm updated (307d677f -> 2a5f0218)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch dynamic-lrm
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
from 307d677f Config renames
add 2a5f0218 Refactor more, add more toggles
No new revisions were added by this update.
Summary of changes:
.../LocalPathPrefixComposerFactorySupport.java | 54 +-
.../impl/SplitLocalPathPrefixComposerFactory.java | 64 +++---
...itRepositoryLocalPathPrefixComposerFactory.java | 49 ++---
...> EnhancedSplitLocalRepositoryManagerTest.java} | 6 +-
4 files changed, 107 insertions(+), 66 deletions(-)
rename
maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/{DynamicLocalRepositoryManagerTest.java
=> EnhancedSplitLocalRepositoryManagerTest.java} (98%)
[maven-site-plugin] branch dependabot/maven/jettyVersion-11.0.9 updated (886273b8 -> b11631d6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/jettyVersion-11.0.9 in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git discard 886273b8 Bump jettyVersion from 9.4.44.v20210927 to 11.0.9 add 8382743c [MSITE-884] Drop/replace usage of Commons Lang 3 add 628f5b3a [MSITE-885] Upgrade Commons IO to 2.11.0 add 7a3ed19c [MSITE-886] Upgrade Maven Wagon to 3.5.1 add 73df7bb9 Remove unused properties add 6c42df38 Add undeclared dependency add d1bfb429 [MSITE-887] Deprecate templateFile parameter add b11631d6 Bump jettyVersion from 9.4.44.v20210927 to 11.0.9 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (886273b8) \ N -- N -- N refs/heads/dependabot/maven/jettyVersion-11.0.9 (b11631d6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 21 ++--- .../plugins/site/deploy/AbstractStagingMojo.java| 2 +- .../plugins/site/deploy/SiteStageDeployMojo.java| 2 +- .../plugins/site/descriptor/EffectiveSiteMojo.java | 5 + .../site/render/AbstractSiteRenderingMojo.java | 2 ++ .../maven/plugins/site/deploy/HttpRequest.java | 8 +++- 6 files changed, 18 insertions(+), 22 deletions(-)
[maven-site-plugin] branch master updated: [MSITE-889] Upgrade Plexus Utils to 3.3.1
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git The following commit(s) were added to refs/heads/master by this push: new 522eddd7 [MSITE-889] Upgrade Plexus Utils to 3.3.1 522eddd7 is described below commit 522eddd70e4b822d8a14eba845c94b3f88edef7e Author: Michael Osipov AuthorDate: Sat Apr 16 21:34:29 2022 +0200 [MSITE-889] Upgrade Plexus Utils to 3.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ece8805a..31d4173c 100644 --- a/pom.xml +++ b/pom.xml @@ -318,7 +318,7 @@ under the License. org.codehaus.plexus plexus-utils - 3.3.0 + 3.3.1
[maven-site-plugin] branch maven-3.2.5 updated (a7be5b41 -> c965c21f)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git discard a7be5b41 Fix test discard cb1a10e6 Upgrade to maven 3.2.5 + Java8 add 8382743c [MSITE-884] Drop/replace usage of Commons Lang 3 add 628f5b3a [MSITE-885] Upgrade Commons IO to 2.11.0 add 7a3ed19c [MSITE-886] Upgrade Maven Wagon to 3.5.1 add 73df7bb9 Remove unused properties add 6c42df38 Add undeclared dependency add d1bfb429 [MSITE-887] Deprecate templateFile parameter new 7794b991 Upgrade to maven 3.2.5 + Java8 new c965c21f Fix test This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a7be5b41) \ N -- N -- N refs/heads/maven-3.2.5 (c965c21f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 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: pom.xml | 16 .../maven/plugins/site/deploy/AbstractStagingMojo.java | 2 +- .../maven/plugins/site/deploy/SiteStageDeployMojo.java | 2 +- .../maven/plugins/site/descriptor/EffectiveSiteMojo.java | 5 + .../plugins/site/render/AbstractSiteRenderingMojo.java | 2 ++ .../apache/maven/plugins/site/deploy/HttpRequest.java| 8 +++- 6 files changed, 16 insertions(+), 19 deletions(-)
[maven-site-plugin] 01/02: Upgrade to maven 3.2.5 + Java8
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 7794b9914bda257e5f9dec0cc6857a7c010f952f
Author: Tamas Cservenak
AuthorDate: Tue Feb 22 16:39:45 2022 +0100
Upgrade to maven 3.2.5 + Java8
---
pom.xml | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ece8805a..bbc65082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,9 +195,8 @@ under the License.
-3.0.5
+3.2.5
8
-
1.11.1
1.11.1
@@ -252,6 +251,12 @@ under the License.
${mavenVersion}
provided
+
+ org.apache.maven
+ maven-aether-provider
+ ${mavenVersion}
+ provided
+
org.apache.maven
maven-model
@@ -318,7 +323,7 @@ under the License.
org.codehaus.plexus
plexus-utils
- 3.3.0
+ 3.4.1
@@ -401,6 +406,12 @@ under the License.
org.apache.maven.doxia
doxia-integration-tools
${doxiaSitetoolsVersion}
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
@@ -501,7 +512,7 @@ under the License.
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 2.1
+ 3.3.0
test
[maven-site-plugin] 02/02: Fix test
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit c965c21fbbb8f1182d40c23a622284ea809085e0
Author: Tamas Cservenak
AuthorDate: Tue Feb 22 16:42:30 2022 +0100
Fix test
---
.../org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
index 59f41b44..c512ef03 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugins.site.deploy;
import org.apache.maven.artifact.manager.WagonManager;
//import org.apache.maven.wagon.repository.Repository;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,7 +32,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith( JUnit4.class )
public class SiteDeployMojoTest
-extends PlexusTestCase
+extends AbstractMojoTestCase
{
private WagonManager wagonManager;
@@ -102,7 +102,7 @@ public class SiteDeployMojoTest
public void
testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts2()
{
wagonManager.
-
+
wagonManager.addProxy( "scp", "localhost", 8080, "my-user",
"my-password", "*mycompany" );
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository,
wagonManager );
assertNotNull( "ProxyInfo must be found because 'repository-host' not
in nonProxyHosts list", proxyInfo );
[maven-site-plugin] branch master updated (af097dce -> d1bfb429)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git from af097dce Bump slf4jVersion from 1.7.32 to 1.7.36 new 8382743c [MSITE-884] Drop/replace usage of Commons Lang 3 new 628f5b3a [MSITE-885] Upgrade Commons IO to 2.11.0 new 7a3ed19c [MSITE-886] Upgrade Maven Wagon to 3.5.1 new 73df7bb9 Remove unused properties new 6c42df38 Add undeclared dependency new d1bfb429 [MSITE-887] Deprecate templateFile parameter The 6 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: pom.xml | 21 ++--- .../plugins/site/deploy/AbstractStagingMojo.java| 2 +- .../plugins/site/deploy/SiteStageDeployMojo.java| 2 +- .../plugins/site/descriptor/EffectiveSiteMojo.java | 5 + .../site/render/AbstractSiteRenderingMojo.java | 2 ++ .../maven/plugins/site/deploy/HttpRequest.java | 8 +++- 6 files changed, 18 insertions(+), 22 deletions(-)
[maven-site-plugin] 01/06: [MSITE-884] Drop/replace usage of Commons Lang 3
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 8382743ceaf55dc1f4695e12ed8d3a1e2917a2c9
Author: Michael Osipov
AuthorDate: Sat Apr 16 20:35:47 2022 +0200
[MSITE-884] Drop/replace usage of Commons Lang 3
---
pom.xml | 6 --
.../org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java | 2 +-
.../org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java | 2 +-
.../apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java | 5 +
.../java/org/apache/maven/plugins/site/deploy/HttpRequest.java| 8 +++-
5 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 338988d8..dbf8e2cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,12 +486,6 @@ under the License.
test
-
- org.apache.commons
- commons-lang3
- 3.8.1
-
-
commons-io
commons-io
diff --git
a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
index f51e9eb4..7070b530 100644
---
a/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
+++
b/src/main/java/org/apache/maven/plugins/site/deploy/AbstractStagingMojo.java
@@ -19,10 +19,10 @@ package org.apache.maven.plugins.site.deploy;
* under the License.
*/
-import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.StringUtils;
/**
* Abstract base class for staging mojos.
diff --git
a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
index 173c5025..e31c7513 100644
---
a/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
+++
b/src/main/java/org/apache/maven/plugins/site/deploy/SiteStageDeployMojo.java
@@ -20,7 +20,6 @@ package org.apache.maven.plugins.site.deploy;
*/
import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
import org.apache.maven.model.Build;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
@@ -30,6 +29,7 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
diff --git
a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
index 879a5b6f..556f6bfb 100644
---
a/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
+++
b/src/main/java/org/apache/maven/plugins/site/descriptor/EffectiveSiteMojo.java
@@ -19,7 +19,6 @@ package org.apache.maven.plugins.site.descriptor;
* under the License.
*/
-import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
import org.apache.maven.plugin.MojoExecutionException;
@@ -117,9 +116,7 @@ public class EffectiveSiteMojo
{
XmlWriterUtil.writeCommentLineBreak( writer );
XmlWriterUtil.writeComment( writer, " " );
-// Use ISO 8601 format for date and time
-String formattedDateTime = DateFormatUtils.ISO_DATETIME_FORMAT.format(
System.currentTimeMillis() );
-XmlWriterUtil.writeComment( writer, "Generated by Maven Site Plugin on
" + formattedDateTime );
+XmlWriterUtil.writeComment( writer, "Generated by Maven Site Plugin" );
XmlWriterUtil.writeComment( writer, "See:
http://maven.apache.org/plugins/maven-site-plugin/"; );
XmlWriterUtil.writeComment( writer, " " );
XmlWriterUtil.writeCommentLineBreak( writer );
diff --git
a/src/test/java/org/apache/maven/plugins/site/deploy/HttpRequest.java
b/src/test/java/org/apache/maven/plugins/site/deploy/HttpRequest.java
index b1491a4f..b7d5cd8f 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/HttpRequest.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/HttpRequest.java
@@ -19,8 +19,6 @@ package org.apache.maven.plugins.site.deploy;
* under the License.
*/
-import org.apache.commons.lang3.SystemUtils;
-
import java.util.HashMap;
import java.util.Map;
@@ -41,12 +39,12 @@ class HttpRequest
public String toString()
{
StringBuilder sb = new StringBuilder( method ).append( " path "
).append( path )
-.append( SystemUtils.LINE_SEPARATOR
[maven-site-plugin] 03/06: [MSITE-886] Upgrade Maven Wagon to 3.5.1
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git commit 7a3ed19c5ff6339615b997d97dcfbae926dfbad1 Author: Michael Osipov AuthorDate: Sat Apr 16 20:38:44 2022 +0200 [MSITE-886] Upgrade Maven Wagon to 3.5.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e41bfad3..2b4b6f6c 100644 --- a/pom.xml +++ b/pom.xml @@ -205,7 +205,7 @@ under the License. 1.5.4 1.4 -3.3.1 +3.5.1 1.7.36 2.9.1
[maven-site-plugin] 06/06: [MSITE-887] Deprecate templateFile parameter
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git commit d1bfb429cc41a79fbbeaed3fa725fbcb9cd9285d Author: Michael Osipov AuthorDate: Sat Apr 16 21:15:24 2022 +0200 [MSITE-887] Deprecate templateFile parameter --- .../org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java index 16398c85..3fceab25 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java @@ -90,8 +90,10 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo * are disabled. It is highly recommended that you package this as a skin instead. * * @since 2.0-beta-5 + * @deprecated Upcoming major Doxia version removes support for template files in favor of skins. */ @Parameter( property = "templateFile" ) +@Deprecated private File templateFile; /**
[maven-site-plugin] 05/06: Add undeclared dependency
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git commit 6c42df388a5b8f50fe6e35ec4d74cb5981a13831 Author: Michael Osipov AuthorDate: Sat Apr 16 21:13:57 2022 +0200 Add undeclared dependency --- pom.xml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index aaafb629..ece8805a 100644 --- a/pom.xml +++ b/pom.xml @@ -424,6 +424,13 @@ under the License. + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + org.eclipse.jetty jetty-server
[maven-site-plugin] 02/06: [MSITE-885] Upgrade Commons IO to 2.11.0
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git commit 628f5b3a315ddd3431dd00bee5d0d81b666e353d Author: Michael Osipov AuthorDate: Sat Apr 16 20:36:58 2022 +0200 [MSITE-885] Upgrade Commons IO to 2.11.0 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dbf8e2cf..e41bfad3 100644 --- a/pom.xml +++ b/pom.xml @@ -489,7 +489,8 @@ under the License. commons-io commons-io - 2.6 + 2.11.0 + test
[maven-site-plugin] 04/06: Remove unused properties
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git commit 73df7bb9e0f9c2e421e79a8733302d557fa1b0ad Author: Michael Osipov AuthorDate: Sat Apr 16 20:38:56 2022 +0200 Remove unused properties --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2b4b6f6c..aaafb629 100644 --- a/pom.xml +++ b/pom.xml @@ -202,9 +202,6 @@ under the License. 1.11.1 1.11.1 9.4.44.v20210927 - -1.5.4 -1.4 3.5.1 1.7.36
[maven-site-plugin] 01/01: Fix test
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit a7be5b41a18fd250d009aec2b1551167249024a5
Author: Tamas Cservenak
AuthorDate: Tue Feb 22 16:42:30 2022 +0100
Fix test
---
.../org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
index 59f41b44..c512ef03 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugins.site.deploy;
import org.apache.maven.artifact.manager.WagonManager;
//import org.apache.maven.wagon.repository.Repository;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,7 +32,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith( JUnit4.class )
public class SiteDeployMojoTest
-extends PlexusTestCase
+extends AbstractMojoTestCase
{
private WagonManager wagonManager;
@@ -102,7 +102,7 @@ public class SiteDeployMojoTest
public void
testGetProxyInfoForRepositoryHostWildcardNoMatchNonProxyHosts2()
{
wagonManager.
-
+
wagonManager.addProxy( "scp", "localhost", 8080, "my-user",
"my-password", "*mycompany" );
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository,
wagonManager );
assertNotNull( "ProxyInfo must be found because 'repository-host' not
in nonProxyHosts list", proxyInfo );
[maven-site-plugin] branch maven-3.2.5 updated (242e6373 -> a7be5b41)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch maven-3.2.5 in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git discard 242e6373 Fix test new a7be5b41 Fix test This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (242e6373) \ N -- N -- N refs/heads/maven-3.2.5 (a7be5b41) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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: .../java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven-site-plugin] branch maven-3.2.5 updated (da9af586 -> 242e6373)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
omit da9af586 Fix test
omit 9b379ece Upgrade to maven 3.2.5 + Java8
add 6c53dfc1 Shared GitHub actions v2
add 0b1c775f [MSITE-829] [MSITE-828] Upgrade Jetty to 9.4.x implicit java8
requirement now (#21)
add 0d5299be Enable release drafter (#75)
add 13787944 Bump mrm-maven-plugin from 1.2.0 to 1.3.0
add af097dce Bump slf4jVersion from 1.7.32 to 1.7.36
new cb1a10e6 Upgrade to maven 3.2.5 + Java8
new 242e6373 Fix test
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (da9af586)
\
N -- N -- N refs/heads/maven-3.2.5 (242e6373)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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:
.../release-drafter.yml | 5 +++--
.github/workflows/maven-verify.yml | 6 +-
.../{maven-verify.yml => release-drafter.yml}| 20
Jenkinsfile | 2 +-
pom.xml | 10 ++
src/it/projects/MSITE-497/pom.xml| 1 +
6 files changed, 20 insertions(+), 24 deletions(-)
copy src/it/projects/MSITE-609/invoker.properties =>
.github/release-drafter.yml (84%)
copy .github/workflows/{maven-verify.yml => release-drafter.yml} (81%)
[maven-site-plugin] 01/02: Upgrade to maven 3.2.5 + Java8
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit cb1a10e6df9da8556585b1ef78f159de3835fd01
Author: Tamas Cservenak
AuthorDate: Tue Feb 22 16:39:45 2022 +0100
Upgrade to maven 3.2.5 + Java8
---
pom.xml | 26 ++
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 338988d8..5414fa14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,17 +195,15 @@ under the License.
-3.0.5
+3.2.5
8
-
1.11.1
1.11.1
9.4.44.v20210927
-
1.5.4
1.4
-3.3.1
+3.5.1
1.7.36
2.9.1
@@ -255,6 +253,12 @@ under the License.
${mavenVersion}
provided
+
+ org.apache.maven
+ maven-aether-provider
+ ${mavenVersion}
+ provided
+
org.apache.maven
maven-model
@@ -321,7 +325,7 @@ under the License.
org.codehaus.plexus
plexus-utils
- 3.3.0
+ 3.4.1
@@ -404,6 +408,12 @@ under the License.
org.apache.maven.doxia
doxia-integration-tools
${doxiaSitetoolsVersion}
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
@@ -489,20 +499,20 @@ under the License.
org.apache.commons
commons-lang3
- 3.8.1
+ 3.12.0
commons-io
commons-io
- 2.6
+ 2.11.0
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 2.1
+ 3.3.0
test
[maven-site-plugin] 02/02: Fix test
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.2.5
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 242e637340278a9284396444a3c23b1c6bb3100b
Author: Tamas Cservenak
AuthorDate: Tue Feb 22 16:42:30 2022 +0100
Fix test
---
.../java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
index 59f41b44..c275d4d5 100644
--- a/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/site/deploy/SiteDeployMojoTest.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugins.site.deploy;
import org.apache.maven.artifact.manager.WagonManager;
//import org.apache.maven.wagon.repository.Repository;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,7 +32,7 @@ import org.junit.runners.JUnit4;
*/
@RunWith( JUnit4.class )
public class SiteDeployMojoTest
-extends PlexusTestCase
+extends AbstractMojoTestCase
{
private WagonManager wagonManager;
[maven-parent] branch master updated: Fix jenkins url - site documentation
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-parent.git The following commit(s) were added to refs/heads/master by this push: new b3f074c Fix jenkins url - site documentation b3f074c is described below commit b3f074cd5d0a8f04e4c49eb17bae52280564d669 Author: Slawomir Jaranowski AuthorDate: Sat Apr 16 18:43:40 2022 +0200 Fix jenkins url - site documentation --- site-pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-pom.xml b/site-pom.xml index e2a7f83..8187d61 100644 --- a/site-pom.xml +++ b/site-pom.xml @@ -56,7 +56,7 @@ under the License. Jenkins - https://builds.apache.org/view/M-R/view/Maven/job/maven-box/job/maven-parent/ + https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-parent/
[maven-parent] branch master updated: Bump apache from 25 to 26
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-parent.git The following commit(s) were added to refs/heads/master by this push: new f91d9fa Bump apache from 25 to 26 f91d9fa is described below commit f91d9fa0713a88b38808a4e621d099129181146b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 15 04:35:17 2022 + Bump apache from 25 to 26 Bumps [apache](https://github.com/apache/maven-apache-parent) from 25 to 26. - [Release notes](https://github.com/apache/maven-apache-parent/releases) - [Commits](https://github.com/apache/maven-apache-parent/commits) --- updated-dependencies: - dependency-name: org.apache:apache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 140a0c2..96c7e8e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache apache -25 +26 ../asf/pom.xml
[maven] branch maven-3.9.x updated: [MNG-7454] Include resolver-transport-http in Maven (#720)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 85caf9802 [MNG-7454] Include resolver-transport-http in Maven (#720)
85caf9802 is described below
commit 85caf98029e43066579fc671f3138ea17e473224
Author: Tamas Cservenak
AuthorDate: Sat Apr 16 18:21:48 2022 +0200
[MNG-7454] Include resolver-transport-http in Maven (#720)
Addendum to 1ad5a1b1e9bb0a17fc12bbe0314564a616078602:
* fix property name to align with existing ones
* fix logging configuration as no more shaded httpClient
* fix constant names
---
.../src/conf/logging/simplelogger.properties | 6 ++--
.../DefaultRepositorySystemSessionFactory.java | 35 +++---
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/apache-maven/src/conf/logging/simplelogger.properties
b/apache-maven/src/conf/logging/simplelogger.properties
index 64b331b45..8c4a5d1e4 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/conf/logging/simplelogger.properties
@@ -26,7 +26,5 @@ org.slf4j.simpleLogger.log.Sisu=info
org.slf4j.simpleLogger.warnLevelString=WARNING
# MNG-6181: mvn -X also prints all debug logging from HttpClient
-# Be aware that the shaded packages are used
-# org.apache.http -> org.apache.maven.wagon.providers.http.httpclient
-org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient=off
-org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off
+org.slf4j.simpleLogger.log.org.apache.http=off
+org.slf4j.simpleLogger.log.org.apache.http.wire=off
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 5616743d1..e0db581db 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -63,19 +63,19 @@ import java.util.Map;
@Named
public class DefaultRepositorySystemSessionFactory
{
-private static final String MAVEN_TRANSPORT_KEY = "maven.transport";
+private static final String MAVEN_RESOLVER_TRANSPORT_KEY =
"maven.resolver.transport";
-private static final String MAVEN_TRANSPORT_WAGON = "wagon";
+private static final String MAVEN_RESOLVER_TRANSPORT_WAGON = "wagon";
-private static final String MAVEN_TRANSPORT_RESOLVER = "resolver";
+private static final String MAVEN_RESOLVER_TRANSPORT_NATIVE = "native";
-private static final String MAVEN_TRANSPORT_AUTO = "auto";
+private static final String MAVEN_RESOLVER_TRANSPORT_AUTO = "auto";
-private static final String WAGON_TRANSPORTER_KEY_PRIORITY_KEY =
"aether.priority.WagonTransporterFactory";
+private static final String WAGON_TRANSPORTER_PRIORITY_KEY =
"aether.priority.WagonTransporterFactory";
-private static final String RESOLVER_HTTP_TRANSPORTER_PRIORITY_KEY =
"aether.priority.HttpTransporterFactory";
+private static final String NATIVE_HTTP_TRANSPORTER_PRIORITY_KEY =
"aether.priority.HttpTransporterFactory";
-private static final String RESOLVER_FILE_TRANSPORTER_PRIORITY_KEY =
"aether.priority.FileTransporterFactory";
+private static final String NATIVE_FILE_TRANSPORTER_PRIORITY_KEY =
"aether.priority.FileTransporterFactory";
private static final String RESOLVER_MAX_PRIORITY = String.valueOf(
Float.MAX_VALUE );
@@ -241,23 +241,24 @@ public class DefaultRepositorySystemSessionFactory
}
session.setAuthenticationSelector( authSelector );
-String transport = request.getUserProperties().getProperty(
MAVEN_TRANSPORT_KEY, MAVEN_TRANSPORT_WAGON );
-if ( MAVEN_TRANSPORT_RESOLVER.equals( transport ) )
+String transport = request.getUserProperties()
+.getProperty( MAVEN_RESOLVER_TRANSPORT_KEY,
MAVEN_RESOLVER_TRANSPORT_WAGON );
+if ( MAVEN_RESOLVER_TRANSPORT_NATIVE.equals( transport ) )
{
// Make sure (whatever extra priority is set) that resolver native
is selected
-configProps.put( RESOLVER_FILE_TRANSPORTER_PRIORITY_KEY,
RESOLVER_MAX_PRIORITY );
-configProps.put( RESOLVER_HTTP_TRANSPORTER_PRIORITY_KEY,
RESOLVER_MAX_PRIORITY );
+configProps.put( NATIVE_FILE_TRANSPORTER_PRIORITY_KEY,
RESOLVER_MAX_PRIORITY );
+configProps.put( NATIVE_HTTP_TRANSPORTER_PRIORITY_KEY,
RESOLVER_MAX_PRIORITY );
}
-else if ( MAVEN_TRANSPORT_WAGON.equals( transport ) )
+else if ( MAVEN_RESOLVER_TRANSPORT_WAGON.equals( transport ) )
{
// Make sure (whatever extra priority is set) that wagon is
s
[maven] branch master updated: [MNG-7454] Include resolver-transport-http in Maven (#720)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 551009ab4 [MNG-7454] Include resolver-transport-http in Maven (#720)
551009ab4 is described below
commit 551009ab492d0e8fc47d5438c876d72367bcbcd2
Author: Tamas Cservenak
AuthorDate: Sat Apr 16 18:19:23 2022 +0200
[MNG-7454] Include resolver-transport-http in Maven (#720)
Addendum to be2b7f890d98af20eb0753650b6605a68a97ac05:
* fix property name to align with existing ones
* fix logging configuration as no more shaded httpClient
* fix constant names
---
.../maven/conf/logging/simplelogger.properties | 6 ++--
.../DefaultRepositorySystemSessionFactory.java | 35 +++---
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git
a/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties
b/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties
index 64b331b45..8c4a5d1e4 100644
--- a/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties
+++ b/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties
@@ -26,7 +26,5 @@ org.slf4j.simpleLogger.log.Sisu=info
org.slf4j.simpleLogger.warnLevelString=WARNING
# MNG-6181: mvn -X also prints all debug logging from HttpClient
-# Be aware that the shaded packages are used
-# org.apache.http -> org.apache.maven.wagon.providers.http.httpclient
-org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient=off
-org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off
+org.slf4j.simpleLogger.log.org.apache.http=off
+org.slf4j.simpleLogger.log.org.apache.http.wire=off
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 80c6ba794..323dfe87e 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -78,19 +78,19 @@ import org.slf4j.LoggerFactory;
@Named
public class DefaultRepositorySystemSessionFactory
{
-private static final String MAVEN_TRANSPORT_KEY = "maven.transport";
+private static final String MAVEN_RESOLVER_TRANSPORT_KEY =
"maven.resolver.transport";
-private static final String MAVEN_TRANSPORT_WAGON = "wagon";
+private static final String MAVEN_RESOLVER_TRANSPORT_WAGON = "wagon";
-private static final String MAVEN_TRANSPORT_RESOLVER = "resolver";
+private static final String MAVEN_RESOLVER_TRANSPORT_NATIVE = "native";
-private static final String MAVEN_TRANSPORT_AUTO = "auto";
+private static final String MAVEN_RESOLVER_TRANSPORT_AUTO = "auto";
-private static final String WAGON_TRANSPORTER_KEY_PRIORITY_KEY =
"aether.priority.WagonTransporterFactory";
+private static final String WAGON_TRANSPORTER_PRIORITY_KEY =
"aether.priority.WagonTransporterFactory";
-private static final String RESOLVER_HTTP_TRANSPORTER_PRIORITY_KEY =
"aether.priority.HttpTransporterFactory";
+private static final String NATIVE_HTTP_TRANSPORTER_PRIORITY_KEY =
"aether.priority.HttpTransporterFactory";
-private static final String RESOLVER_FILE_TRANSPORTER_PRIORITY_KEY =
"aether.priority.FileTransporterFactory";
+private static final String NATIVE_FILE_TRANSPORTER_PRIORITY_KEY =
"aether.priority.FileTransporterFactory";
private static final String RESOLVER_MAX_PRIORITY = String.valueOf(
Float.MAX_VALUE );
@@ -261,23 +261,24 @@ public class DefaultRepositorySystemSessionFactory
}
session.setAuthenticationSelector( authSelector );
-String transport = request.getUserProperties().getProperty(
MAVEN_TRANSPORT_KEY, MAVEN_TRANSPORT_WAGON );
-if ( MAVEN_TRANSPORT_RESOLVER.equals( transport ) )
+String transport = request.getUserProperties()
+.getProperty( MAVEN_RESOLVER_TRANSPORT_KEY,
MAVEN_RESOLVER_TRANSPORT_WAGON );
+if ( MAVEN_RESOLVER_TRANSPORT_NATIVE.equals( transport ) )
{
// Make sure (whatever extra priority is set) that resolver native
is selected
-configProps.put( RESOLVER_FILE_TRANSPORTER_PRIORITY_KEY,
RESOLVER_MAX_PRIORITY );
-configProps.put( RESOLVER_HTTP_TRANSPORTER_PRIORITY_KEY,
RESOLVER_MAX_PRIORITY );
+configProps.put( NATIVE_FILE_TRANSPORTER_PRIORITY_KEY,
RESOLVER_MAX_PRIORITY );
+configProps.put( NATIVE_HTTP_TRANSPORTER_PRIORITY_KEY,
RESOLVER_MAX_PRIORITY );
}
-else if ( MAVEN_TRANSPORT_WAGON.equals( transport ) )
+else if ( MAVEN_RESOLVER_TRANSPORT_WAGON.equals( transport ) )
{
/
[maven-javadoc-plugin] branch master updated: [MJAVADOC-696] Invalid anchors in Javadoc and plugin mojo
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 506cb74e [MJAVADOC-696] Invalid anchors in Javadoc and plugin mojo
506cb74e is described below
commit 506cb74e6abc4b108121b0c586a15b75dd5ccc39
Author: Michael Osipov
AuthorDate: Sat Apr 16 17:23:44 2022 +0200
[MJAVADOC-696] Invalid anchors in Javadoc and plugin mojo
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 123 ++---
1 file changed, 56 insertions(+), 67 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 709a2dc9..a26d19cd 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -539,7 +539,7 @@ public abstract class AbstractJavadocMojo
/**
* Detect the links for all modules defined in the project.
*
- * If {@link #reactorProjects} is defined in a non-aggregator way, it
generates default offline links
+ * If {@code reactorProjects} is defined in a non-aggregator way, it
generates default offline links
* between modules based on the defined project's urls. For instance, if a
parent project has two projects
* module1 and module2, the
-linkoffline will be:
*
@@ -562,12 +562,7 @@ public abstract class AbstractJavadocMojo
* By default, the goal detects the Javadoc API link depending the value
of the source
* parameter in the
org.apache.maven.plugins:maven-compiler-plugin
* (defined in ${project.build.plugins} or in
${project.build.pluginManagement}),
- * or try to compute it from the {@link #javadocExecutable} version.
- *
- * See
- * Javadoc
- * for the default values.
- *
+ * or try to compute it from the {@code javadocExecutable} version.
*
* @see #links
* @see #javaApiLinks
@@ -1132,7 +1127,7 @@ public abstract class AbstractJavadocMojo
*
* Notes:
*
- * only used if {@link #isOffline} is set to false.
+ * only used if {@code isOffline} is set to false.
* all given links should have a fetchable /package-list
file. For instance:
*
*
@@ -1140,35 +1135,31 @@ public abstract class AbstractJavadocMojo
*
*
* will be used because
https://docs.oracle.com/javase/1.4.2/docs/api/package-list
exists.
- * if {@link #detectLinks} is defined, the links between the project
dependencies are
+ * if {@code detectLinks} is defined, the links between the project
dependencies are
* automatically added.
- * if {@link #detectJavaApiLink} is defined, a Java API link, based on
the Java version of the
+ * if {@code detectJavaApiLink} is defined, a Java API link, based on
the Java version of the
* project's sources, will be added automatically.
*
* See https://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#link";>link.
- *
- * @see #detectLinks
- * @see #detectJavaApiLink
- * @see #dependencyLinks
*/
@Parameter( property = "links" )
protected ArrayList links;
-
+
/**
- * Redefine the apidoc URL for specific dependencies when using {@link
#detectLinks}.
+ * Redefine the apidoc URL for specific dependencies when using {@code
detectLinks}.
* Useful if the dependency wasn't build with Maven or when the apidocs
have been moved.
*
*
*
* groupId
* artifactId
- * classifier
+ * classifier
* version
*
*
*
- *
+ *
* @see #detectLinks
* @since 3.3.0
*/
@@ -1334,7 +1325,7 @@ public abstract class AbstractJavadocMojo
*
*
*
- * Note: if {@link #detectOfflineLinks} is defined, the offline
links between the project modules are
+ * Note: if {@code detectOfflineLinks} is defined, the offline
links between the project modules are
* automatically added if the goal is calling in a non-aggregator way.
*
* @see Javadoc.
@@ -1454,9 +1445,9 @@ public abstract class AbstractJavadocMojo
*/
@Parameter( property = "stylesheetfile" )
private String stylesheetfile;
-
+
/**
- * Specifies the path of an additional HTML stylesheet file relative to
the {@link #javadocDirectory}
+ * Specifies the path of an additional HTML stylesheet file relative to
the {@code javadocDirectory}
* Examp
[maven-site-plugin] branch doxia-2.0.0 updated: Bump major version
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch doxia-2.0.0 in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git The following commit(s) were added to refs/heads/doxia-2.0.0 by this push: new 0c33bbb5 Bump major version 0c33bbb5 is described below commit 0c33bbb5000310229de41b28211889d69f0e67ae Author: Michael Osipov AuthorDate: Sat Apr 16 14:07:56 2022 +0200 Bump major version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fdcf175c..d5d723eb 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. maven-site-plugin - 3.12.0-SNAPSHOT + 4.0.0-M1-SNAPSHOT maven-plugin Apache Maven Site Plugin
[maven] branch MNG-5222 updated (cef451673 -> 18fa7c9b4)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch MNG-5222 in repository https://gitbox.apache.org/repos/asf/maven.git discard cef451673 [MNG-5222] Improvement in deprecated params detection add 18fa7c9b4 [MNG-5222] Improvement in deprecated params detection This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cef451673) \ N -- N -- N refs/heads/MNG-5222 (18fa7c9b4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/maven/plugin/internal/DeprecatedPluginValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven] 01/01: [MNG-5222] Improvement in deprecated params detection
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MNG-5222
in repository https://gitbox.apache.org/repos/asf/maven.git
commit cef451673081be469e789055f75ec08cb1dd06cb
Author: Slawomir Jaranowski
AuthorDate: Fri Apr 15 20:52:02 2022 +0200
[MNG-5222] Improvement in deprecated params detection
---
.../plugin/internal/DefaultMavenPluginManager.java | 9 +-
.../plugin/internal/DeprecatedPluginValidator.java | 133 +
.../MavenPluginConfigurationValidator.java | 39 ++
.../internal/ValidatingConfigurationListener.java | 117 +-
4 files changed, 180 insertions(+), 118 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 66a49cb3d..51c49c84f 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -143,6 +143,7 @@ public class DefaultMavenPluginManager
private PluginVersionResolver pluginVersionResolver;
private PluginArtifactsCache pluginArtifactsCache;
private MavenPluginValidator pluginValidator;
+private MavenPluginConfigurationValidator configurationValidator;
private final ExtensionDescriptorBuilder extensionDescriptorBuilder = new
ExtensionDescriptorBuilder();
private final PluginDescriptorBuilder builder = new
PluginDescriptorBuilder();
@@ -158,7 +159,8 @@ public class DefaultMavenPluginManager
ExtensionRealmCache extensionRealmCache,
PluginVersionResolver pluginVersionResolver,
PluginArtifactsCache pluginArtifactsCache,
-MavenPluginValidator pluginValidator )
+MavenPluginValidator pluginValidator,
+MavenPluginConfigurationValidator configurationValidator )
{
this.container = container;
this.classRealmManager = classRealmManager;
@@ -170,6 +172,7 @@ public class DefaultMavenPluginManager
this.pluginVersionResolver = pluginVersionResolver;
this.pluginArtifactsCache = pluginArtifactsCache;
this.pluginValidator = pluginValidator;
+this.configurationValidator = configurationValidator;
}
public synchronized PluginDescriptor getPluginDescriptor( Plugin plugin,
List repositories,
@@ -603,6 +606,8 @@ public class DefaultMavenPluginManager
ExpressionEvaluator expressionEvaluator = new
PluginParameterExpressionEvaluator( session, mojoExecution );
+configurationValidator.validate( mojoDescriptor, pomConfiguration,
expressionEvaluator );
+
populateMojoExecutionFields( mojo, mojoExecution.getExecutionId(),
mojoDescriptor, pluginRealm,
pomConfiguration, expressionEvaluator
);
@@ -638,7 +643,7 @@ public class DefaultMavenPluginManager
ConfigurationListener listener = new DebugConfigurationListener(
logger );
ValidatingConfigurationListener validator =
-new ValidatingConfigurationListener( mojo, mojoDescriptor,
listener, expressionEvaluator );
+new ValidatingConfigurationListener( mojo, mojoDescriptor,
listener );
logger.debug( "Configuring mojo execution '" +
mojoDescriptor.getId() + ':' + executionId + "' with "
+ configuratorId + " configurator -->" );
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
new file mode 100644
index 0..03beb16e5
--- /dev/null
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
@@ -0,0 +1,133 @@
+package org.apache.maven.plugin.internal;
+
+/*
+ * 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 javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
+
[maven] branch MNG-5222 created (now cef451673)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch MNG-5222 in repository https://gitbox.apache.org/repos/asf/maven.git at cef451673 [MNG-5222] Improvement in deprecated params detection This branch includes the following new commits: new cef451673 [MNG-5222] Improvement in deprecated params detection 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-integration-testing] 01/01: [MNG-5222] Improvement in deprecated params detection
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MNG-5222
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 486a6d16061a90d8da4fd9bd54128522f17d0e7a
Author: Slawomir Jaranowski
AuthorDate: Sat Apr 16 09:37:55 2022 +0200
[MNG-5222] Improvement in deprecated params detection
---
.../it/MavenITmng5222MojoDeprecatedParamsTest.java | 30 +++---
.../maven/plugin/coreit/DeprecatedConfigMojo.java | 13 ++
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedParamsTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedParamsTest.java
index 2e8023dc1..08135e362 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedParamsTest.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedParamsTest.java
@@ -35,7 +35,7 @@ public class MavenITmng5222MojoDeprecatedParamsTest
{
public MavenITmng5222MojoDeprecatedParamsTest()
{
-super( "[3.9.0,)" );
+super( "[4.0.0-alpha-1,)" );
}
/**
@@ -107,13 +107,13 @@ public class MavenITmng5222MojoDeprecatedParamsTest
List warnLines = findDeprecationWarning( logLines );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedParam2' (user property
'config.deprecatedParam2') is deprecated: No reason given" ) );
+"[WARNING] Parameter 'deprecatedParam2' (user property
'config.deprecatedParam2') is deprecated: No reason given" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedArray' (user property
'config.deprecatedArray') is deprecated: deprecated array" ) );
+"[WARNING] Parameter 'deprecatedArray' (user property
'config.deprecatedArray') is deprecated: deprecated array" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedList' (user property
'config.deprecatedList') is deprecated: deprecated list" ) );
+"[WARNING] Parameter 'deprecatedList' (user property
'config.deprecatedList') is deprecated: deprecated list" ) );
assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
@@ -171,34 +171,34 @@ public class MavenITmng5222MojoDeprecatedParamsTest
List warnLines = findDeprecationWarning( logLines );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedParam' is deprecated: I'm
deprecated param" ) );
+"[WARNING] Parameter 'deprecatedParam' is deprecated: I'm
deprecated param" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedParam2' (user property
'config.deprecatedParam2') is deprecated: No reason given" ) );
+"[WARNING] Parameter 'deprecatedParam2' (user property
'config.deprecatedParam2') is deprecated: No reason given" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedParamWithDefaultConstant' is
deprecated: deprecated with constant value" ) );
+"[WARNING] Parameter 'deprecatedParamWithDefaultConstant' is
deprecated: deprecated with constant value" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedParamWithDefaultEvaluate' is
deprecated: deprecated with evaluate value" ) );
+"[WARNING] Parameter 'deprecatedParamWithDefaultEvaluate' is
deprecated: deprecated with evaluate value" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedArray' (user property
'config.deprecatedArray') is deprecated: deprecated array" ) );
+"[WARNING] Parameter 'deprecatedArray' (user property
'config.deprecatedArray') is deprecated: deprecated array" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedArrayWithDefaults' is
deprecated: deprecated array" ) );
+"[WARNING] Parameter 'deprecatedArrayWithDefaults' is deprecated:
deprecated array" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedList' (user property
'config.deprecatedList') is deprecated: deprecated list" ) );
+"[WARNING] Parameter 'deprecatedList' (user property
'config.deprecatedList') is deprecated: deprecated list" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedListWithDefaults' is deprecated:
deprecated list" ) );
+"[WARNING] Parameter 'deprecatedListWithDefaults' is deprecated:
deprecated list" ) );
assertTrue( warnLines.remove(
-"[WARNING] Parameter 'deprecatedProperties' is deprecated:
deprecated properties" ) );
+"[WARNING] Parameter 'deprecatedProperties' is deprecated:
deprecated properties" ) );
assertTrue(
[maven-integration-testing] branch MNG-5222 created (now 486a6d160)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch MNG-5222 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git at 486a6d160 [MNG-5222] Improvement in deprecated params detection This branch includes the following new commits: new 486a6d160 [MNG-5222] Improvement in deprecated params detection 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 links
This is an automated email from the ASF dual-hosted git repository.
hboutemy 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 a9541612 update links
a9541612 is described below
commit a954161237c0c43ea49bc531cb73e9ce07b70f4e
Author: Hervé Boutemy
AuthorDate: Sat Apr 16 10:15:07 2022 +0200
update links
---
.../release/maven-project-release-procedure.apt | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/content/apt/developers/release/maven-project-release-procedure.apt
b/content/apt/developers/release/maven-project-release-procedure.apt
index 4df9eb4d..776cf5e6 100644
--- a/content/apt/developers/release/maven-project-release-procedure.apt
+++ b/content/apt/developers/release/maven-project-release-procedure.apt
@@ -27,7 +27,7 @@
Performing a Maven Project Release
This document covers the common release procedures used by the Maven team to
perform releases.
-
+
* {Prerequisites}
Be sure that:
@@ -35,20 +35,20 @@ Performing a Maven Project Release
* you have a recent Git client installed and on your shell's path.
* you have JDK 8 installed and on your shell's path to build Maven 3.7.0+.
Details about minimum JDK version to build an appropriate version
-can be found here:
{{{https://maven.apache.org/docs/history.html}https://maven.apache.org/docs/history.html}}
+can be found here:
{{{/docs/history.html}https://maven.apache.org/docs/history.html}}
* if you receive an OutOfMemoryError during the build, make sure to have set
the environment variable <<>>
* you must use Maven 3.3.9+.
-
+
* follow Apache environment configuration steps outlined at:
{{{https://www.apache.org/dev/publishing-maven-artifacts.html#dev-env}Publishing
Maven Artifacts}}.
[]
* Before you begin
-
+
If you started here, you may first want to review one of the following
documents that cover the specifics of various types of releases we have in the
Maven Project:
-
+
* {{{./maven-core-release.html} Releasing Maven Core}}
* {{{./parent-pom-release.html} Releasing a parent POM}}
@@ -75,9 +75,9 @@ Performing a Maven Project Release
{{{https://infra.apache.org/publishing-maven-artifacts.html}Publishing
Maven Releases}}.
[[2]] Stage the latest documentation as explained in
{{{../website/deploy-component-reference-documentation.html}deploying Maven
components reference documentation}}.
-
+
* Call the vote
-
+
Propose a vote on the dev list with the closed issues, the issues left,
the staging repository and the staging site. For instance:
@@ -169,10 +169,10 @@ I will promote the source release zip file to Apache
distribution area and the a
* Copy the source release to the Apache Distribution Area
The official Apache release is the 'source-release' bundle distributed in
<<>>,
- as described in {{{http://www.apache.org/dev/release-distribution}Apache
release distribution policy}}.
+ as described in {{{https://www.apache.org/dev/release-distribution}Apache
Release Distribution Policy}}.
All releases for Maven must be copied to
{{{https://www.apache.org/dist/maven/}the official Maven release area}}.
- The release area is maintained with svnsubpub. To deliver a release, you add
it to
+ The release area is maintained with svnpubsub. To deliver a release, you add
it to
{{{https://dist.apache.org/repos/dist/release/maven}the subversion
repository for the dist area}}:
add the release, its signature and sha512 checksum files, copying them from
<<>> directory created during <<>> step.
@@ -192,7 +192,7 @@ wagon/wagon-2.2-source-release.zip.asc
wagon/wagon-2.2-source-release.zip.sha512
- You should also run 'svn rm' as needed to clear out older releases. As per
{{{https://www.apache.org/dev/release.html#where-do-releases-go}the release
policy}},
+ You should also run 'svn rm' as needed to clear out older releases. As per
{{{https://www.apache.org/legal/release-policy.html#where-do-releases-go}Apache
Release Policy}},
only the latest release on a branch should stay in the main dist areas. So
long as the previous release is at least a day old, the automatic archiver
will have copied it to the archive.
[maven-surefire] branch master updated: fixed typo
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 959c1e9ca fixed typo
959c1e9ca is described below
commit 959c1e9cabb8d06c72f5ebd7eb6e56e9987eccf8
Author: tibordigana
AuthorDate: Sat Apr 16 09:46:52 2022 +0200
fixed typo
---
.../apache/maven/surefire/api/report/RunMode.java | 21 +
.../surefire/api/stream/AbstractStreamEncoder.java | 2 +-
2 files changed, 2 insertions(+), 21 deletions(-)
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/RunMode.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/RunMode.java
index dbdd58029..a1d197725 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/RunMode.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/RunMode.java
@@ -19,11 +19,6 @@ package org.apache.maven.surefire.api.report;
* under the License.
*/
-import org.apache.maven.surefire.api.stream.AbstractStreamDecoder.Segment;
-
-import java.util.HashMap;
-import java.util.Map;
-
import static java.nio.charset.StandardCharsets.US_ASCII;
/**
@@ -40,9 +35,6 @@ public enum RunMode
RERUN_TEST_AFTER_FAILURE( "rerun-test-after-failure" );
//todo add here RERUN_TESTSET, see
https://github.com/apache/maven-surefire/pull/221
-// due to have fast and thread-safe Map
-public static final Map RUN_MODES = segmentsToRunModes();
-
private final String runmode;
private final byte[] runmodeBinary;
@@ -52,7 +44,7 @@ public enum RunMode
runmodeBinary = runmode.getBytes( US_ASCII );
}
-public String geRunmode()
+public String getRunmode()
{
return runmode;
}
@@ -61,15 +53,4 @@ public enum RunMode
{
return runmodeBinary;
}
-
-private static Map segmentsToRunModes()
-{
-Map runModes = new HashMap<>();
-for ( RunMode runMode : RunMode.values() )
-{
-byte[] array = runMode.getRunmodeBinary();
-runModes.put( new Segment( array, 0, array.length ), runMode );
-}
-return runModes;
-}
}
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamEncoder.java
b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamEncoder.java
index 9d3b765db..51a98730f 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamEncoder.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamEncoder.java
@@ -184,7 +184,7 @@ public abstract class AbstractStreamEncoder>
if ( runMode != null )
{
// one byte of length + one delimiter character ':' + +
one delimiter character ':'
-lengthOfMetadata += 1 + 1 + runMode.geRunmode().length() + 1;
+lengthOfMetadata += 1 + 1 + runMode.getRunmode().length() + 1;
}
if ( encoder != null )
