[maven] branch test-for-MNG-5669 created (now 209e643)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch test-for-MNG-5669 in repository https://gitbox.apache.org/repos/asf/maven.git. at 209e643 Add ModelSource test for MNG-5669 This branch includes the following new commits: new 209e643 Add ModelSource test for MNG-5669 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] 01/01: Add ModelSource test for MNG-5669
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch test-for-MNG-5669
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 209e6434d2baf963d8eb3e18b1b70cddebe5a819
Author: Michael Osipov
AuthorDate: Mon Aug 16 23:24:07 2021 +0200
Add ModelSource test for MNG-5669
---
.../apache/maven/project/ProjectBuilderTest.java | 26 ++
.../resources/projects/modelsourcebasedir/pom.xml | 19
2 files changed, 45 insertions(+)
diff --git
a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index e2babbf..fbe1a4e 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -32,6 +32,7 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.shared.utils.io.FileUtils;
import org.junit.jupiter.api.Test;
@@ -332,4 +333,29 @@ public class ProjectBuilderTest
assertNotNull( "Missing version for build plugin " +
buildPlugin.getKey(), buildPlugin.getVersion() );
}
}
+
+@Test
+public void testBuildFromModelSourceResolvesBasedir()
+throws Exception
+{
+File pomFile = new File(
"src/test/resources/projects/modelsourcebasedir/pom.xml" );
+MavenSession mavenSession = createMavenSession( null );
+ProjectBuildingRequest configuration = new
DefaultProjectBuildingRequest();
+configuration.setRepositorySession(
mavenSession.getRepositorySession() );
+ModelSource modelSource = new FileModelSource( pomFile );
+ProjectBuildingResult result =
+getContainer().lookup(
org.apache.maven.project.ProjectBuilder.class ).build( modelSource,
configuration );
+
+assertEquals( pomFile.getAbsoluteFile(),
result.getProject().getModel().getPomFile().getAbsoluteFile() );
+int errors = 0;
+for ( ModelProblem p : result.getProblems() )
+{
+if ( p.getSeverity() == ModelProblem.Severity.ERROR )
+{
+errors++;
+}
+}
+assertEquals( 0, errors );
+}
+
}
diff --git a/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
b/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
new file mode 100644
index 000..ec0f7d3
--- /dev/null
+++ b/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
@@ -0,0 +1,19 @@
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+ test.readparent
+ local-parent
+ pom
+ 1.0
+
+
+
+ blah
+ blah
+ 0.0.1-SNASPSHOT
+ system
+ ${basedir}/blah.jar
+
+
+
+
svn commit: r1892388 - in /maven/website/content: docs/3.8.2/release-notes.html maven-site-1.0-site.jar
Author: svn-site-role Date: Mon Aug 16 20:34:25 2021 New Revision: 1892388 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/docs/3.8.2/release-notes.html maven/website/content/maven-site-1.0-site.jar Modified: maven/website/content/docs/3.8.2/release-notes.html == --- maven/website/content/docs/3.8.2/release-notes.html (original) +++ maven/website/content/docs/3.8.2/release-notes.html Mon Aug 16 20:34:25 2021 @@ -161,6 +161,7 @@ If any of your plugin mojos spawns new threads there might be a change in class loading as a result of the fix for https://issues.apache.org/jira/browse/MNG-6843;>MNG-6843. See https://lists.apache.org/thread.html/r0777c9e364f93a609cb4c3da6e634139b9c400166e280856ee25ba72%40%3Cdev.maven.apache.org%3E;>discussion with a possible fix for your plugin mojo as well as a potential general fix in https://issues.apache.org/jira/browse/MNG-7212;>MNG-7212. If any or your projects relies on a Maven Core artifacts and your build is perfomed with Maven 3.8.1 or later a transitive dependency parent of Sisu Plexus/CPI API 1.0 will inject a remote repository over HTTP which will be blocked by default and (might) lead to build failures. See https://lists.apache.org/thread.html/rda29028b2c8985f3b94e721d3014a948b312fbddf95ffaa4971acc03%40%3Cusers.maven.apache.org%3E;>discussion and https://issues.apache.org/jira/browse/MNG-7214;>MNG-7214 for details. +https://issues.apache.org/jira/browse/MNG-7170;>MNG-7170 has caused a regression where non-reactor projects have basedir set and plugins as well as other components make false assumptions. See https://lists.apache.org/thread.html/r226ec816d20c84c532dca5eff5de66028259521c79610e3efc2b0f63%40%3Cdev.maven.apache.org%3E;>discussion and https://issues.apache.org/jira/browse/MNG-7215;>MNG-7215 for details. Complete Release Notes See complete release notes for all versions Modified: maven/website/content/maven-site-1.0-site.jar == Binary files - no diff available.
[maven-site] branch master updated: Document regression on Maven 3.8.2
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.git The following commit(s) were added to refs/heads/master by this push: new 545123d Document regression on Maven 3.8.2 545123d is described below commit 545123d80751eae567acd15c13c83ba00e2515a6 Author: Michael Osipov AuthorDate: Mon Aug 16 22:32:58 2021 +0200 Document regression on Maven 3.8.2 --- content/markdown/docs/3.8.2/release-notes.md | 5 + 1 file changed, 5 insertions(+) diff --git a/content/markdown/docs/3.8.2/release-notes.md b/content/markdown/docs/3.8.2/release-notes.md index 3553e63..eb30ad5 100644 --- a/content/markdown/docs/3.8.2/release-notes.md +++ b/content/markdown/docs/3.8.2/release-notes.md @@ -51,6 +51,8 @@ The full list of changes can be found in our [issue management system][4]. or later a transitive dependency parent of Sisu Plexus/CPI API 1.0 will inject a remote repository over HTTP which will be blocked by default and (might) lead to build failures. See [discussion][9] and [MNG-7214][10] for details. +- [MNG-7170][11] has caused a regression where non-reactor projects have basedir set and plugins as + well as other components make false assumptions. See [discussion][12] and [MNG-7215][13] for details. ## Complete Release Notes @@ -66,3 +68,6 @@ See [complete release notes for all versions][5] [8]: https://issues.apache.org/jira/browse/MNG-7212 [9]: https://lists.apache.org/thread.html/rda29028b2c8985f3b94e721d3014a948b312fbddf95ffaa4971acc03%40%3Cusers.maven.apache.org%3E [10]: https://issues.apache.org/jira/browse/MNG-7214 +[11]: https://issues.apache.org/jira/browse/MNG-7170 +[12]: https://lists.apache.org/thread.html/r226ec816d20c84c532dca5eff5de66028259521c79610e3efc2b0f63%40%3Cdev.maven.apache.org%3E +[13]: https://issues.apache.org/jira/browse/MNG-7215
[maven] branch maven-3.8.x-revert-MNG-7170 updated (f9c50e4 -> eb546ae)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.8.x-revert-MNG-7170
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard f9c50e4 Revert "[MNG-7170] Allow to associate pomFile/${basedir} with
DefaultProjectBuilder.build(ModelSource, ...)"
new eb546ae [MNG-7216] [Regression] Revert MNG-7170
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 (f9c50e4)
\
N -- N -- N refs/heads/maven-3.8.x-revert-MNG-7170 (eb546ae)
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:
.../src/test/java/org/apache/maven/project/ProjectBuilderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven] 01/01: [MNG-7216] [Regression] Revert MNG-7170
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.8.x-revert-MNG-7170
in repository https://gitbox.apache.org/repos/asf/maven.git
commit eb546ae50d647f3d4e83c14de2eeb27dd5d2
Author: Michael Osipov
AuthorDate: Mon Aug 16 18:08:39 2021 +0200
[MNG-7216] [Regression] Revert MNG-7170
This reverts commit 5a8997312680a4b9c69a129801524691bc546c08.
---
.../apache/maven/project/ProjectBuilderTest.java | 26 --
.../resources/projects/modelsourcebasedir/pom.xml | 19
.../maven/model/building/DefaultModelBuilder.java | 9 +---
3 files changed, 1 insertion(+), 53 deletions(-)
diff --git
a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index 37d51cd..6adb10e 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -39,8 +39,6 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.model.building.ModelProblem;
-import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.shared.utils.io.FileUtils;
@@ -85,30 +83,6 @@ public class ProjectBuilderTest
assertNotNull( result.getProject().getParentFile() );
}
-public void testBuildFromModelSourceResolvesBasedir()
-throws Exception
-{
-File pomFile = new File(
"src/test/resources/projects/modelsourcebasedir/pom.xml" );
-MavenSession mavenSession = createMavenSession( null );
-ProjectBuildingRequest configuration = new
DefaultProjectBuildingRequest();
-configuration.setRepositorySession(
mavenSession.getRepositorySession() );
-ModelSource modelSource = new FileModelSource( pomFile );
-ProjectBuildingResult result =
-getContainer().lookup(
org.apache.maven.project.ProjectBuilder.class ).build( modelSource,
configuration );
-
-assertEquals( pomFile.getAbsoluteFile(),
result.getProject().getModel().getPomFile().getAbsoluteFile() );
-int errors = 0;
-for ( ModelProblem p : result.getProblems() )
-{
-if ( p.getSeverity() == Severity.ERROR )
-{
-errors++;
-}
-}
-assertEquals( 0, errors );
-}
-
-
public void testVersionlessManagedDependency()
throws Exception
{
diff --git a/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
b/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
deleted file mode 100644
index ec0f7d3..000
--- a/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
- 4.0.0
- test.readparent
- local-parent
- pom
- 1.0
-
-
-
- blah
- blah
- 0.0.1-SNASPSHOT
- system
- ${basedir}/blah.jar
-
-
-
-
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index a089f9d..70c9ed5 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -624,14 +624,7 @@ public class DefaultModelBuilder
throw problems.newModelBuildingException();
}
-if ( pomFile != null )
-{
-model.setPomFile( pomFile );
-}
-else if ( modelSource instanceof FileModelSource )
-{
-model.setPomFile( ( (FileModelSource) modelSource ).getFile() );
-}
+model.setPomFile( pomFile );
problems.setSource( model );
modelValidator.validateRawModel( model, request, problems );
[maven-rar-plugin] branch next deleted (was c5ce3a1)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch next in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git. was c5ce3a1 Bump maven-shared-utils from 3.2.1 to 3.3.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r1892385 [4/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/plugin/guide-java-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-plugin-development.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -43,7 +43,7 @@ Olivier Lamy" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-plugin-development.apt;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-report-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-report-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-report-plugin-development.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Bertrand Martin" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Report Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-report-plugin-development.apt;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/ide.html == --- maven/website/content/ide.html (original) +++ maven/website/content/ide.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Apache Maven IDE Integration https://github.com/apache/maven-site/tree/master/content/markdown/ide.md;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/index.html == --- maven/website/content/index.html (original) +++ maven/website/content/index.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Welcome to Apache Maven https://github.com/apache/maven-site/tree/master/content/xdoc/index.xml.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/install.html == --- maven/website/content/install.html (original) +++ maven/website/content/install.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Installing Apache Maven https://github.com/apache/maven-site/tree/master/content/markdown/install.md.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/issue-management.html == --- maven/website/content/issue-management.html (original) +++ maven/website/content/issue-management.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Overview https://github.com/apache/maven-site/tree/master/content/markdown/issue-management.md;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/mailing-lists.html == --- maven/website/content/mailing-lists.html (original) +++ maven/website/content/mailing-lists.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Project Mailing Lists -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/maven-1.x-eol.html == --- maven/website/content/maven-1.x-eol.html (original) +++ maven/website/content/maven-1.x-eol.html Mon Aug 16
svn commit: r1892385 [2/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/docs/2.2.1/release-notes.html == --- maven/website/content/docs/2.2.1/release-notes.html (original) +++ maven/website/content/docs/2.2.1/release-notes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.1 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.1/release-notes.apt.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-3/release-notes.html == --- maven/website/content/docs/3.0-alpha-3/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-3/release-notes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-3 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-3/release-notes.apt.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-4/release-notes.html == --- maven/website/content/docs/3.0-alpha-4/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-4/release-notes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-4 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-4/release-notes.apt.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-5/release-notes.html == --- maven/website/content/docs/3.0-alpha-5/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-5/release-notes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-5 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-5/release-notes.apt.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-6/release-notes.html == --- maven/website/content/docs/3.0-alpha-6/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-6/release-notes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-6 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-6/release-notes.apt.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-7/release-notes.html == --- maven/website/content/docs/3.0-alpha-7/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-7/release-notes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-7 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-7/release-notes.apt.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/docs/3.0-beta-1/release-notes.html == --- maven/website/content/docs/3.0-beta-1/release-notes.html (original) +++ maven/website/content/docs/3.0-beta-1/release-notes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-beta-1 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-beta-1/release-notes.apt.vm;>
svn commit: r1892385 [3/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/getting-started/index.html == --- maven/website/content/guides/getting-started/index.html (original) +++ maven/website/content/guides/getting-started/index.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Vincent Siveton" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Getting Started Guide https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/index.apt;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/guides/getting-started/maven-in-five-minutes.html == --- maven/website/content/guides/getting-started/maven-in-five-minutes.html (original) +++ maven/website/content/guides/getting-started/maven-in-five-minutes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven in 5 Minutes https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/maven-in-five-minutes.apt;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/guides/getting-started/windows-prerequisites.html == --- maven/website/content/guides/getting-started/windows-prerequisites.html (original) +++ maven/website/content/guides/getting-started/windows-prerequisites.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven on Windows https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/windows-prerequisites.apt;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/guides/index.html == --- maven/website/content/guides/index.html (original) +++ maven/website/content/guides/index.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Eric Redmond" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Documentation https://github.com/apache/maven-site/tree/master/content/apt/guides/index.apt.vm;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-archetypes.html == --- maven/website/content/guides/introduction/introduction-to-archetypes.html (original) +++ maven/website/content/guides/introduction/introduction-to-archetypes.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Archetypes https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-archetypes.apt;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html == --- maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html (original) +++ maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html Mon Aug 16 18:11:14 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -44,7 +44,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to the Dependency Mechanism https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt;> -| Last Published: 2021-08-15 +| Last Published: 2021-08-16 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html == --- maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html (original) +++
svn commit: r1892385 [1/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Author: svn-site-role Date: Mon Aug 16 18:11:14 2021 New Revision: 1892385 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-resource-bundles/index.html maven/website/content/archives/maven-2.x/index.html maven/website/content/archives/maven-2.x/maven-2.1-architectural-goals.html maven/website/content/articles.html maven/website/content/background/history-of-maven.html maven/website/content/background/philosophy-of-maven.html maven/website/content/ci-management.html maven/website/content/code-quality-management.html maven/website/content/community.html maven/website/content/configure.html maven/website/content/developers/committer-environment.html maven/website/content/developers/committer-settings.html maven/website/content/developers/compatibility-plan.html maven/website/content/developers/conventions/code.html maven/website/content/developers/conventions/git.html maven/website/content/developers/conventions/jira.html maven/website/content/developers/dependency-policies.html maven/website/content/developers/index.html maven/website/content/developers/mojo-api-specification.html maven/website/content/developers/release/index.html maven/website/content/developers/release/maven-core-release.html maven/website/content/developers/release/maven-project-release-procedure.html maven/website/content/developers/release/parent-pom-release.html maven/website/content/developers/release/pmc-gpg-keys.html maven/website/content/developers/retirement-plan-plugins.html maven/website/content/developers/website/component-reference-documentation-helper.html maven/website/content/developers/website/deploy-component-reference-documentation.html maven/website/content/developers/website/deploy-maven-website.html maven/website/content/developers/website/index.html maven/website/content/developers/website/website-overview.html maven/website/content/developers/welcome-to-new-committers.html maven/website/content/docs/2.0.1/release-notes.html maven/website/content/docs/2.0.10/release-notes.html maven/website/content/docs/2.0.11/release-notes.html maven/website/content/docs/2.0.2/release-notes.html maven/website/content/docs/2.0.3/release-notes.html maven/website/content/docs/2.0.4/release-notes.html maven/website/content/docs/2.0.5/release-notes.html maven/website/content/docs/2.0.6/release-notes.html maven/website/content/docs/2.0.7/release-notes.html maven/website/content/docs/2.0.8/release-notes.html maven/website/content/docs/2.0.9/release-notes.html maven/website/content/docs/2.0/release-notes.html maven/website/content/docs/2.1.0/release-notes.html maven/website/content/docs/2.2.0/release-notes.html maven/website/content/docs/2.2.1/release-notes.html maven/website/content/docs/3.0-alpha-3/release-notes.html maven/website/content/docs/3.0-alpha-4/release-notes.html maven/website/content/docs/3.0-alpha-5/release-notes.html maven/website/content/docs/3.0-alpha-6/release-notes.html maven/website/content/docs/3.0-alpha-7/release-notes.html maven/website/content/docs/3.0-beta-1/release-notes.html maven/website/content/docs/3.0-beta-2/release-notes.html maven/website/content/docs/3.0-beta-3/release-notes.html maven/website/content/docs/3.0.1/release-notes.html maven/website/content/docs/3.0.2/release-notes.html maven/website/content/docs/3.0.3/release-notes.html maven/website/content/docs/3.0.4/release-notes.html maven/website/content/docs/3.0.5/release-notes.html maven/website/content/docs/3.0/release-notes.html maven/website/content/docs/3.1.0-alpha-1/release-notes.html maven/website/content/docs/3.1.0/release-notes.html maven/website/content/docs/3.1.1/release-notes.html maven/website/content/docs/3.2.1/release-notes.html maven/website/content/docs/3.2.2/release-notes.html maven/website/content/docs/3.2.3/release-notes.html maven/website/content/docs/3.2.5/release-notes.html maven/website/content/docs/3.3.1/release-notes.html maven/website/content/docs/3.3.3/release-notes.html maven/website/content/docs/3.3.9/release-notes.html maven/website/content/docs/3.5.0-alpha-1/release-notes.html maven/website/content/docs/3.5.0-beta-1/release-notes.html maven/website/content/docs/3.5.0/release-notes.html maven/website/content/docs/3.5.2/release-notes.html maven/website/content/docs/3.5.3/release-notes.html maven/website/content/docs/3.5.4/release-notes.html maven/website/content/docs/3.6.0/release-notes.html maven/website/content/docs/3.6.1/release-notes.html maven/website/content/docs/3.6.2/release-notes.html maven/website/content/docs/3.6.3/release-notes.html
[maven-site] branch master updated: Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 (#250)
This is an automated email from the ASF dual-hosted git repository. elharo 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 09cc1d5 Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 (#250) 09cc1d5 is described below commit 09cc1d54a58e753921509d1be6bf85f9f840cd93 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Aug 16 18:07:05 2021 + Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 (#250) Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M3...enforcer-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-enforcer-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a91f6a4..2b6757a 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-enforcer-plugin -3.0.0-M3 +3.0.0 enforce-java8
[maven] branch maven-3.8.x-revert-MNG-7170 created (now f9c50e4)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven-3.8.x-revert-MNG-7170
in repository https://gitbox.apache.org/repos/asf/maven.git.
at f9c50e4 Revert "[MNG-7170] Allow to associate pomFile/${basedir} with
DefaultProjectBuilder.build(ModelSource, ...)"
This branch includes the following new commits:
new f9c50e4 Revert "[MNG-7170] Allow to associate pomFile/${basedir} with
DefaultProjectBuilder.build(ModelSource, ...)"
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] 01/01: Revert "[MNG-7170] Allow to associate pomFile/${basedir} with DefaultProjectBuilder.build(ModelSource, ...)"
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.8.x-revert-MNG-7170
in repository https://gitbox.apache.org/repos/asf/maven.git
commit f9c50e4d8216ffdaf16227dea20963aa0aeb820f
Author: Michael Osipov
AuthorDate: Mon Aug 16 18:08:39 2021 +0200
Revert "[MNG-7170] Allow to associate pomFile/${basedir} with
DefaultProjectBuilder.build(ModelSource, ...)"
This reverts commit 5a8997312680a4b9c69a129801524691bc546c08.
---
.../apache/maven/project/ProjectBuilderTest.java | 28 +-
.../resources/projects/modelsourcebasedir/pom.xml | 19 ---
.../maven/model/building/DefaultModelBuilder.java | 9 +--
3 files changed, 2 insertions(+), 54 deletions(-)
diff --git
a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index 37d51cd..a318821 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -39,8 +39,6 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.model.building.ModelProblem;
-import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.shared.utils.io.FileUtils;
@@ -85,30 +83,6 @@ public class ProjectBuilderTest
assertNotNull( result.getProject().getParentFile() );
}
-public void testBuildFromModelSourceResolvesBasedir()
-throws Exception
-{
-File pomFile = new File(
"src/test/resources/projects/modelsourcebasedir/pom.xml" );
-MavenSession mavenSession = createMavenSession( null );
-ProjectBuildingRequest configuration = new
DefaultProjectBuildingRequest();
-configuration.setRepositorySession(
mavenSession.getRepositorySession() );
-ModelSource modelSource = new FileModelSource( pomFile );
-ProjectBuildingResult result =
-getContainer().lookup(
org.apache.maven.project.ProjectBuilder.class ).build( modelSource,
configuration );
-
-assertEquals( pomFile.getAbsoluteFile(),
result.getProject().getModel().getPomFile().getAbsoluteFile() );
-int errors = 0;
-for ( ModelProblem p : result.getProblems() )
-{
-if ( p.getSeverity() == Severity.ERROR )
-{
-errors++;
-}
-}
-assertEquals( 0, errors );
-}
-
-
public void testVersionlessManagedDependency()
throws Exception
{
@@ -186,7 +160,7 @@ public class ProjectBuilderTest
File parent = new File( tempDir.toFile(), "pom.xml" );
String parentContent = FileUtils.fileRead( parent );
parentContent = parentContent.replaceAll(
"pom",
-
"pomaddedValue"
);
+
"pomaddedValue"
);
FileUtils.fileWrite( parent, "UTF-8", parentContent );
// re-build pom with modified parent
ProjectBuildingResult result = projectBuilder.build( child,
configuration );
diff --git a/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
b/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
deleted file mode 100644
index ec0f7d3..000
--- a/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
- 4.0.0
- test.readparent
- local-parent
- pom
- 1.0
-
-
-
- blah
- blah
- 0.0.1-SNASPSHOT
- system
- ${basedir}/blah.jar
-
-
-
-
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index a089f9d..70c9ed5 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -624,14 +624,7 @@ public class DefaultModelBuilder
throw problems.newModelBuildingException();
}
-if ( pomFile != null )
-{
-model.setPomFile( pomFile );
-}
-else if ( modelSource instanceof FileModelSource )
-{
-model.setPomFile( ( (FileModelSource) modelSource ).getFile() );
-}
+model.setPomFile( pomFile );
problems.setSource( model );
modelValidator.validateRawModel( model, request, problems );
[maven-compiler-plugin] branch dependabot/maven/mavenVersion-3.8.2 created (now 3364436)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/mavenVersion-3.8.2 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git. at 3364436 Bump mavenVersion from 3.0 to 3.8.2 No new revisions were added by this update.
[maven-artifact-transfer] branch dependabot/maven/org.apache.maven-maven-artifact-3.8.2 created (now f829d7d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven-maven-artifact-3.8.2 in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git. at f829d7d Bump maven-artifact from 3.0 to 3.8.2 No new revisions were added by this update.
[maven-artifact-transfer] branch dependabot/maven/org.apache.maven-maven-core-3.8.2 created (now 98b5818)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven-maven-core-3.8.2 in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git. at 98b5818 Bump maven-core from 3.0 to 3.8.2 No new revisions were added by this update.
[maven-shade-plugin] branch master updated (c13c9bb -> c648ccf)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. from c13c9bb Bump slf4j.version from 1.7.31 to 1.7.32 (#113) new 1dca37c [MSHADE-396] Improve SourceContent Shading new c648ccf [MSHADE-396] Add explanation to shadeSourcesContent documentation 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: .../apache/maven/plugins/shade/mojo/ShadeMojo.java | 16 ++-- .../plugins/shade/relocation/SimpleRelocator.java | 41 ++- .../shade/relocation/SimpleRelocatorTest.java | 46 ++ 3 files changed, 83 insertions(+), 20 deletions(-)
[maven-shade-plugin] 02/02: [MSHADE-396] Add explanation to shadeSourcesContent documentation
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git commit c648ccfade767acd5a59893a1719b58ed02fad99 Author: Alexander Kriegisch AuthorDate: Mon Jul 12 16:01:33 2021 +0700 [MSHADE-396] Add explanation to shadeSourcesContent documentation Explain purpose and limitations of heuristic source code shading approach. --- .../org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java index 6cc019c..d717253 100644 --- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java +++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java @@ -327,9 +327,19 @@ public class ShadeMojo private boolean createTestSourcesJar; /** - * When true, it will attempt to shade the contents of the java source files when creating the sources jar. When - * false, it will just relocate the java source files to the shaded paths, but will not modify the actual contents - * of the java source files. + * When true, it will attempt to shade the contents of Java source files when creating the sources JAR. When false, + * it will just relocate the Java source files to the shaded paths, but will not modify the actual source file + * contents. + * + * Please note: This feature uses a heuristic search & replace approach which covers many, but definitely not + * all possible cases of source code shading and its excludes. There is no full Java parser behind this + * functionality, which would be the only way to get this right for Java language elements. As for matching within + * Java string constants, this is next to impossible to get 100% right, trying to guess if they are used in + * reflection or not. + * + * Please understand that the source shading feature is not meant as a source code generator anyway, merely as a + * tool creating reasonably plausible source code when navigating to a relocated library class from an IDE, + * hopefully displaying source code which makes 95% sense - no more, no less. */ @Parameter( property = "shadeSourcesContent", defaultValue = "false" ) private boolean shadeSourcesContent;
[maven-shade-plugin] 01/02: [MSHADE-396] Improve SourceContent Shading
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit 1dca37c71649fa4f4aa110de3b78cc98d0e47eda
Author: Alexander Kriegisch
AuthorDate: Mon Jul 12 14:44:53 2021 +0700
[MSHADE-396] Improve SourceContent Shading
Improve search & replace heuristics without destroying previously
correct replacements in my test project (AspectJ). This solution is
still bound to fail in some situations, simply because it is just a
heuristic approach and not a full Java parser correctly recognising
package names in all possible situations in Java source code. As for
matching within Java string constants, this is next to impossible to get
100% right.
But the source shading feature is not meant as a source code
generator anyway, merely as a tool creating reasonably plausible source
code when navigating to a relocated library class from an IDE, hopefully
displaying source code which makes 95% sense - no more, no less.
---
.../plugins/shade/relocation/SimpleRelocator.java | 41 ++-
.../shade/relocation/SimpleRelocatorTest.java | 46 ++
2 files changed, 70 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
b/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
index 083957f..3837a67 100644
---
a/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
+++
b/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
@@ -34,6 +34,23 @@ import java.util.regex.Pattern;
public class SimpleRelocator
implements Relocator
{
+/**
+ * Match dot, slash or space at end of string
+ */
+private static final Pattern RX_ENDS_WITH_DOT_SLASH_SPACE =
Pattern.compile( "[./ ]$" );
+
+/**
+ * Match
+ * certain Java keywords + space
+ * beginning of Javadoc link + optional line breaks and
continuations with '*'
+ *
+ * at end of string
+ */
+private static final Pattern RX_ENDS_WITH_JAVA_KEYWORD = Pattern.compile(
+
"\\b(import|package|public|protected|private|static|final|synchronized|abstract|volatile)
$"
++ "|"
++ "\\{@link( \\*)* $"
+);
private final String pattern;
@@ -104,7 +121,7 @@ public class SimpleRelocator
{
this.includes.addAll( includes );
}
-
+
if ( excludes != null && !excludes.isEmpty() )
{
this.excludes.addAll( excludes );
@@ -121,7 +138,7 @@ public class SimpleRelocator
sourcePackageExcludes.add( exclude.substring(
pattern.length() ).replaceFirst( "[.][*]$", "" ) );
}
// Excludes should be subpackages of the global pattern
-else if ( exclude.startsWith( pathPattern ) )
+if ( exclude.startsWith( pathPattern ) )
{
sourcePathExcludes.add( exclude.substring(
pathPattern.length() ).replaceFirst( "[/][*]$", "" ) );
}
@@ -234,11 +251,8 @@ public class SimpleRelocator
{
return sourceContent;
}
-else
-{
-sourceContent = shadeSourceWithExcludes( sourceContent, pattern,
shadedPattern, sourcePackageExcludes );
-return shadeSourceWithExcludes( sourceContent, pathPattern,
shadedPathPattern, sourcePathExcludes );
-}
+sourceContent = shadeSourceWithExcludes( sourceContent, pattern,
shadedPattern, sourcePackageExcludes );
+return shadeSourceWithExcludes( sourceContent, pathPattern,
shadedPathPattern, sourcePathExcludes );
}
private String shadeSourceWithExcludes( String sourceContent, String
patternFrom, String patternTo,
@@ -248,8 +262,11 @@ public class SimpleRelocator
StringBuilder shadedSourceContent = new StringBuilder(
sourceContent.length() * 11 / 10 );
boolean isFirstSnippet = true;
// Make sure that search pattern starts at word boundary and we look
for literal ".", not regex jokers
-for ( String snippet : sourceContent.split( "\\b" +
patternFrom.replace( ".", "[.]" ) ) )
+String[] snippets = sourceContent.split( "\\b" + patternFrom.replace(
".", "[.]" ) + "\\b" );
+for ( int i = 0, snippetsLength = snippets.length; i < snippetsLength;
i++ )
{
+String snippet = snippets[i];
+String previousSnippet = isFirstSnippet ? "" : snippets[i - 1];
boolean doExclude = false;
for ( String excludedPattern : excludedPatterns )
{
@@ -263,10 +280,14 @@ public class SimpleRelocator
{
shadedSourceContent.append( snippet );
isFirstSnippet = false;
-}
+}
[maven-assembly-plugin] branch stabilize deleted (was 0702bae)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git. was 0702bae Apply groovy assertions in IT postscripts for better feedback in build output This change permanently discards the following revisions: discard 0702bae Apply groovy assertions in IT postscripts for better feedback in build output
[maven-dependency-plugin] branch stabilize deleted (was 59f95a6)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch stabilize in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. was 59f95a6 Log remoteRepositories This change permanently discards the following revisions: discard 59f95a6 Log remoteRepositories discard af33492 Add serverConnector discard d78a7d2 log NPE
[maven-dependency-plugin] branch master updated (8701774 -> ff03ffe)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. from 8701774 Bump plexus-utils from 3.3.0 to 3.4.0 (#148) add ff03ffe slf4j-simple must be only scope test No new revisions were added by this update. Summary of changes: pom.xml | 1 + 1 file changed, 1 insertion(+)
[maven-indexer] branch dependabot/maven/resolver.version-1.7.1 updated (8d73b06 -> ed83c04)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/resolver.version-1.7.1 in repository https://gitbox.apache.org/repos/asf/maven-indexer.git. discard 8d73b06 Bump resolver.version from 1.6.2 to 1.7.1 add 63fe110 update CI url add a2a4d69 Bump maven.version from 3.8.1 to 3.8.2 add ed83c04 Bump resolver.version from 1.6.2 to 1.7.1 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 (8d73b06) \ N -- N -- N refs/heads/dependabot/maven/resolver.version-1.7.1 (ed83c04) 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: README.md | 8 pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
[maven-indexer] branch master updated: Bump maven.version from 3.8.1 to 3.8.2
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-indexer.git The following commit(s) were added to refs/heads/master by this push: new a2a4d69 Bump maven.version from 3.8.1 to 3.8.2 a2a4d69 is described below commit a2a4d69cf5ede9a8bb205cb8bd2a9834b8dee9b7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Aug 16 04:02:39 2021 + Bump maven.version from 3.8.1 to 3.8.2 Bumps `maven.version` from 3.8.1 to 3.8.2. Updates `maven-model` from 3.8.1 to 3.8.2 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.8.1...maven-3.8.2) Updates `maven-model-builder` from 3.8.1 to 3.8.2 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.8.1...maven-3.8.2) --- updated-dependencies: - dependency-name: org.apache.maven:maven-model dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-model-builder dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cb96deb..e063a99 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ under the License. 0.3.4 5.0.1 5.5.5 -3.8.1 +3.8.2 1.6.2 3.2.0 3.4.3
[maven-shade-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.0 updated (6236de9 -> 227c43e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.0 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. discard 6236de9 Bump plexus-utils from 3.3.0 to 3.4.0 add b34dc80 run gh action with more jdk (#111) add 2d343cd use a property for slf4j version add c13c9bb Bump slf4j.version from 1.7.31 to 1.7.32 (#113) add 227c43e Bump plexus-utils from 3.3.0 to 3.4.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 (6236de9) \ N -- N -- N refs/heads/dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.0 (227c43e) 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: .github/workflows/maven.yml | 6 -- pom.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
[maven-shade-plugin] branch dependabot/maven/mavenVersion-3.8.2 created (now d9cc57e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/mavenVersion-3.8.2 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. at d9cc57e Bump mavenVersion from 3.1.1 to 3.8.2 No new revisions were added by this update.
[maven-shade-plugin] branch master updated: Bump slf4j.version from 1.7.31 to 1.7.32 (#113)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new c13c9bb Bump slf4j.version from 1.7.31 to 1.7.32 (#113)
c13c9bb is described below
commit c13c9bb1afeb9c6be8ca900c2bd0bb8cbdd2af3c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Aug 16 16:57:26 2021 +1000
Bump slf4j.version from 1.7.31 to 1.7.32 (#113)
Bumps `slf4j.version` from 1.7.31 to 1.7.32.
Updates `slf4j-api` from 1.7.31 to 1.7.32
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.31...v_1.7.32)
Updates `slf4j-simple` from 1.7.31 to 1.7.32
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.31...v_1.7.32)
---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-simple
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bf5596d..9fa2679 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
0.3.4
${project.version}
9.2
-1.7.31
+1.7.32
2021-07-14T11:28:32Z
[maven-dependency-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-archiver-4.2.5 updated (a0c7c90 -> 507045a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-archiver-4.2.5 in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. discard a0c7c90 Bump plexus-archiver from 4.2.2 to 4.2.5 add 367a682 [maven-release-plugin] prepare release maven-dependency-plugin-3.2.0 add 1ac708d [maven-release-plugin] prepare for next development iteration add c8ac026 Bump doxia-site-renderer from 1.9.2 to 1.10 (#142) add f3c20f8 Bump asm from 9.1 to 9.2 (#141) add a28c4b8 Bump doxiaVersion from 1.9.1 to 1.10 (#139) add f82b50e Use absolute URL for Dependency Mechanism link (#140) add 2caed76 Fix source repo link add 84cba60 update CI url add 9bb14b4 add gh actions add 05e0640 Fix Ci issue (#149) add 57bda75 javadoc currently fail with java11 add ca75de7 [MDEP-760] Java 1.8 as minimum (#150) add d3c2d42 Bump slf4j-simple from 1.7.30 to 1.7.32 (#151) add c9c4c78 fix dependabot as we are now java8 add e5b2d95 Bump jetty-server from 9.2.28.v20190418 to 9.4.41.v20210516 (#146) add e54e471 Bump commons-io from 2.6 to 2.11.0 (#153) add 8bbd1a3 Bump commons-lang3 from 3.8.1 to 3.12.0 (#152) add 8701774 Bump plexus-utils from 3.3.0 to 3.4.0 (#148) add 507045a Bump plexus-archiver from 4.2.2 to 4.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 (a0c7c90) \ N -- N -- N refs/heads/dependabot/maven/org.codehaus.plexus-plexus-archiver-4.2.5 (507045a) 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: .github/dependabot.yml | 28 --- .github/workflows/maven.yml| 54 ++ README.md | 8 ++-- pom.xml| 26 +++ .../maven/plugins/dependency/ListClassesMojo.java | 35 +++--- .../dependency/analyze/AbstractAnalyzeMojo.java| 9 +--- .../plugins/dependency/analyze/AnalyzeDepMgt.java | 26 --- .../dependency/analyze/AnalyzeDuplicateMojo.java | 4 +- .../AbstractFromConfigurationMojo.java | 2 +- .../fromDependencies/BuildClasspathMojo.java | 2 +- .../fromDependencies/CopyDependenciesMojo.java | 8 +--- .../ExcludeReactorProjectsDependencyFilter.java| 10 ++-- .../dependency/resolvers/GoOfflineMojo.java| 34 +++--- .../resolvers/ResolveDependenciesMojo.java | 25 ++ .../tree/AbstractVerboseGraphSerializer.java | 2 +- .../maven/plugins/dependency/tree/ArtifactKey.java | 8 ++-- .../maven/plugins/dependency/tree/TreeMojo.java| 2 +- .../tree/VerboseDependencyGraphBuilder.java| 26 +-- .../plugins/dependency/utils/DependencyUtil.java | 1 - .../dependency/utils/filters/MarkerFileFilter.java | 1 + .../examples/copying-project-dependencies.apt.vm | 2 +- src/site/apt/index.apt.vm | 4 +- src/site/site.xml | 2 +- .../maven/plugins/dependency/TestGetMojo.java | 10 +++- 24 files changed, 166 insertions(+), 163 deletions(-) create mode 100644 .github/workflows/maven.yml
[maven-dependency-plugin] branch master updated (8bbd1a3 -> 8701774)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. from 8bbd1a3 Bump commons-lang3 from 3.8.1 to 3.12.0 (#152) add 8701774 Bump plexus-utils from 3.3.0 to 3.4.0 (#148) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-dependency-plugin] branch dependabot/maven/org.mockito-mockito-core-3.11.2 created (now af45ec1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.mockito-mockito-core-3.11.2 in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. at af45ec1 Bump mockito-core from 2.28.2 to 3.11.2 No new revisions were added by this update.
[maven-dependency-plugin] branch master updated (e54e471 -> 8bbd1a3)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. from e54e471 Bump commons-io from 2.6 to 2.11.0 (#153) add 8bbd1a3 Bump commons-lang3 from 3.8.1 to 3.12.0 (#152) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-dependency-plugin] branch master updated (e5b2d95 -> e54e471)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git. from e5b2d95 Bump jetty-server from 9.2.28.v20190418 to 9.4.41.v20210516 (#146) add e54e471 Bump commons-io from 2.6 to 2.11.0 (#153) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-shade-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.0 created (now 6236de9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.0 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. at 6236de9 Bump plexus-utils from 3.3.0 to 3.4.0 No new revisions were added by this update.
[maven-shade-plugin] branch dependabot/maven/org.apache.maven.shared-maven-dependency-tree-3.1.0 updated (b0c3036 -> 7fc5f2f)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/org.apache.maven.shared-maven-dependency-tree-3.1.0
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
discard b0c3036 Bump maven-dependency-tree from 3.0.1 to 3.1.0
add cf2d90c [MSHADE-382] Add property to skip execution
add e8f13d6 Bump slf4j-simple from 1.7.30 to 1.7.31
add e8133dd Merge pull request #102 from
apache/dependabot/maven/org.slf4j-slf4j-simple-1.7.31
add 0070183 Bump asmVersion from 9.1 to 9.2
add 146b87b [MSHADE-391] Do not write modified class files for no-op
relocations
add 4d03156 update CI url
add c18d3d3 [MSHADE-401] Improve ServiceResourceTransformer
add a8d3a57 Bump jdependency from 2.6.0 to 2.7.0 (#99)
add b34dc80 run gh action with more jdk (#111)
add 2d343cd use a property for slf4j version
add 7fc5f2f Bump maven-dependency-tree from 3.0.1 to 3.1.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 (b0c3036)
\
N -- N -- N
refs/heads/dependabot/maven/org.apache.maven.shared-maven-dependency-tree-3.1.0
(7fc5f2f)
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:
.github/workflows/maven.yml| 6 +-
README.md | 8 +-
pom.xml| 9 +-
.../invoker.properties | 0
.../pom.xml| 18 +-
.../MSHADE-382_skip_execution/verify.groovy} | 7 +-
.../pom.xml| 48 +++--
.../verify.groovy | 173 +++
.../apache/maven/plugins/shade/DefaultShader.java | 232 +
.../apache/maven/plugins/shade/mojo/ShadeMojo.java | 12 ++
.../maven/plugins/shade/pom/MavenJDOMWriter.java | 18 +-
.../resource/ServicesResourceTransformer.java | 81 ++-
.../maven/plugins/shade/DefaultShaderTest.java | 77 +++
.../resource/ServiceResourceTransformerTest.java | 11 +-
14 files changed, 494 insertions(+), 206 deletions(-)
copy src/it/projects/{MSHADE-313_minimized-services =>
MSHADE-382_skip_execution}/invoker.properties (100%)
copy src/it/projects/{xml-transformer-ignores-dtd =>
MSHADE-382_skip_execution}/pom.xml (69%)
copy
src/it/{mrm/repository/MSHADE-247/mshade-247-one-0.1-sources.jar/org/apache/maven/its/shade/csj/Test.java
=> projects/MSHADE-382_skip_execution/verify.groovy} (88%)
copy src/it/projects/{MSHADE-182 =>
MSHADE-391_noRelocationKeepOriginalClasses}/pom.xml (52%)
create mode 100644
src/it/projects/MSHADE-391_noRelocationKeepOriginalClasses/verify.groovy
[maven-shade-plugin] branch dependabot/maven/slf4j.version-1.7.32 created (now 0eafee9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/slf4j.version-1.7.32 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. at 0eafee9 Bump slf4j.version from 1.7.31 to 1.7.32 No new revisions were added by this update.
[maven-shade-plugin] branch master updated: use a property for slf4j version
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 2d343cd use a property for slf4j version
2d343cd is described below
commit 2d343cd8b5aceaab365e480a29683a0192e91320
Author: Olivier Lamy
AuthorDate: Mon Aug 16 16:26:10 2021 +1000
use a property for slf4j version
Signed-off-by: Olivier Lamy
---
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8078715..bf5596d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
0.3.4
${project.version}
9.2
+1.7.31
2021-07-14T11:28:32Z
@@ -175,7 +176,7 @@
org.slf4j
slf4j-api
- 1.7.31
+ ${slf4j.version}
org.ow2.asm
@@ -259,7 +260,7 @@
org.slf4j
slf4j-simple
- 1.7.31
+ ${slf4j.version}
test
[maven-shade-plugin] branch master updated: run gh action with more jdk (#111)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new b34dc80 run gh action with more jdk (#111)
b34dc80 is described below
commit b34dc8091398d593b9193ecfc36c80ad3150b1fc
Author: Olivier Lamy
AuthorDate: Mon Aug 16 16:23:33 2021 +1000
run gh action with more jdk (#111)
Signed-off-by: Olivier Lamy
---
.github/workflows/maven.yml | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7228b9c..e192fa5 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,6 +24,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
+java: [8, 11, 16, 17-ea]
+jdk: [adopt, zulu]
fail-fast: false
runs-on: ${{ matrix.os }}
@@ -43,8 +45,8 @@ jobs:
- name: Set up JDK 1.8
uses: actions/setup-java@v2
with:
- java-version: '8'
- distribution: 'adopt'
+ distribution: ${{ matrix.jdk }}
+ java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn clean verify -P run-its -e -B -V
