[maven-surefire] branch master updated (722fa93 -> d3e1fcb)
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. from 722fa93 Stage site on GH actions new 064d554 Revert "[SUREFIRE-1964] Support for method filtering on excludesFile and includesFile" new d3e1fcb [SUREFIRE-1964] Support for method filtering on excludesFile and includesFile committers: Ildefonso Montero, Tibor Digaňa Add the implementation and integration tests Add some unit tests Add some javadoc to includesFile and excludesFile 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/plugin/failsafe/IntegrationTestMojo.java| 10 ++ .../org/apache/maven/plugin/surefire/SurefirePlugin.java | 12 +--- 2 files changed, 15 insertions(+), 7 deletions(-)
[maven-surefire] 02/02: [SUREFIRE-1964] Support for method filtering on excludesFile and includesFile committers: Ildefonso Montero, Tibor Digaňa Add the implementation and integration tests Add some
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
commit d3e1fcb5d780026fea385b41486c4191d6d81112
Author: imonteroperez
AuthorDate: Tue Feb 8 18:14:04 2022 +0100
[SUREFIRE-1964] Support for method filtering on excludesFile and
includesFile
committers: Ildefonso Montero, Tibor Digaňa
Add the implementation and integration tests
Add some unit tests
Add some javadoc to includesFile and excludesFile
---
.../maven/plugin/failsafe/IntegrationTestMojo.java | 10 ++
.../plugin/surefire/AbstractSurefireMojo.java | 120 -
.../plugin/surefire/AbstractSurefireMojoTest.java | 198 +++--
.../maven/plugin/surefire/MojoMocklessTest.java| 6 +
.../maven/plugin/surefire/SurefirePlugin.java | 10 ++
.../its/AbstractTestMultipleMethodPatterns.java| 3 +-
.../maven/surefire/its/jiras/Surefire1964IT.java | 55 ++
.../test/resources/surefire-1964/exclusions.txt| 1 +
.../test/resources/surefire-1964/inclusions.txt| 1 +
.../src/test/resources/surefire-1964/pom.xml | 58 ++
.../src/test/java/pkg/ExcludedTest.java| 12 ++
.../src/test/java/pkg/FilterTest.java | 24 +++
12 files changed, 440 insertions(+), 58 deletions(-)
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 11c3e58..c346691 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -364,6 +364,11 @@ public class IntegrationTestMojo
* **{@literal /}NotIncludedByDefault.java
* %regex[.*IT.*|.*Not.*]
*
+ *
+ * Since 3.0.0-M6, method filtering support is provided in the inclusions
file as well, example:
+ *
+ * pkg.SomeIT#testMethod
+ *
*
* @since 2.13
*/
@@ -379,6 +384,11 @@ public class IntegrationTestMojo
* **{@literal /}DontRunIT.*
* %regex[.*IT.*|.*Not.*]
*
+ *
+ * Since 3.0.0-M6, method filtering support is provided in the exclusions
file as well, example:
+ *
+ * pkg.SomeIT#testMethod
+ *
*
* @since 2.13
*/
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index c9f44b5..40ed199 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -2194,78 +2194,110 @@ public abstract class AbstractSurefireMojo
}
}
-private void maybeAppendList( List base, List list )
+@Nonnull
+private List getExcludedScanList()
+throws MojoFailureException
{
-if ( list != null )
-{
-base.addAll( list );
-}
+return getExcludeList( true );
}
-@Nonnull private List getExcludeList()
+@Nonnull
+private List getExcludeList()
+throws MojoFailureException
+{
+return getExcludeList( false );
+}
+
+/**
+ * Computes a merge list of test exclusions.
+ * Used only in {@link #getExcludeList()} and {@link
#getExcludedScanList()}.
+ * @param asScanList true if dependency or directory scanner
+ * @return list of patterns
+ * @throws MojoFailureException if the excludes breaks a pattern format
+ */
+@Nonnull
+private List getExcludeList( boolean asScanList )
throws MojoFailureException
{
-List actualExcludes = null;
+List excludes;
if ( isSpecificTestSpecified() )
{
-actualExcludes = Collections.emptyList();
+excludes = Collections.emptyList();
}
else
{
-if ( getExcludesFile() != null )
+excludes = new ArrayList<>();
+if ( asScanList )
{
-actualExcludes = readListFromFile( getExcludesFile() );
+if ( getExcludes() != null )
+{
+excludes.addAll( getExcludes() );
+}
+checkMethodFilterInIncludesExcludes( excludes );
}
-if ( actualExcludes == null )
-{
-actualExcludes = getExcludes();
-}
-else
+if ( getExcludesFile() != null )
{
-maybeAppendList( actualExcludes, getExcludes() );
+excludes.addAll( readListFromFile( getExcludesFile() ) );
}
-
[maven-surefire] 01/02: Revert "[SUREFIRE-1964] Support for method filtering on excludesFile and includesFile"
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
commit 064d554d2c05f81a019442cde3989b752dcb2fdc
Author: tibordigana
AuthorDate: Mon Mar 14 21:58:40 2022 +0100
Revert "[SUREFIRE-1964] Support for method filtering on excludesFile and
includesFile"
This reverts commit 342ff2b10ad7b9ff29748c7b44a042652fae1eb6.
---
.../plugin/surefire/AbstractSurefireMojo.java | 120 +
.../plugin/surefire/AbstractSurefireMojoTest.java | 198 ++---
.../maven/plugin/surefire/MojoMocklessTest.java| 6 -
.../maven/plugin/surefire/SurefirePlugin.java | 12 --
.../its/AbstractTestMultipleMethodPatterns.java| 3 +-
.../maven/surefire/its/jiras/Surefire1964IT.java | 55 --
.../test/resources/surefire-1964/exclusions.txt| 1 -
.../test/resources/surefire-1964/inclusions.txt| 1 -
.../src/test/resources/surefire-1964/pom.xml | 58 --
.../src/test/java/pkg/ExcludedTest.java| 12 --
.../src/test/java/pkg/FilterTest.java | 24 ---
11 files changed, 58 insertions(+), 432 deletions(-)
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 40ed199..c9f44b5 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -2194,110 +2194,78 @@ public abstract class AbstractSurefireMojo
}
}
-@Nonnull
-private List getExcludedScanList()
-throws MojoFailureException
+private void maybeAppendList( List base, List list )
{
-return getExcludeList( true );
-}
-
-@Nonnull
-private List getExcludeList()
-throws MojoFailureException
-{
-return getExcludeList( false );
+if ( list != null )
+{
+base.addAll( list );
+}
}
-/**
- * Computes a merge list of test exclusions.
- * Used only in {@link #getExcludeList()} and {@link
#getExcludedScanList()}.
- * @param asScanList true if dependency or directory scanner
- * @return list of patterns
- * @throws MojoFailureException if the excludes breaks a pattern format
- */
-@Nonnull
-private List getExcludeList( boolean asScanList )
+@Nonnull private List getExcludeList()
throws MojoFailureException
{
-List excludes;
+List actualExcludes = null;
if ( isSpecificTestSpecified() )
{
-excludes = Collections.emptyList();
+actualExcludes = Collections.emptyList();
}
else
{
-excludes = new ArrayList<>();
-if ( asScanList )
+if ( getExcludesFile() != null )
{
-if ( getExcludes() != null )
-{
-excludes.addAll( getExcludes() );
-}
-checkMethodFilterInIncludesExcludes( excludes );
+actualExcludes = readListFromFile( getExcludesFile() );
}
-if ( getExcludesFile() != null )
+if ( actualExcludes == null )
{
-excludes.addAll( readListFromFile( getExcludesFile() ) );
+actualExcludes = getExcludes();
}
+else
+{
+maybeAppendList( actualExcludes, getExcludes() );
+}
+
+checkMethodFilterInIncludesExcludes( actualExcludes );
-if ( asScanList && excludes.isEmpty() )
+if ( actualExcludes == null || actualExcludes.isEmpty() )
{
-excludes = Collections.singletonList( getDefaultExcludes() );
+actualExcludes = Collections.singletonList(
getDefaultExcludes() );
}
}
-return filterNulls( excludes );
-}
-
-@Nonnull
-private List getIncludedScanList()
-throws MojoFailureException
-{
-return getIncludeList( true );
+return filterNulls( actualExcludes );
}
-@Nonnull
private List getIncludeList()
throws MojoFailureException
{
-return getIncludeList( false );
-}
-
-/**
- * Computes a merge list of test inclusions.
- * Used only in {@link #getIncludeList()} and {@link
#getIncludedScanList()}.
- * @param asScanList true if dependency or directory scanner
- * @return list of patterns
- * @throws MojoFailureException if the includes breaks a pattern format
- */
-@Nonnull
-private List getIncludeList( boolean asScanList )
-throws MojoFailureException
-{
-final List includes = new ArrayList<>();
+
[maven-verifier] branch master updated: [MSHARED-1048] Upgrade junit from 4.13.1 to 4.13.2
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-verifier.git The following commit(s) were added to refs/heads/master by this push: new 431fbac [MSHARED-1048] Upgrade junit from 4.13.1 to 4.13.2 431fbac is described below commit 431fbacd20e06cd0bb9c13f6ee41febec248538a Author: Slawomir Jaranowski AuthorDate: Thu Mar 17 20:53:26 2022 +0100 [MSHARED-1048] Upgrade junit from 4.13.1 to 4.13.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1715a15..98162e0 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ junit junit - 4.13.1 + 4.13.2 org.hamcrest
[maven-surefire] 01/01: [SUREFIRE-2038] Upgrade Maven Parent to 35
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch SUREFIRE-2038
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 6dfb3a828540024cf17ee7e339b7f2b2ec726d5b
Author: Slawomir Jaranowski
AuthorDate: Thu Mar 17 22:26:11 2022 +0100
[SUREFIRE-2038] Upgrade Maven Parent to 35
---
.github/workflows/maven-verify.yml | 2 +-
maven-surefire-common/pom.xml| 1 +
maven-surefire-plugin/pom.xml| 2 -
maven-surefire-report-plugin/pom.xml | 11 ---
pom.xml | 133 +++
surefire-its/pom.xml | 25 ---
6 files changed, 26 insertions(+), 148 deletions(-)
diff --git a/.github/workflows/maven-verify.yml
b/.github/workflows/maven-verify.yml
index d283b2a..c75e585 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -28,7 +28,7 @@ jobs:
with:
jdk-matrix: '[ "8", "11", "17", "18-ea" ]'
ff-jdk: '18-ea'
- ff-goal: 'clean install site site:stage -nsu'
+ ff-goal: 'clean install site site:stage -P reporting -nsu'
ff-site-goal: '-v'
verify-goal: 'clean install -nsu -P run-its'
verify-fail-fast: false
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 7d5c301..eed7aed 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -151,6 +151,7 @@
org.codehaus.plexus
plexus-component-metadata
+2.0.0
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 1078a01..570d81a 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -105,8 +105,6 @@
single
-true
-site-source
src/assembly/site-source.xml
diff --git a/maven-surefire-report-plugin/pom.xml
b/maven-surefire-report-plugin/pom.xml
index 67707bc..53b0dca 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -179,17 +179,6 @@
-org.codehaus.mojo
-l10n-maven-plugin
-1.0-alpha-2
-
-
-de
-sv
-
-
-
-
maven-changes-plugin
false
diff --git a/pom.xml b/pom.xml
index 40c562c..ab43bbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
maven-parent
org.apache.maven
-34
+35
org.apache.maven.surefire
@@ -96,7 +96,6 @@
3.3.4
2.0.9
-3.6.2
0.8.7
${project.version}
scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git
@@ -371,48 +370,22 @@
+
org.apache.maven.plugins
- maven-shade-plugin
- 3.2.4
+ maven-pmd-plugin
+ 3.16.0
+
+
+
+ org.codehaus.mojo
+ taglist-maven-plugin
+ 3.0.0
org.apache.maven.plugins
maven-compiler-plugin
-
-
- compile-generated
- process-sources
-
-compile
-
-
-
- HelpMojo.java
- **/HelpMojo.java
-
-
-
- -Xdoclint:none
-
-
-
-
- default-compile
- compile
-
-compile
-
-
-
- HelpMojo.java
- **/HelpMojo.java
-
-
- -Xdoclint:all
-
-
-
-
+
+ 3.10.1
true
@@ -459,10 +432,6 @@
- maven-invoker-plugin
- 3.2.2
-
-
org.jacoco
jacoco-maven-plugin
${jacocoVersion}
@@ -489,18 +458,6 @@
-
- maven-site-plugin
- 3.10.0
-
-
- maven-javadoc-plugin
- 3.3.1
-
-
-false
-
-
@@ -545,59 +502,6 @@
-org.apache.maven.plugins
-
[maven-surefire] branch SUREFIRE-2038 created (now 6dfb3a8)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch SUREFIRE-2038 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. at 6dfb3a8 [SUREFIRE-2038] Upgrade Maven Parent to 35 This branch includes the following new commits: new 6dfb3a8 [SUREFIRE-2038] Upgrade Maven Parent to 35 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-verifier] branch MSHARED-1048 created (now b0856e4)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch MSHARED-1048 in repository https://gitbox.apache.org/repos/asf/maven-verifier.git. at b0856e4 [MSHARED-1048] Upgrade junit from 4.13.1 to 4.13.2 This branch includes the following new commits: new b0856e4 [MSHARED-1048] Upgrade junit from 4.13.1 to 4.13.2 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-verifier] 01/01: [MSHARED-1048] Upgrade junit from 4.13.1 to 4.13.2
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch MSHARED-1048 in repository https://gitbox.apache.org/repos/asf/maven-verifier.git commit b0856e4b87cb39a83435b5f6b4b52958e6d83bb5 Author: Slawomir Jaranowski AuthorDate: Thu Mar 17 20:53:26 2022 +0100 [MSHARED-1048] Upgrade junit from 4.13.1 to 4.13.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1715a15..98162e0 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ junit junit - 4.13.1 + 4.13.2 org.hamcrest
[maven-verifier] branch master updated: Bump slf4j-simple from 1.7.32 to 1.7.36
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-verifier.git The following commit(s) were added to refs/heads/master by this push: new 6ebdc71 Bump slf4j-simple from 1.7.32 to 1.7.36 6ebdc71 is described below commit 6ebdc718d398f1615e3fb14b5b8552ce67e6126b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Mar 17 06:04:34 2022 + Bump slf4j-simple from 1.7.32 to 1.7.36 Bumps [slf4j-simple](https://github.com/qos-ch/slf4j) from 1.7.32 to 1.7.36. - [Release notes](https://github.com/qos-ch/slf4j/releases) - [Commits](https://github.com/qos-ch/slf4j/compare/v_1.7.32...v_1.7.36) --- updated-dependencies: - dependency-name: org.slf4j:slf4j-simple 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 18d1fd7..1715a15 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ org.slf4j slf4j-simple - 1.7.32 + 1.7.36 test
[maven-verifier] branch master updated (1aacc68 -> c6b3827)
This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-verifier.git. from 1aacc68 Bump maven-shared-utils from 3.3.3 to 3.3.4 add c6b3827 [MSHARED-1046] Upgrade Parent to 35 No new revisions were added by this update. Summary of changes: pom.xml | 19 +-- 1 file changed, 17 insertions(+), 2 deletions(-)
[maven-shade-plugin] branch dependabot/maven/org.codehaus.mojo-mrm-maven-plugin-1.3.0 updated (2e8fc6c -> 4c9a8f1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-mrm-maven-plugin-1.3.0 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. discard 2e8fc6c Bump mrm-maven-plugin from 1.2.0 to 1.3.0 add 765eb36 (doc) use shared gh action add d2bdd60 Bump jdom2 from 2.0.6 to 2.0.6.1 add 04afab6 Shared GitHub actions v2 add 17b87aa [MSHADE-412] avoid possible NPE since rawString was added in SimpleRelocator (#123) add aa019ca Bump hamcrest-core from 1.3 to 2.2 add 4c9a8f1 Bump mrm-maven-plugin from 1.2.0 to 1.3.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 (2e8fc6c) \ N -- N -- N refs/heads/dependabot/maven/org.codehaus.mojo-mrm-maven-plugin-1.3.0 (4c9a8f1) 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: .../workflows/maven-verify.yml | 18 +--- .github/workflows/maven.yml| 52 -- pom.xml| 6 +-- .../plugins/shade/relocation/SimpleRelocator.java | 2 +- .../shade/relocation/SimpleRelocatorTest.java | 6 +++ 5 files changed, 22 insertions(+), 62 deletions(-) copy src/it/projects/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface => .github/workflows/maven-verify.yml (78%) delete mode 100644 .github/workflows/maven.yml
[maven-shade-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1 updated (21d3d41 -> 41bb202)
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.1 in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. discard 21d3d41 Bump plexus-utils from 3.3.0 to 3.4.1 add 54bda0a [MSHADE-405] - ShowOverlapping Uses http instead of https add bcf2c76 Bump sisu.version from 0.3.4 to 0.3.5 add 765eb36 (doc) use shared gh action add d2bdd60 Bump jdom2 from 2.0.6 to 2.0.6.1 add 04afab6 Shared GitHub actions v2 add 17b87aa [MSHADE-412] avoid possible NPE since rawString was added in SimpleRelocator (#123) add aa019ca Bump hamcrest-core from 1.3 to 2.2 add 41bb202 Bump plexus-utils from 3.3.0 to 3.4.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 (21d3d41) \ N -- N -- N refs/heads/dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1 (41bb202) 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: .../workflows/maven-verify.yml | 18 +--- .github/workflows/maven.yml| 52 -- pom.xml| 8 ++-- .../apache/maven/plugins/shade/DefaultShader.java | 2 +- .../plugins/shade/relocation/SimpleRelocator.java | 2 +- .../shade/relocation/SimpleRelocatorTest.java | 6 +++ 6 files changed, 24 insertions(+), 64 deletions(-) copy src/it/projects/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface => .github/workflows/maven-verify.yml (78%) delete mode 100644 .github/workflows/maven.yml
[maven-shade-plugin] branch master updated: Bump hamcrest-core from 1.3 to 2.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-shade-plugin.git The following commit(s) were added to refs/heads/master by this push: new aa019ca Bump hamcrest-core from 1.3 to 2.2 aa019ca is described below commit aa019caa0a88714be532c973e5f73fbc7f0fbdd1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Mar 17 13:00:21 2022 + Bump hamcrest-core from 1.3 to 2.2 Bumps [hamcrest-core](https://github.com/hamcrest/JavaHamcrest) from 1.3 to 2.2. - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases) - [Changelog](https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md) - [Commits](https://github.com/hamcrest/JavaHamcrest/compare/hamcrest-java-1.3...v2.2) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 071c87d..4c5727e 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ org.hamcrest hamcrest-core - 1.3 + 2.2 test
[maven-resolver] 01/01: DependencyCollector: DF vs BF coexists
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch bf-df-coexitsts
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit ac046e09093824fcb426d4b09db99e4f8c6412fb
Author: Tamas Cservenak
AuthorDate: Thu Mar 17 14:25:28 2022 +0100
DependencyCollector: DF vs BF coexists
---
.../eclipse/aether/impl/guice/AetherModule.java| 22 +
.../impl/collect/CachingArtifactTypeRegistry.java | 2 +-
.../aether/internal/impl/collect/DataPool.java | 52 +-
.../DefaultDependencyCollectionContext.java| 4 +-
.../impl/collect/DefaultDependencyCollector.java | 868 +
...efaultDependencyGraphTransformationContext.java | 4 +-
.../impl/collect/DefaultVersionFilterContext.java | 4 +-
.../impl/collect/DependencyCollectorDelegate.java | 29 +
.../BfDependencyCollector.java}| 57 +-
.../BfDependencyCycle.java}| 8 +-
.../BfProcessingContext.java} | 10 +-
.../DfDependencyCollector.java}| 237 +++---
.../DfDependencyCycle.java}| 61 +-
.../aether/internal/impl/collect/df/NodeStack.java | 127 +++
.../BfDependencyCollectorTest.java}| 25 +-
.../BfDependencyCycleTest.java}| 12 +-
.../DfDependencyCollectorTest.java}| 26 +-
.../DfDependencyCycleTest.java}| 15 +-
18 files changed, 467 insertions(+), 1096 deletions(-)
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java
index 9629dc9..2082422 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java
@@ -48,6 +48,9 @@ import
org.eclipse.aether.internal.impl.checksum.Sha1ChecksumAlgorithmFactory;
import
org.eclipse.aether.internal.impl.checksum.Sha256ChecksumAlgorithmFactory;
import
org.eclipse.aether.internal.impl.checksum.Sha512ChecksumAlgorithmFactory;
import
org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector;
+import org.eclipse.aether.internal.impl.collect.DependencyCollectorDelegate;
+import org.eclipse.aether.internal.impl.collect.bf.BfDependencyCollector;
+import org.eclipse.aether.internal.impl.collect.df.DfDependencyCollector;
import org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory;
import
org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactorySelector;
import
org.eclipse.aether.internal.impl.synccontext.named.SimpleNamedLockFactorySelector;
@@ -132,8 +135,14 @@ public class AetherModule
.to( DefaultRepositorySystem.class ).in( Singleton.class );
bind( ArtifactResolver.class ) //
.to( DefaultArtifactResolver.class ).in( Singleton.class );
+
bind( DependencyCollector.class ) //
.to( DefaultDependencyCollector.class ).in( Singleton.class );
+bind( DependencyCollectorDelegate.class ).annotatedWith( Names.named(
BfDependencyCollector.NAME ) ) //
+.to( BfDependencyCollector.class ).in( Singleton.class );
+bind( DependencyCollectorDelegate.class ).annotatedWith( Names.named(
DfDependencyCollector.NAME ) ) //
+.to( DfDependencyCollector.class ).in( Singleton.class );
+
bind( Deployer.class ) //
.to( DefaultDeployer.class ).in( Singleton.class );
bind( Installer.class ) //
@@ -214,6 +223,19 @@ public class AetherModule
@Provides
@Singleton
+Map
provideDependencyCollectorDelegates(
+@Named( BfDependencyCollector.NAME ) DependencyCollectorDelegate
bf,
+@Named( DfDependencyCollector.NAME ) DependencyCollectorDelegate df
+)
+{
+Map
providedDependencyCollectorDelegates = new HashMap<>();
+providedDependencyCollectorDelegates.put( BfDependencyCollector.NAME,
bf );
+providedDependencyCollectorDelegates.put( DfDependencyCollector.NAME,
df );
+return providedDependencyCollectorDelegates;
+}
+
+@Provides
+@Singleton
Map provideChecksumSources(
@Named( FileProvidedChecksumsSource.NAME ) ProvidedChecksumsSource
fileProvidedChecksumSource
)
diff --git
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CachingArtifactTypeRegistry.java
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CachingArtifactTypeRegistry.java
index a260234..bb03b14 100644
---
a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CachingArtifactTypeRegistry.java
+++
b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/CachingArtifactTypeRegistry.java
@@ -29,7 +29,7 @@ import
[maven-resolver] branch bf-df-coexitsts created (now ac046e0)
This is an automated email from the ASF dual-hosted git repository. cstamas pushed a change to branch bf-df-coexitsts in repository https://gitbox.apache.org/repos/asf/maven-resolver.git. at ac046e0 DependencyCollector: DF vs BF coexists This branch includes the following new commits: new ac046e0 DependencyCollector: DF vs BF coexists 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-shade-plugin] branch dependabot/maven/org.hamcrest-hamcrest-core-2.2 updated (f3836b9 -> 203a8cb)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/org.hamcrest-hamcrest-core-2.2
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
discard f3836b9 Bump hamcrest-core from 1.3 to 2.2
add 83c123d [MSHADE-36] Add option to include dependency reduced POM
instead of original one
add 49524f3 [maven-release-plugin] prepare release
maven-shade-plugin-3.3.0
add 6597095 [maven-release-plugin] prepare for next development iteration
add f4e3499 Bump slf4j-api from 1.7.30 to 1.7.31
add 24d5d42 Merge pull request #101 from
apache/dependabot/maven/org.slf4j-slf4j-api-1.7.31
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 c13c9bb Bump slf4j.version from 1.7.31 to 1.7.32 (#113)
add 1dca37c [MSHADE-396] Improve SourceContent Shading
add c648ccf [MSHADE-396] Add explanation to shadeSourcesContent
documentation
add 54bda0a [MSHADE-405] - ShowOverlapping Uses http instead of https
add bcf2c76 Bump sisu.version from 0.3.4 to 0.3.5
add 765eb36 (doc) use shared gh action
add d2bdd60 Bump jdom2 from 2.0.6 to 2.0.6.1
add 04afab6 Shared GitHub actions v2
add 17b87aa [MSHADE-412] avoid possible NPE since rawString was added in
SimpleRelocator (#123)
add 203a8cb Bump hamcrest-core from 1.3 to 2.2
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 (f3836b9)
\
N -- N -- N
refs/heads/dependabot/maven/org.hamcrest-hamcrest-core-2.2 (203a8cb)
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:
.../workflows/maven-verify.yml | 18 +-
.github/workflows/maven.yml| 50 -
README.md | 8 +-
pom.xml| 19 +-
.../invoker.properties | 5 +-
.../pom.xml| 32 ++-
.../src/main/java/com/example}/Main.java | 10 +-
.../verify.bsh | 73 +++
.../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 | 234 +
.../apache/maven/plugins/shade/mojo/ShadeMojo.java | 56 -
.../maven/plugins/shade/pom/MavenJDOMWriter.java | 18 +-
.../plugins/shade/relocation/SimpleRelocator.java | 43 +++-
.../resource/ServicesResourceTransformer.java | 81 ++-
.../shade/resource/UseDependencyReducedPom.java| 55 +
.../maven/plugins/shade/DefaultShaderTest.java | 77 +++
.../shade/relocation/SimpleRelocatorTest.java | 52 -
.../resource/ServiceResourceTransformerTest.java | 11 +-
22 files changed, 781 insertions(+), 307 deletions(-)
copy
src/it/projects/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface
=> .github/workflows/maven-verify.yml (78%)
delete mode 100644 .github/workflows/maven.yml
copy src/it/projects/{dep-reduced-pom-relocated-result =>
MSHADE-36-inject-dep-reduced-pom-in-final}/invoker.properties (96%)
copy src/it/projects/{mini-jar =>
MSHADE-36-inject-dep-reduced-pom-in-final}/pom.xml (67%)
copy src/it/projects/{MSHADE-313_minimized-services/test/src/main/java =>
MSHADE-36-inject-dep-reduced-pom-in-final/src/main/java/com/example}/Main.java
(77%)
create mode 100644
src/it/projects/MSHADE-36-inject-dep-reduced-pom-in-final/verify.bsh
copy src/it/projects/{MSHADE-313_minimized-services =>
[maven-shade-plugin] branch master updated: [MSHADE-412] avoid possible NPE since rawString was added in SimpleRelocator (#123)
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
The following commit(s) were added to refs/heads/master by this push:
new 17b87aa [MSHADE-412] avoid possible NPE since rawString was added in
SimpleRelocator (#123)
17b87aa is described below
commit 17b87aa368db6e0bcea4f6c2f1e07e46945f2f4b
Author: Romain Manni-Bucau
AuthorDate: Thu Mar 17 13:40:30 2022 +0100
[MSHADE-412] avoid possible NPE since rawString was added in
SimpleRelocator (#123)
---
.../org/apache/maven/plugins/shade/relocation/SimpleRelocator.java | 2 +-
.../apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java | 6 ++
2 files changed, 7 insertions(+), 1 deletion(-)
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 3837a67..df51ea2 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
@@ -242,7 +242,7 @@ public class SimpleRelocator
public String relocateClass( String clazz )
{
-return clazz.replaceFirst( pattern, shadedPattern );
+return rawString ? clazz : clazz.replaceFirst( pattern, shadedPattern
);
}
public String applyToSourceContent( String sourceContent )
diff --git
a/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
b/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
index e85972a..699d1b3 100644
---
a/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
+++
b/src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
@@ -39,6 +39,12 @@ public class SimpleRelocatorTest
{
@Test
+public void testNoNpeRelocateClass()
+{
+new SimpleRelocator( "foo", "bar", null, null, true ).relocateClass(
"foo" );
+}
+
+@Test
public void testCanRelocatePath()
{
SimpleRelocator relocator;
[maven] 02/03: Do not use non released api for annotations
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8113c5139eed8a8b5f9883b5e105f820868d13f0
Author: Guillaume Nodet
AuthorDate: Tue Mar 15 11:27:22 2022 +0100
Do not use non released api for annotations
---
maven-core-api/pom.xml | 6 --
.../src/main/java/org/apache/maven/api/Artifact.java | 4 ++--
.../src/main/java/org/apache/maven/api/Dependency.java | 6 +++---
.../src/main/java/org/apache/maven/api/Event.java | 2 +-
.../src/main/java/org/apache/maven/api/Exclusion.java | 2 +-
.../src/main/java/org/apache/maven/api/Listener.java | 2 +-
.../main/java/org/apache/maven/api/MojoExecution.java | 2 +-
.../src/main/java/org/apache/maven/api/Node.java | 2 +-
.../main/java/org/apache/maven/api/NodeVisitor.java| 6 --
.../src/main/java/org/apache/maven/api/Project.java| 2 +-
.../java/org/apache/maven/api/RemoteRepository.java| 2 +-
.../src/main/java/org/apache/maven/api/Repository.java | 2 +-
.../src/main/java/org/apache/maven/api/Session.java| 4 ++--
.../main/java/org/apache/maven/api/SessionData.java| 6 +++---
.../api/{Listener.java => annotations/Immutable.java} | 15 +++
.../api/{Listener.java => annotations/Nonnull.java}| 18 --
.../api/{Listener.java => annotations/Nullable.java} | 15 +++
.../api/{Listener.java => annotations/ThreadSafe.java} | 15 +++
.../maven/api/services/ArtifactDeployerRequest.java| 2 +-
.../maven/api/services/ArtifactFactoryRequest.java | 2 +-
.../maven/api/services/ArtifactInstallerRequest.java | 4 ++--
.../org/apache/maven/api/services/ArtifactManager.java | 2 +-
.../maven/api/services/ArtifactResolverRequest.java| 2 +-
.../org/apache/maven/api/services/BaseRequest.java | 2 +-
.../apache/maven/api/services/DependencyCollector.java | 2 +-
.../maven/api/services/DependencyCollectorRequest.java | 2 +-
.../maven/api/services/DependencyFactoryRequest.java | 2 +-
.../maven/api/services/DependencyResolverRequest.java | 4 ++--
.../org/apache/maven/api/services/ProjectBuilder.java | 2 +-
.../maven/api/services/ProjectBuilderRequest.java | 4 ++--
.../maven/api/services/ProjectBuilderResult.java | 2 +-
.../org/apache/maven/api/services/ProjectManager.java | 2 +-
.../java/org/apache/maven/api/services/Service.java| 2 +-
.../apache/maven/internal/impl/DefaultArtifact.java| 2 +-
.../maven/internal/impl/DefaultArtifactDeployer.java | 2 +-
.../maven/internal/impl/DefaultArtifactInstaller.java | 2 +-
.../maven/internal/impl/DefaultArtifactManager.java| 2 +-
.../maven/internal/impl/DefaultArtifactResolver.java | 2 +-
.../apache/maven/internal/impl/DefaultDependency.java | 4 ++--
.../internal/impl/DefaultDependencyCollector.java | 2 +-
.../maven/internal/impl/DefaultLocalRepository.java| 2 +-
.../org/apache/maven/internal/impl/DefaultProject.java | 4 ++--
.../maven/internal/impl/DefaultProjectBuilder.java | 2 +-
.../maven/internal/impl/DefaultProjectManager.java | 2 +-
.../maven/internal/impl/DefaultRemoteRepository.java | 2 +-
.../org/apache/maven/internal/impl/DefaultSession.java | 4 ++--
46 files changed, 89 insertions(+), 90 deletions(-)
diff --git a/maven-core-api/pom.xml b/maven-core-api/pom.xml
index e70bbca..46af6de 100644
--- a/maven-core-api/pom.xml
+++ b/maven-core-api/pom.xml
@@ -38,12 +38,6 @@
org.apache.maven
maven-settings
-
- com.google.code.findbugs
- jsr305
- 3.0.2
- compile
-
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
index e00a74a..98ed400 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
@@ -19,8 +19,8 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.Immutable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Immutable;
import java.nio.file.Path;
import java.util.Optional;
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
b/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
index d0a966d..ea208bf 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Dependency.java
@@ -19,9 +19,9 @@ package org.apache.maven.api;
* under the License.
*/
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import org.apache.maven.api.annotations.Nonnull;
+import org.apache.maven.api.annotations.Nullable;
+import
[maven] branch mvn4 updated (e2d9c53 -> a036f07)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git.
from e2d9c53 Fix checkstyle
new d1f968d Add a few methods on Session and use @see references
new 8113c51 Do not use non released api for annotations
new a036f07 Add support for reading/writing xml models
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:
maven-core-api/pom.xml | 6 +-
.../main/java/org/apache/maven/api/Artifact.java | 5 +-
.../main/java/org/apache/maven/api/Dependency.java | 6 +-
.../src/main/java/org/apache/maven/api/Event.java | 2 +-
.../main/java/org/apache/maven/api/Exclusion.java | 2 +-
.../main/java/org/apache/maven/api/Listener.java | 2 +-
.../java/org/apache/maven/api/MojoExecution.java | 2 +-
.../src/main/java/org/apache/maven/api/Node.java | 2 +-
.../java/org/apache/maven/api/NodeVisitor.java | 6 +-
.../main/java/org/apache/maven/api/Project.java| 2 +-
.../org/apache/maven/api/RemoteRepository.java | 2 +-
.../main/java/org/apache/maven/api/Repository.java | 2 +-
.../main/java/org/apache/maven/api/Session.java| 92 -
.../java/org/apache/maven/api/SessionData.java | 6 +-
.../{Listener.java => annotations/Immutable.java} | 15 +-
.../org/apache/maven/api/annotations/Nonnull.java | 24 +--
.../{Listener.java => annotations/Nullable.java} | 15 +-
.../{Listener.java => annotations/ThreadSafe.java} | 15 +-
.../api/services/ArtifactDeployerRequest.java | 2 +-
.../maven/api/services/ArtifactFactoryRequest.java | 2 +-
.../api/services/ArtifactInstallerRequest.java | 4 +-
.../apache/maven/api/services/ArtifactManager.java | 2 +-
.../api/services/ArtifactResolverRequest.java | 2 +-
.../org/apache/maven/api/services/BaseRequest.java | 2 +-
.../maven/api/services/DependencyCollector.java| 2 +-
.../api/services/DependencyCollectorRequest.java | 2 +-
.../api/services/DependencyFactoryRequest.java | 2 +-
.../api/services/DependencyResolverRequest.java| 4 +-
.../apache/maven/api/services/ProjectBuilder.java | 2 +-
.../maven/api/services/ProjectBuilderRequest.java | 4 +-
.../maven/api/services/ProjectBuilderResult.java | 2 +-
.../apache/maven/api/services/ProjectManager.java | 2 +-
.../org/apache/maven/api/services/Service.java | 2 +-
.../ToolchainFactory.java} | 8 +-
.../xml/ModelXmlFactory.java} | 8 +-
.../xml/SettingsXmlFactory.java} | 8 +-
.../xml/ToolchainsXmlFactory.java} | 8 +-
.../apache/maven/api/services/xml/XmlFactory.java | 72 +++
.../XmlReaderException.java} | 12 +-
.../maven/api/services/xml/XmlReaderRequest.java | 222 +
.../XmlWriterException.java} | 12 +-
.../maven/api/services/xml/XmlWriterRequest.java | 100 ++
.../maven/internal/impl/DefaultArtifact.java | 2 +-
.../internal/impl/DefaultArtifactDeployer.java | 2 +-
.../internal/impl/DefaultArtifactInstaller.java| 2 +-
.../internal/impl/DefaultArtifactManager.java | 2 +-
.../internal/impl/DefaultArtifactResolver.java | 2 +-
.../maven/internal/impl/DefaultDependency.java | 4 +-
.../internal/impl/DefaultDependencyCollector.java | 2 +-
.../internal/impl/DefaultLocalRepository.java | 2 +-
.../internal/impl/DefaultModelXmlFactory.java | 115 +++
.../apache/maven/internal/impl/DefaultProject.java | 4 +-
.../maven/internal/impl/DefaultProjectBuilder.java | 2 +-
.../maven/internal/impl/DefaultProjectManager.java | 2 +-
.../internal/impl/DefaultRemoteRepository.java | 2 +-
.../apache/maven/internal/impl/DefaultSession.java | 19 +-
.../internal/impl/DefaultSettingsXmlFactory.java | 105 ++
.../internal/impl/DefaultToolchainsXmlFactory.java | 105 ++
58 files changed, 936 insertions(+), 128 deletions(-)
copy maven-core-api/src/main/java/org/apache/maven/api/{Listener.java =>
annotations/Immutable.java} (77%)
copy
maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
=> maven-core-api/src/main/java/org/apache/maven/api/annotations/Nonnull.java
(64%)
copy maven-core-api/src/main/java/org/apache/maven/api/{Listener.java =>
annotations/Nullable.java} (77%)
copy maven-core-api/src/main/java/org/apache/maven/api/{Listener.java =>
annotations/ThreadSafe.java} (77%)
copy maven-core-api/src/main/java/org/apache/maven/api/{JavaToolchain.java =>
services/ToolchainFactory.java} (87%)
copy
[maven] 03/03: Add support for reading/writing xml models
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a036f07a6578543145c702038ff6811c4243ccc7
Author: Guillaume Nodet
AuthorDate: Tue Mar 15 11:30:23 2022 +0100
Add support for reading/writing xml models
---
maven-core-api/pom.xml | 4 +
.../maven/api/services/ToolchainFactory.java | 25 +++
.../maven/api/services/xml/ModelXmlFactory.java| 27 +++
.../maven/api/services/xml/SettingsXmlFactory.java | 27 +++
.../api/services/xml/ToolchainsXmlFactory.java | 27 +++
.../apache/maven/api/services/xml/XmlFactory.java | 72 +++
.../maven/api/services/xml/XmlReaderException.java | 40
.../maven/api/services/xml/XmlReaderRequest.java | 222 +
.../maven/api/services/xml/XmlWriterException.java | 40
.../maven/api/services/xml/XmlWriterRequest.java | 100 ++
.../internal/impl/DefaultModelXmlFactory.java | 115 +++
.../apache/maven/internal/impl/DefaultSession.java | 15 ++
.../internal/impl/DefaultSettingsXmlFactory.java | 105 ++
.../internal/impl/DefaultToolchainsXmlFactory.java | 105 ++
14 files changed, 924 insertions(+)
diff --git a/maven-core-api/pom.xml b/maven-core-api/pom.xml
index 46af6de..77a9e51 100644
--- a/maven-core-api/pom.xml
+++ b/maven-core-api/pom.xml
@@ -38,6 +38,10 @@
org.apache.maven
maven-settings
+
+ org.apache.maven
+ maven-toolchain-model
+
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
new file mode 100644
index 000..97db209
--- /dev/null
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
@@ -0,0 +1,25 @@
+package org.apache.maven.api.services;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public interface ToolchainFactory
+{
+// TODO: implement ToolchainFactory
+}
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java
new file mode 100644
index 000..2fa88f5
--- /dev/null
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java
@@ -0,0 +1,27 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * 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 org.apache.maven.model.Model;
+
+public interface ModelXmlFactory extends XmlFactory
+{
+
+}
diff --git
a/maven-core-api/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java
b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java
new file mode 100644
index 000..a981588
--- /dev/null
+++
b/maven-core-api/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java
@@ -0,0 +1,27 @@
+package org.apache.maven.api.services.xml;
+
+/*
+ * 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
[maven] 01/03: Add a few methods on Session and use @see references
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d1f968dd35090032b37defe0e7f8558621475cdb
Author: Guillaume Nodet
AuthorDate: Tue Mar 15 11:20:40 2022 +0100
Add a few methods on Session and use @see references
---
.../main/java/org/apache/maven/api/Artifact.java | 1 +
.../main/java/org/apache/maven/api/Session.java| 88 --
2 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
index 9dcaaa2..e00a74a 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Artifact.java
@@ -85,6 +85,7 @@ public interface Artifact
* Determines whether this artifact uses a snapshot version.
*
* @return {@code true} if the artifact is a snapshot, {@code false}
otherwise.
+ * @see org.apache.maven.api.Session#isVersionSnapshot(String)
*/
boolean isSnapshot();
diff --git a/maven-core-api/src/main/java/org/apache/maven/api/Session.java
b/maven-core-api/src/main/java/org/apache/maven/api/Session.java
index d568b47..bf484da 100644
--- a/maven-core-api/src/main/java/org/apache/maven/api/Session.java
+++ b/maven-core-api/src/main/java/org/apache/maven/api/Session.java
@@ -27,7 +27,9 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Optional;
import java.util.Properties;
+import java.util.function.Predicate;
import org.apache.maven.api.services.ArtifactDeployer;
import org.apache.maven.api.services.ArtifactDeployerException;
@@ -35,6 +37,7 @@ import org.apache.maven.api.services.ArtifactFactory;
import org.apache.maven.api.services.ArtifactFactoryException;
import org.apache.maven.api.services.ArtifactInstaller;
import org.apache.maven.api.services.ArtifactInstallerException;
+import org.apache.maven.api.services.ArtifactManager;
import org.apache.maven.api.services.ArtifactResolver;
import org.apache.maven.api.services.ArtifactResolverException;
import org.apache.maven.api.services.ArtifactResolverResult;
@@ -48,6 +51,7 @@ import org.apache.maven.api.services.DependencyResolverResult;
import org.apache.maven.api.services.LocalRepositoryManager;
import org.apache.maven.api.services.RepositoryFactory;
import org.apache.maven.api.services.Service;
+import org.apache.maven.model.Repository;
import org.apache.maven.settings.Settings;
/**
@@ -125,6 +129,7 @@ public interface Session
/**
* Shortcut for
getService(RepositoryFactory.class).createLocal(...)
+ * @see RepositoryFactory#createLocal(Path)
*/
default LocalRepository createLocalRepository( Path path )
throws ArtifactFactoryException, IllegalArgumentException
@@ -133,7 +138,30 @@ public interface Session
}
/**
+ * Shortcut for
getService(RepositoryFactory.class).createRemote(...)
+ * @see RepositoryFactory#createRemote(String, String)
+ */
+@Nonnull
+default RemoteRepository createRemoteRepository( @Nonnull String id,
@Nonnull String url )
+{
+return getService( RepositoryFactory.class )
+.createRemote( id, url );
+}
+
+/**
+ * Shortcut for
getService(RepositoryFactory.class).createRemote(...)
+ * @see RepositoryFactory#createRemote(Repository)
+ */
+@Nonnull
+default RemoteRepository createRemoteRepository( @Nonnull Repository
repository )
+{
+return getService( RepositoryFactory.class )
+.createRemote( repository );
+}
+
+/**
* Shortcut for getService(ArtifactFactory.class).create(...)
+ * @see ArtifactFactory#create(Session, String, String, String, String)
*/
default Artifact createArtifact( String groupId, String artifactId, String
version, String extension )
throws ArtifactFactoryException, IllegalArgumentException
@@ -144,6 +172,7 @@ public interface Session
/**
* Shortcut for getService(ArtifactFactory.class).create(...)
+ * @see ArtifactFactory#create(Session, String, String, String, String,
String, String)
*/
default Artifact createArtifact( String groupId, String artifactId, String
version, String classifier,
String extension, String type )
@@ -155,6 +184,7 @@ public interface Session
/**
* Shortcut for
getService(ArtifactResolver.class).resolve(...)
+ * @see ArtifactResolver#resolve(Session, Artifact)
*/
default ArtifactResolverResult resolveArtifact( Artifact artifact )
throws ArtifactResolverException, IllegalArgumentException
@@ -164,17 +194,29 @@ public interface Session
}
/**
- * Shortcut for
[maven-shade-plugin] branch MSHADE-412_avoid-npe updated (81a374b -> d76efb3)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-412_avoid-npe in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. discard 81a374b MSHADE-412 avoid possible NPE since rawString was added in SimpleRelocator add d76efb3 [MSHADE-412] avoid possible NPE since rawString was added in SimpleRelocator 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 (81a374b) \ N -- N -- N refs/heads/MSHADE-412_avoid-npe (d76efb3) 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:
[maven-shade-plugin] branch MSHADE-412_avoid-npe updated (9fcbb47 -> 81a374b)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-412_avoid-npe in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. discard 9fcbb47 test for the fix discard 6019c9f MSHADE-412 avoid possible NPE since rawString was added in SimpleRelocator add 81a374b MSHADE-412 avoid possible NPE since rawString was added in SimpleRelocator 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 (9fcbb47) \ N -- N -- N refs/heads/MSHADE-412_avoid-npe (81a374b) 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:
[maven-shade-plugin] branch MSHADE-412_avoid-npe updated (6019c9f -> 9fcbb47)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-412_avoid-npe in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. from 6019c9f MSHADE-412 avoid possible NPE since rawString was added in SimpleRelocator add 9fcbb47 test for the fix No new revisions were added by this update. Summary of changes: .../apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java | 6 ++ 1 file changed, 6 insertions(+)
[maven-shade-plugin] branch MSHADE-412_avoid-npe created (now 6019c9f)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSHADE-412_avoid-npe in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git. at 6019c9f MSHADE-412 avoid possible NPE since rawString was added in SimpleRelocator No new revisions were added by this update.
[maven-wrapper] 01/01: rephrase Gradle Wrapper attribution
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch notice in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git commit 88b7da35ec7360650701de429ac6b2a8b2367cfe Author: Hervé Boutemy AuthorDate: Thu Mar 17 08:19:57 2022 +0100 rephrase Gradle Wrapper attribution Co-authored-by: Marc Philipp --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index eee80df..0bb4249 100644 --- a/NOTICE +++ b/NOTICE @@ -4,6 +4,6 @@ Copyright 2020-2022 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -The Initial Developers of maven-wrapper module, which is copied from, derived from, -or inspired by Gradle Wrapper, are Hans Dockter and Adam Murdoch. +The original idea and initial implementation of the maven-wrapper module is derived +from the Gradle Wrapper which was written originally by Hans Dockter and Adam Murdoch. Copyright 2007 the original author or authors.
[maven-wrapper] branch notice updated (48fe3cb -> 88b7da3)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch notice in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git. omit 48fe3cb rephrase Gradle Wrapper attribution new 88b7da3 rephrase Gradle Wrapper attribution 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 (48fe3cb) \ N -- N -- N refs/heads/notice (88b7da3) 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-wrapper] branch notice updated (17d8835 -> 48fe3cb)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch notice in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git. from 17d8835 add NOTICE file with attribution of initial maven-wrapper module add 48fe3cb rephrase Gradle Wrapper attribution No new revisions were added by this update. Summary of changes: NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven-verifier] branch dependabot/maven/org.slf4j-slf4j-simple-1.7.36 created (now 5eb9d26)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.slf4j-slf4j-simple-1.7.36 in repository https://gitbox.apache.org/repos/asf/maven-verifier.git. at 5eb9d26 Bump slf4j-simple from 1.7.32 to 1.7.36 No new revisions were added by this update.
