[maven-invoker-plugin] branch dependabot/maven/doxiaSitetoolsVersion-1.10 updated (ee0214e -> 689bba5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/doxiaSitetoolsVersion-1.10 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git. discard ee0214e Bump doxiaSitetoolsVersion from 1.9.2 to 1.10 add 1f09600 Bump maven-project-info-reports-plugin from 3.1.1 to 3.1.2 (#41) add d1da7b5 Bump doxiaVersion from 1.9.1 to 1.10 (#47) add 689bba5 Bump doxiaSitetoolsVersion from 1.9.2 to 1.10 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 (ee0214e) \ N -- N -- N refs/heads/dependabot/maven/doxiaSitetoolsVersion-1.10 (689bba5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven-invoker-plugin] branch master updated (1f09600 -> d1da7b5)
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-invoker-plugin.git. from 1f09600 Bump maven-project-info-reports-plugin from 3.1.1 to 3.1.2 (#41) add d1da7b5 Bump doxiaVersion from 1.9.1 to 1.10 (#47) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-invoker-plugin] branch master updated (5c050e6 -> 1f09600)
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-invoker-plugin.git. from 5c050e6 [MINVOKER-281] java 8 as minimum (#57) add 1f09600 Bump maven-project-info-reports-plugin from 3.1.1 to 3.1.2 (#41) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-invoker-plugin] branch dependabot/maven/doxiaSitetoolsVersion-1.10 updated (7d85a22 -> ee0214e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/doxiaSitetoolsVersion-1.10 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git. discard 7d85a22 Bump doxiaSitetoolsVersion from 1.9.2 to 1.10 add 6f4dc0b [MINVOKER-258] Normalize line endings add 8aeecc1 [MINVOKER-273] Environment variable with empty value (#49) add 8c234ca (doc) Fix typo (#50) add 729c447 Bump actions/cache from 2.1.5 to 2.1.6 (#46) add 6d39530 [MINVOKER-280] Update java version in GitHub Action add ae85aa5 Fix jenkins address in badges add 3547221 Fix jenkins address in anchors add eb46436 Fix jenkins address in ciManagement (#54) add 5c050e6 [MINVOKER-281] java 8 as minimum (#57) add ee0214e Bump doxiaSitetoolsVersion from 1.9.2 to 1.10 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 (7d85a22) \ N -- N -- N refs/heads/dependabot/maven/doxiaSitetoolsVersion-1.10 (ee0214e) 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|9 +- README.md |8 +- pom.xml|6 +- .../org/apache/maven/it/plugins/dummy/MyMojo.java | 156 +- src/it/MINVOKER-191/pom.xml| 158 +- .../src/it/project/verify.groovy | 84 +- .../src/it/project_2/verify.groovy | 40 +- .../MINVOKER-196_junit_report_file/verify.groovy | 104 +- .../org/apache/maven/it/plugins/dummy/MyMojo.java | 178 +- .../org/apache/maven/it/plugins/dummy/MyMojo.java | 178 +- src/it/fail-noprojects_integration-test/pom.xml| 122 +- src/it/fail-noprojects_run/pom.xml | 122 +- src/it/fail-noprojects_verify/pom.xml | 124 +- src/it/invocation-cmdline-exclude/pom.xml | 122 +- .../src/it/minvoker-140/pom.xml| 108 +- src/it/invocation-debug/pom.xml| 136 +- .../invocation-debug/src/it/minvoker-142/pom.xml | 116 +- .../src/it/minvoker-142/verify.groovy | 38 +- src/it/invocation-emptyproperty/pom.xml| 136 +- .../src/it/minvoker-118/pom.xml| 116 +- .../invoker.properties |3 +- src/it/invocation-environmentvariable/pom.xml | 136 +- .../src/it/minvoker-145/pom.xml| 116 +- .../src/it/minvoker-273}/pom.xml | 105 +- .../invocation-environmentvariable/verify.groovy | 16 +- .../src/it/project/src/main/java/org/TestMojo.java |4 +- .../org/apache/maven/it/plugins/dummy/MyMojo.java | 156 +- src/it/invocation-reactor-indirect/pom.xml | 154 +- src/it/invoker-report/src/it/skip-jre/pom.xml | 64 +- src/it/invoker-report/src/it/skip-maven/pom.xml| 64 +- src/it/invoker-report/src/it/skip-os/pom.xml | 64 +- .../local-repo-url/src/it/project/postbuild.groovy | 84 +- src/it/local-repo-url/verify.groovy| 38 +- .../src/main/java/org/MyClass.java |4 +- .../src/test/java/org/MyUtils.java |4 +- src/it/script-verify-xml/pom.xml | 122 +- .../script-verify-xml/src/it/minvoker-138/pom.xml | 64 +- src/it/settings-merge_jdk9+/pom.xml| 130 +- src/it/settings-merge_jdk9+/src/it/project/pom.xml | 168 +- .../src/it/project/postbuild.groovy| 54 +- src/it/settings-merge_jdk9+/src/it/settings.xml| 84 +- src/it/settings-override/pom.xml | 126 +- .../src/it/project/invoker.properties | 34 +- src/it/settings-override/src/it/project/pom.xml| 116 +- .../src/it/project/postbuild.groovy| 42 +- .../settings-override/src/it/settings-override.xml | 68 +- src/it/settings-override/src/it/settings.xml | 68 +- src/it/spaces-should-work_non-windows/pom.xml | 136 +- .../src/it/minvoker-test/pom.xml | 108 +- .../src/it/minvoker-test/verify.groovy | 52 +- src/it/spaces-should-work_windows/pom.xml | 128 +- .../src/it/minvoker-test/pom.xml | 108 +- .../src/it/minvoker-test/verify.groovy | 52 +-
[maven-invoker-plugin] branch dependabot/maven/org.apache.maven.plugins-maven-enforcer-plugin-3.0.0 updated (61e8dce -> 2b0f5cf)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-enforcer-plugin-3.0.0 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git. discard 61e8dce Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 add 5c050e6 [MINVOKER-281] java 8 as minimum (#57) add 2b0f5cf Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.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 (61e8dce) \ N -- N -- N refs/heads/dependabot/maven/org.apache.maven.plugins-maven-enforcer-plugin-3.0.0 (2b0f5cf) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml| 2 +- .../maven/plugins/invoker/AbstractInvokerMojo.java | 84 -- .../apache/maven/plugins/invoker/FileLogger.java | 10 +-- .../apache/maven/plugins/invoker/InstallMojo.java | 21 +- .../maven/plugins/invoker/MetadataUtils.java | 4 +- .../org/apache/maven/plugins/invoker/Selector.java | 2 +- .../maven/plugins/invoker/SelectorUtils.java | 22 ++ .../maven/plugins/invoker/InterpolationTest.java | 4 +- .../maven/plugins/invoker/InvokerMojoTest.java | 2 +- .../plugins/invoker/InvokerPropertiesTest.java | 8 +-- .../maven/plugins/invoker/SelectorUtilsTest.java | 10 +-- 11 files changed, 56 insertions(+), 113 deletions(-)
[maven-invoker-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.0 updated (440aeb3 -> b92c51a)
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-invoker-plugin.git. discard 440aeb3 Bump plexus-utils from 3.1.0 to 3.4.0 add 5c050e6 [MINVOKER-281] java 8 as minimum (#57) add b92c51a Bump plexus-utils from 3.1.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 (440aeb3) \ N -- N -- N refs/heads/dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.0 (b92c51a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml| 2 +- .../maven/plugins/invoker/AbstractInvokerMojo.java | 84 -- .../apache/maven/plugins/invoker/FileLogger.java | 10 +-- .../apache/maven/plugins/invoker/InstallMojo.java | 21 +- .../maven/plugins/invoker/MetadataUtils.java | 4 +- .../org/apache/maven/plugins/invoker/Selector.java | 2 +- .../maven/plugins/invoker/SelectorUtils.java | 22 ++ .../maven/plugins/invoker/InterpolationTest.java | 4 +- .../maven/plugins/invoker/InvokerMojoTest.java | 2 +- .../plugins/invoker/InvokerPropertiesTest.java | 8 +-- .../maven/plugins/invoker/SelectorUtilsTest.java | 10 +-- 11 files changed, 56 insertions(+), 113 deletions(-)
[maven-invoker-plugin] branch MINVOKER-274-groovy-3.0.8 created (now 212046e)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MINVOKER-274-groovy-3.0.8 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git. at 212046e [MINVOKER-274] upgrade to groovy 3.0.8 No new revisions were added by this update.
[maven-invoker-plugin] branch master updated: [MINVOKER-281] java 8 as minimum (#57)
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-invoker-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 5c050e6 [MINVOKER-281] java 8 as minimum (#57)
5c050e6 is described below
commit 5c050e641e54f6b45ff429876f55945f07aface1
Author: Olivier Lamy
AuthorDate: Sat Aug 7 14:42:31 2021 +1000
[MINVOKER-281] java 8 as minimum (#57)
Signed-off-by: Olivier Lamy
---
pom.xml| 2 +-
.../maven/plugins/invoker/AbstractInvokerMojo.java | 84 --
.../apache/maven/plugins/invoker/FileLogger.java | 10 +--
.../apache/maven/plugins/invoker/InstallMojo.java | 21 +-
.../maven/plugins/invoker/MetadataUtils.java | 4 +-
.../org/apache/maven/plugins/invoker/Selector.java | 2 +-
.../maven/plugins/invoker/SelectorUtils.java | 22 ++
.../maven/plugins/invoker/InterpolationTest.java | 4 +-
.../maven/plugins/invoker/InvokerMojoTest.java | 2 +-
.../plugins/invoker/InvokerPropertiesTest.java | 8 +--
.../maven/plugins/invoker/SelectorUtilsTest.java | 10 +--
11 files changed, 56 insertions(+), 113 deletions(-)
diff --git a/pom.xml b/pom.xml
index 516d77e..4f06293 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@ under the License.
-7
+8
3.1.1
1.9.1
1.9.2
diff --git
a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
index 7ee143e..44d4a7e 100644
--- a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
+++ b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.invoker;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
-import org.apache.maven.model.Profile;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
@@ -90,7 +89,6 @@ import java.nio.file.Paths;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -98,11 +96,9 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
@@ -110,6 +106,7 @@ import java.util.TreeSet;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -886,15 +883,10 @@ public abstract class AbstractInvokerMojo
private List getNonSetupJobs( List buildJobs )
{
-List result = new LinkedList<>();
-for ( BuildJob buildJob : buildJobs )
-{
-if ( !buildJob.getType().equals( BuildJob.Type.SETUP ) )
-{
-result.add( buildJob );
-}
-}
-return result;
+return buildJobs.stream().
+filter( buildJob -> !buildJob.getType().equals(
BuildJob.Type.SETUP ) ).
+collect( Collectors.toList() );
+
}
private void handleScriptRunnerWithScriptClassPath()
@@ -917,10 +909,7 @@ public abstract class AbstractInvokerMojo
scriptRunner.setGlobalVariable( "localRepositoryPath",
localRepositoryPath );
if ( scriptVariables != null )
{
-for ( Entry entry : scriptVariables.entrySet() )
-{
-scriptRunner.setGlobalVariable( entry.getKey(),
entry.getValue() );
-}
+scriptVariables.forEach( ( key, value ) ->
scriptRunner.setGlobalVariable( key, value ) );
}
scriptRunner.setClassPath( scriptClassPath );
}
@@ -1057,14 +1046,10 @@ public abstract class AbstractInvokerMojo
collectProjects( projectsDir, parent, projectPaths, false );
}
-Collection modulePaths = new LinkedHashSet<>();
+Collection modulePaths = new LinkedHashSet<>(
model.getModules() );
-modulePaths.addAll( model.getModules() );
+model.getProfiles().forEach( profile -> modulePaths.addAll(
profile.getModules() ) );
-for ( Profile profile : model.getProfiles() )
-{
-modulePaths.addAll( profile.getModules() );
-}
for ( String modulePath : modulePaths )
{
@@
[maven-javadoc-plugin] branch master updated (2bead1f -> f845fe4)
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-javadoc-plugin.git. from 2bead1f [MJAVADOC-568] Adjust invoker.java.version to 13+, these ITs fail on Windows + Oracle JDK 11.0.11 add f845fe4 [MJAVADOC-687] Upgrade Jetty Version to last 9.4.x (#92) No new revisions were added by this update. Summary of changes: pom.xml| 30 +++-- .../maven/plugins/javadoc/JavadocReportTest.java | 45 +++-- .../maven/plugins/javadoc/JavadocUtilTest.java | 43 +++-- .../apache/maven/plugins/javadoc/ProxyServer.java | 75 +- 4 files changed, 104 insertions(+), 89 deletions(-)
[maven-invoker-plugin] branch MINVOKER-281-java-8 updated (f55f10b -> 5766c4f)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MINVOKER-281-java-8 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git. from f55f10b checkstyle add 5766c4f remove unused method No new revisions were added by this update. Summary of changes: .../java/org/apache/maven/plugins/invoker/InstallMojo.java | 14 -- 1 file changed, 14 deletions(-)
[maven-invoker-plugin] branch MINVOKER-281-java-8 updated (501b554 -> f55f10b)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MINVOKER-281-java-8 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git. from 501b554 checkstyle add f55f10b checkstyle No new revisions were added by this update. Summary of changes: src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java | 2 +- src/main/java/org/apache/maven/plugins/invoker/SelectorUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[maven-invoker-plugin] branch MINVOKER-281-java-8 updated (5df959d -> 501b554)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MINVOKER-281-java-8 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git. from 5df959d [MINVOKER-281] java 8 as minimum add 501b554 checkstyle No new revisions were added by this update. Summary of changes: .../apache/maven/plugins/invoker/AbstractInvokerMojo.java | 13 +++-- .../java/org/apache/maven/plugins/invoker/InstallMojo.java | 1 - .../org/apache/maven/plugins/invoker/SelectorUtils.java | 4 ++-- .../org/apache/maven/plugins/invoker/InterpolationTest.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
[maven-invoker-plugin] 01/01: [MINVOKER-281] java 8 as minimum
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch MINVOKER-281-java-8
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit 5df959d85ee9b4391317d8bb09954455c96bfa29
Author: Olivier Lamy
AuthorDate: Fri Aug 6 19:35:10 2021 +1000
[MINVOKER-281] java 8 as minimum
Signed-off-by: Olivier Lamy
---
pom.xml| 2 +-
.../maven/plugins/invoker/AbstractInvokerMojo.java | 87 --
.../apache/maven/plugins/invoker/FileLogger.java | 10 +--
.../apache/maven/plugins/invoker/InstallMojo.java | 6 +-
.../maven/plugins/invoker/MetadataUtils.java | 4 +-
.../org/apache/maven/plugins/invoker/Selector.java | 2 +-
.../maven/plugins/invoker/SelectorUtils.java | 22 ++
.../maven/plugins/invoker/InterpolationTest.java | 4 +-
.../maven/plugins/invoker/InvokerMojoTest.java | 2 +-
.../plugins/invoker/InvokerPropertiesTest.java | 8 +-
.../maven/plugins/invoker/SelectorUtilsTest.java | 10 +--
11 files changed, 57 insertions(+), 100 deletions(-)
diff --git a/pom.xml b/pom.xml
index 516d77e..4f06293 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@ under the License.
-7
+8
3.1.1
1.9.1
1.9.2
diff --git
a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
index 7ee143e..7b4f5cb 100644
--- a/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
+++ b/src/main/java/org/apache/maven/plugins/invoker/AbstractInvokerMojo.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.invoker;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
-import org.apache.maven.model.Profile;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
@@ -90,7 +89,6 @@ import java.nio.file.Paths;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -98,11 +96,9 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
@@ -110,6 +106,7 @@ import java.util.TreeSet;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
@@ -886,15 +883,10 @@ public abstract class AbstractInvokerMojo
private List getNonSetupJobs( List buildJobs )
{
-List result = new LinkedList<>();
-for ( BuildJob buildJob : buildJobs )
-{
-if ( !buildJob.getType().equals( BuildJob.Type.SETUP ) )
-{
-result.add( buildJob );
-}
-}
-return result;
+return buildJobs.stream().
+filter( buildJob -> !buildJob.getType().equals(
BuildJob.Type.SETUP ) ).
+collect( Collectors.toList() );
+
}
private void handleScriptRunnerWithScriptClassPath()
@@ -917,10 +909,7 @@ public abstract class AbstractInvokerMojo
scriptRunner.setGlobalVariable( "localRepositoryPath",
localRepositoryPath );
if ( scriptVariables != null )
{
-for ( Entry entry : scriptVariables.entrySet() )
-{
-scriptRunner.setGlobalVariable( entry.getKey(),
entry.getValue() );
-}
+scriptVariables.forEach( (key, value) ->
scriptRunner.setGlobalVariable( key, value ) );
}
scriptRunner.setClassPath( scriptClassPath );
}
@@ -1057,14 +1046,10 @@ public abstract class AbstractInvokerMojo
collectProjects( projectsDir, parent, projectPaths, false );
}
-Collection modulePaths = new LinkedHashSet<>();
+Collection modulePaths = new LinkedHashSet<>(
model.getModules() );
-modulePaths.addAll( model.getModules() );
+model.getProfiles().forEach( profile -> modulePaths.addAll(
profile.getModules() ) );
-for ( Profile profile : model.getProfiles() )
-{
-modulePaths.addAll( profile.getModules() );
-}
for ( String modulePath : modulePaths )
{
@@ -1399,23 +1384,19 @@ public abstract class AbstractInvokerMojo
ExecutorService executorService =
Executors.newFixedThreadPool(
[maven-scripting-plugin] branch MSCRIPTING-7 updated (c9e9ff9 -> 0066393)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSCRIPTING-7 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git. from c9e9ff9 binding the session and servers helper in binding context add 0066393 move binding doc to the right doc file No new revisions were added by this update. Summary of changes: src/site/markdown/configure-the-script-engine.md.vm | 3 --- src/site/markdown/script-context.md | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-)
[maven-invoker-plugin] branch MINVOKER-281-java-8 created (now 5df959d)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch MINVOKER-281-java-8 in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git. at 5df959d [MINVOKER-281] java 8 as minimum This branch includes the following new commits: new 5df959d [MINVOKER-281] java 8 as minimum The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven-javadoc-plugin] branch jetty-upgrade updated (48cf5e7 -> 239f38b)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a change to branch jetty-upgrade in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git. from 48cf5e7 prefer logger over system.out add 239f38b some cleanup No new revisions were added by this update. Summary of changes: .../java/org/apache/maven/plugins/javadoc/JavadocReportTest.java | 7 +-- src/test/java/org/apache/maven/plugins/javadoc/ProxyServer.java| 5 ++--- 2 files changed, 3 insertions(+), 9 deletions(-)
[maven-scripting-plugin] 01/01: binding the session and servers helper in binding context
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MSCRIPTING-7
in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git
commit c9e9ff965ea1fc062cfb9893b860a5453855e33c
Author: Romain Manni-Bucau
AuthorDate: Fri Aug 6 10:11:02 2021 +0200
binding the session and servers helper in binding context
---
.../apache/maven/plugins/scripting/EvalMojo.java | 13 ++
.../maven/plugins/scripting/binding/Servers.java | 63
.../markdown/configure-the-script-engine.md.vm | 6 +-
.../plugins/scripting/binding/ServersTest.java | 170 +
4 files changed, 251 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java
b/src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java
index 4a6dbbc..9356a10 100644
--- a/src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java
+++ b/src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java
@@ -25,12 +25,16 @@ import javax.script.Bindings;
import javax.script.ScriptException;
import javax.script.SimpleBindings;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.scripting.binding.Servers;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
/**
* Evaluate the specified script or scriptFile
@@ -60,10 +64,17 @@ public class EvalMojo
@Parameter
private File scriptFile;
+@Component
+private SettingsDecrypter settingsDecrypter;
+
// script variables
@Parameter( defaultValue = "${project}", readonly = true )
private MavenProject project;
+// script variables
+@Parameter( defaultValue = "${session}", readonly = true )
+private MavenSession session;
+
@Override
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -73,8 +84,10 @@ public class EvalMojo
AbstractScriptEvaluator execute = constructExecute();
Bindings bindings = new SimpleBindings();
+ bindings.put( "session", session );
bindings.put( "project", project );
bindings.put( "log", getLog() );
+ bindings.put( "servers", new Servers( session, settingsDecrypter ) );
Object result = execute.eval( bindings );
diff --git
a/src/main/java/org/apache/maven/plugins/scripting/binding/Servers.java
b/src/main/java/org/apache/maven/plugins/scripting/binding/Servers.java
new file mode 100644
index 000..0b3f0e7
--- /dev/null
+++ b/src/main/java/org/apache/maven/plugins/scripting/binding/Servers.java
@@ -0,0 +1,63 @@
+package org.apache.maven.plugins.scripting.binding;
+
+/*
+ * 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.execution.MavenSession;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.building.SettingsProblem;
+import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
+import org.apache.maven.settings.crypto.SettingsDecryptionResult;
+
+import static java.util.stream.Collectors.joining;
+
+/**
+ * Binding which enables to work with servers (from settings.xml) and in
particular decipher them transparently.
+ */
+public class Servers
+{
+private final MavenSession session;
+private final SettingsDecrypter settingsDecrypter;
+
+public Servers( MavenSession session, SettingsDecrypter settingsDecrypter )
+{
+this.session = session;
+this.settingsDecrypter = settingsDecrypter;
+}
+
+public Server find( String id )
+{
+final Server server = session.getSettings().getServer( id );
+if ( server == null )
+{
+return null;
+}
+final SettingsDecryptionResult result = settingsDecrypter.decrypt(
+new
[maven-scripting-plugin] branch MSCRIPTING-7 created (now c9e9ff9)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MSCRIPTING-7 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git. at c9e9ff9 binding the session and servers helper in binding context This branch includes the following new commits: new c9e9ff9 binding the session and servers helper in binding context 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.
