You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/05/24 18:39:55 UTC
[maven-javadoc-plugin] branch next updated (b3826cc -> aa83562)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
discard b3826cc Reqire Maven 3.1.1
add aa3e12c [maven-release-plugin] prepare release maven-javadoc-plugin-3.3.0
add d2e6f4f [maven-release-plugin] prepare for next development iteration
add 2c524ed [MJAVADOC-678] configure javadocOptionsDir to avoid default root value
new 22785f1 Reqire Maven 3.1.1
new d283880 Bump maven-common-artifact-filters from 3.1.1 to 3.2.0
new aa83562 Bump mockito-core from 3.9.0 to 3.10.0
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 (b3826cc)
\
N -- N -- N refs/heads/next (aa83562)
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 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 +++++-----
.../javadocjar-failonerror-plugin-config.xml | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
[maven-javadoc-plugin] 03/03: Bump mockito-core from 3.9.0 to 3.10.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit aa835625996020637a083b7383779e3a9d7782e4
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu May 13 07:02:20 2021 +0000
Bump mockito-core from 3.9.0 to 3.10.0
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.9.0...v3.10.0)
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4acc0d9..db52e54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,7 +347,7 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.9.0</version>
+ <version>3.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
[maven-javadoc-plugin] 01/03: Reqire Maven 3.1.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 22785f1052e20be09fd49a7a297b7947c101126e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue May 18 00:20:38 2021 +0200
Reqire Maven 3.1.1
---
pom.xml | 32 +++++++++----------
.../javadoc/AggregatorJavadocReportTest.java | 8 +++--
.../maven/plugins/javadoc/JavadocReportTest.java | 36 +++++++++++++---------
3 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index 14eacd7..2e0a1fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,15 +67,15 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.1.1</mavenVersion>
<doxiaVersion>1.9.1</doxiaVersion>
<doxia-sitetoolsVersion>1.9.2</doxia-sitetoolsVersion>
<wagonVersion>2.4</wagonVersion>
- <sonatypeAetherVersion>1.13.1</sonatypeAetherVersion>
+ <eclipseAetherVersion>0.9.0.M2</eclipseAetherVersion>
<plexus-java.version>1.0.7</plexus-java.version>
<!-- for ITs -->
- <sitePluginVersion>3.3</sitePluginVersion>
- <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
+ <sitePluginVersion>3.9.1</sitePluginVersion>
+ <projectInfoReportsPluginVersion>3.1.1</projectInfoReportsPluginVersion>
<project.build.outputTimestamp>2021-05-18T17:44:35Z</project.build.outputTimestamp>
</properties>
@@ -130,29 +130,29 @@ under the License.
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -329,7 +329,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -351,7 +351,7 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<scope>test</scope>
</dependency>
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 7f58c9d..84aa08e 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
@@ -34,8 +34,9 @@ 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;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
public class AggregatorJavadocReportTest
extends AbstractMojoTestCase
@@ -77,7 +78,8 @@ public class AggregatorJavadocReportTest
MavenSession session = newMavenSession( currentProject );
DefaultRepositorySystemSession repoSysSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSysSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ repoSysSession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
setVariableValueToObject( mojo, "session", session );
return mojo;
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 a7f00eb..ec9b724 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -54,16 +54,18 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugins.javadoc.ProxyServer.AuthAsyncProxyServlet;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.languages.java.version.JavaVersion;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
import org.hamcrest.MatcherAssert;
import org.junit.AssumptionViolatedException;
import org.junit.Ignore;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
/**
* Test {@link org.apache.maven.plugins.javadoc.JavadocReport} class.
@@ -487,8 +489,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -669,8 +672,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -970,8 +974,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1175,8 +1180,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1229,8 +1235,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1351,8 +1358,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
[maven-javadoc-plugin] 02/03: Bump maven-common-artifact-filters
from 3.1.1 to 3.2.0
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit d28388013a398158b14639f6103e634ab3a7d87d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sun May 2 08:05:16 2021 +0000
Bump maven-common-artifact-filters from 3.1.1 to 3.2.0
Bumps [maven-common-artifact-filters](https://github.com/apache/maven-common-artifact-filters) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/apache/maven-common-artifact-filters/releases)
- [Commits](https://github.com/apache/maven-common-artifact-filters/compare/maven-common-artifact-filters-3.1.1...maven-common-artifact-filters-3.2.0)
Signed-off-by: dependabot[bot] <su...@github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2e0a1fb..4acc0d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,7 +220,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>