[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6302_module-progress [deleted] f5f76c70e
[1/2] maven git commit: logging the module count to let the user identify how many module are still to be executed/processed
Repository: maven
Updated Branches:
refs/heads/master 5919b7450 -> f5f76c70e
logging the module count to let the user identify how many module are still to
be executed/processed
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4d49d3b0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4d49d3b0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4d49d3b0
Branch: refs/heads/master
Commit: 4d49d3b05b2e3d3a4530bb27e8cc162ab50baa7c
Parents: 5919b74
Author: Romain Manni-Bucau
Authored: Thu Nov 9 09:30:47 2017 +0100
Committer: Romain Manni-Bucau
Committed: Thu Nov 9 09:30:47 2017 +0100
--
.../maven/cli/event/ExecutionEventLogger.java | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/4d49d3b0/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 2a089df..6cab49f 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -23,6 +23,8 @@ import static
org.apache.maven.cli.CLIReportingUtils.formatDuration;
import static org.apache.maven.cli.CLIReportingUtils.formatTimestamp;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
+import java.util.List;
+
import org.apache.commons.lang3.Validate;
import org.apache.maven.execution.AbstractExecutionListener;
import org.apache.maven.execution.BuildFailure;
@@ -53,6 +55,9 @@ public class ExecutionEventLogger
private static final int MAX_PADDED_BUILD_TIME_DURATION_LENGTH = 9;
private static final int MAX_PROJECT_NAME_LENGTH = 52;
+private int totalProjects;
+private volatile int currentVisitedProjectCount;
+
public ExecutionEventLogger()
{
logger = LoggerFactory.getLogger( ExecutionEventLogger.class );
@@ -106,10 +111,13 @@ public class ExecutionEventLogger
logger.info( "" );
-for ( MavenProject project : event.getSession().getProjects() )
+final List projects =
event.getSession().getProjects();
+for ( MavenProject project : projects )
{
logger.info( project.getName() );
}
+
+totalProjects = projects.size();
}
}
@@ -259,6 +267,16 @@ public class ExecutionEventLogger
infoMain( "Building " + event.getProject().getName() + " " +
event.getProject().getVersion() );
infoLine( '-' );
+
+if ( totalProjects > 1 )
+{
+int number;
+synchronized ( this )
+{
+number = ++currentVisitedProjectCount;
+}
+infoMain( "Module " + number + "/" + totalProjects );
+} // else what's the point
}
}
[2/2] maven git commit: [MNG-6302] display progress at end of "Building" line
[MNG-6302] display progress at end of "Building" line
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f5f76c70
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f5f76c70
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f5f76c70
Branch: refs/heads/master
Commit: f5f76c70e1828a7e6c6267fc4bc53abc35c19ce7
Parents: 4d49d3b
Author: Hervé Boutemy
Authored: Wed Nov 15 03:54:15 2017 +0100
Committer: Hervé Boutemy
Committed: Wed Nov 15 03:54:15 2017 +0100
--
.../maven/cli/event/ExecutionEventLogger.java| 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/f5f76c70/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
--
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index 6cab49f..513d56a 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -264,19 +264,28 @@ public class ExecutionEventLogger
logger.info( "" );
infoLine( '-' );
-infoMain( "Building " + event.getProject().getName() + " " +
event.getProject().getVersion() );
+String building = "Building " + event.getProject().getName() + " "
+ event.getProject().getVersion();
-infoLine( '-' );
-
-if ( totalProjects > 1 )
+if ( totalProjects <= 1 )
+{
+infoMain( building );
+}
+else
{
+// display progress [i/n]
int number;
synchronized ( this )
{
number = ++currentVisitedProjectCount;
}
-infoMain( "Module " + number + "/" + totalProjects );
+String progress = " [" + number + '/' + totalProjects + ']';
+
+int pad = LINE_LENGTH - building.length() - progress.length();
+
+infoMain( building + ( ( pad > 0 ) ? chars( ' ', pad ) : "" )
+ progress );
} // else what's the point
+
+infoLine( '-' );
}
}
svn commit: r1815752 - in /maven/site/trunk/content/resources: pom/components.link pom/components.links shared/components.link shared/components.links skins/components.link skins/components.links
Author: hboutemy Date: Sun Nov 19 17:41:31 2017 New Revision: 1815752 URL: http://svn.apache.org/viewvc?rev=1815752&view=rev Log: renamed files to components.links (with the trailing s) Added: maven/site/trunk/content/resources/pom/components.links - copied unchanged from r1815751, maven/site/trunk/content/resources/pom/components.link maven/site/trunk/content/resources/shared/components.links - copied unchanged from r1815751, maven/site/trunk/content/resources/shared/components.link maven/site/trunk/content/resources/skins/components.links - copied unchanged from r1815751, maven/site/trunk/content/resources/skins/components.link Removed: maven/site/trunk/content/resources/pom/components.link maven/site/trunk/content/resources/shared/components.link maven/site/trunk/content/resources/skins/components.link
svn commit: r1815751 - /maven/site/trunk/content/filtered-resources/.htaccess
Author: hboutemy
Date: Sun Nov 19 17:32:25 2017
New Revision: 1815751
URL: http://svn.apache.org/viewvc?rev=1815751&view=rev
Log:
removed rewrite rules which cause issue with directories without trailing /
Modified:
maven/site/trunk/content/filtered-resources/.htaccess
Modified: maven/site/trunk/content/filtered-resources/.htaccess
URL:
http://svn.apache.org/viewvc/maven/site/trunk/content/filtered-resources/.htaccess?rev=1815751&r1=1815750&r2=1815751&view=diff
==
--- maven/site/trunk/content/filtered-resources/.htaccess (original)
+++ maven/site/trunk/content/filtered-resources/.htaccess Sun Nov 19 17:32:25
2017
@@ -74,18 +74,3 @@ Redirect Permanent /guides/development/g
Redirect Permanent /guides/mini/guide-apt-format.html
/doxia/references/apt-format.html
RedirectMatch ^/maven-1.x/(.*)$ /archives/maven-1.x/$1
-
-# rewrite rules for /components: see
http://maven.apache.org/developers/website/
-# should not be useful any more since symlinks have been created in
http://svn.apache.org/r1815743 and http://svn.apache.org/r1815745
-RewriteEngine on
-
-# if file is not found in maven-site, look into components
-RewriteCond %{REQUEST_URI} !^/components/
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*)$ /components/$1 [C]
-
-# in case of directory without trailing /, do the redirect or httpd will do a
redirect from /foo to /components/foo/
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteCond %{REQUEST_URI} !/$
-RewriteRule components/(.*) /$1/ [R]
svn commit: r1815750 - /maven/site/trunk/pom.xml
Author: hboutemy Date: Sun Nov 19 17:23:42 2017 New Revision: 1815750 URL: http://svn.apache.org/viewvc?rev=1815750&view=rev Log: removed overwrite: was a typo Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1815750&r1=1815749&r2=1815750&view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Sun Nov 19 17:23:42 2017 @@ -152,7 +152,7 @@ - +
buildbot success in on maven-site-staging
The Buildbot has detected a restored build on builder maven-site-staging while building . Full details are available at: https://ci.apache.org/builders/maven-site-staging/builds/404 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The AnyBranchScheduler scheduler named 'on-maven-site-commit' triggered this build Build Source Stamp: [branch maven/site] 1815749 Blamelist: hboutemy Build succeeded! Sincerely, -The Buildbot
svn commit: r1815749 - /maven/site/trunk/content/resources/plugins/components.links
Author: hboutemy Date: Sun Nov 19 17:22:04 2017 New Revision: 1815749 URL: http://svn.apache.org/viewvc?rev=1815749&view=rev Log: fixed typo Modified: maven/site/trunk/content/resources/plugins/components.links Modified: maven/site/trunk/content/resources/plugins/components.links URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/plugins/components.links?rev=1815749&r1=1815748&r2=1815749&view=diff == --- maven/site/trunk/content/resources/plugins/components.links (original) +++ maven/site/trunk/content/resources/plugins/components.links Sun Nov 19 17:22:04 2017 @@ -1,6 +1,6 @@ # links property file for Ant's symlink task in pom.xml: # links to components in https://maven.apache.org/components -maven-acr-plugin../components/plugins/maven-acr-plugin +maven-acr-plugin=../components/plugins/maven-acr-plugin maven-ant-plugin=../components/plugins/maven-ant-plugin maven-antrun-plugin=../components/plugins/maven-antrun-plugin maven-assembly-plugin=../components/plugins/maven-assembly-plugin
svn commit: r1815747 - /maven/site/trunk/pom.xml
Author: hboutemy Date: Sun Nov 19 17:16:29 2017 New Revision: 1815747 URL: http://svn.apache.org/viewvc?rev=1815747&view=rev Log: trying overwrite symplinks to avoid build failure Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1815747&r1=1815746&r2=1815747&view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Sun Nov 19 17:16:29 2017 @@ -152,7 +152,7 @@ - +
buildbot failure in on maven-site-staging
The Buildbot has detected a new failure on builder maven-site-staging while building . Full details are available at: https://ci.apache.org/builders/maven-site-staging/builds/402 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The AnyBranchScheduler scheduler named 'on-maven-site-commit' triggered this build Build Source Stamp: [branch maven/site] 1815746 Blamelist: hboutemy BUILD FAILED: failed compile Sincerely, -The Buildbot
svn commit: r1815746 - /maven/site/trunk/content/filtered-resources/.htaccess
Author: hboutemy Date: Sun Nov 19 17:11:18 2017 New Revision: 1815746 URL: http://svn.apache.org/viewvc?rev=1815746&view=rev Log: added doc on rewrite rules (which should dnow be obsolete, yay!!!) Modified: maven/site/trunk/content/filtered-resources/.htaccess Modified: maven/site/trunk/content/filtered-resources/.htaccess URL: http://svn.apache.org/viewvc/maven/site/trunk/content/filtered-resources/.htaccess?rev=1815746&r1=1815745&r2=1815746&view=diff == --- maven/site/trunk/content/filtered-resources/.htaccess (original) +++ maven/site/trunk/content/filtered-resources/.htaccess Sun Nov 19 17:11:18 2017 @@ -75,6 +75,8 @@ Redirect Permanent /guides/mini/guide-ap RedirectMatch ^/maven-1.x/(.*)$ /archives/maven-1.x/$1 +# rewrite rules for /components: see http://maven.apache.org/developers/website/ +# should not be useful any more since symlinks have been created in http://svn.apache.org/r1815743 and http://svn.apache.org/r1815745 RewriteEngine on # if file is not found in maven-site, look into components
svn commit: r1815745 - in /maven/site/trunk/content/resources: components.links plugins/components.links pom/ pom/components.link shared/ shared/components.link skins/ skins/components.link
Author: hboutemy Date: Sun Nov 19 17:03:43 2017 New Revision: 1815745 URL: http://svn.apache.org/viewvc?rev=1815745&view=rev Log: added full symlinks lists Added: maven/site/trunk/content/resources/pom/ maven/site/trunk/content/resources/pom/components.link maven/site/trunk/content/resources/shared/ maven/site/trunk/content/resources/shared/components.link maven/site/trunk/content/resources/skins/ maven/site/trunk/content/resources/skins/components.link Modified: maven/site/trunk/content/resources/components.links maven/site/trunk/content/resources/plugins/components.links Modified: maven/site/trunk/content/resources/components.links URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/components.links?rev=1815745&r1=1815744&r2=1815745&view=diff == --- maven/site/trunk/content/resources/components.links (original) +++ maven/site/trunk/content/resources/components.links Sun Nov 19 17:03:43 2017 @@ -2,3 +2,42 @@ # links to components in https://maven.apache.org/components/ ant-tasks=components/ant-tasks ant-tasks-archives=components/ant-tasks-archives +archetype-archives=components/archetype-archives +archetype=components/archetype +archetypes-archives=components/archetypes-archives +archetypes=components/archetypes +archives=components/archives +core-its=components/core-its +enforcer-archives=components/enforcer-archives +enforcer=components/enforcer +jxr-archives=components/jxr-archives +jxr=components/jxr +maven-eclipse-plugin=components/maven-eclipse-plugin +maven-indexer-archives=components/maven-indexer-archives +maven-indexer=components/maven-indexer +maven-release-archives=components/maven-release-archives +maven-release=components/maven-release +plugin-testing-archives=components/plugin-testing-archives +plugin-testing=components/plugin-testing +plugin-tools-archives=components/plugin-tools-archives +plugin-tools=components/plugin-tools +plugins-archives=components/plugins-archives +#plugins +pom-archives=components/pom-archives +#pom +ref=components/ref +resolver-ant-tasks=components/resolver-ant-tasks +resolver-archives=components/resolver-archives +resolver-demos=components/resolver-demos +resolver=components/resolver +sandbox=components/sandbox +scm-archives=components/scm-archives +scm=components/scm +shared-archives=components/shared-archives +#shared +skins-archives=components/skins-archives +#skins +surefire-archives=components/surefire-archives +surefire=components/surefire +wagon-archives=components/wagon-archives +wagon=components/wagon Modified: maven/site/trunk/content/resources/plugins/components.links URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/plugins/components.links?rev=1815745&r1=1815744&r2=1815745&view=diff == --- maven/site/trunk/content/resources/plugins/components.links (original) +++ maven/site/trunk/content/resources/plugins/components.links Sun Nov 19 17:03:43 2017 @@ -1,3 +1,49 @@ # links property file for Ant's symlink task in pom.xml: -# links to components in https://maven.apache.org/components/ -maven-acr-plugin=../components/maven-acr-plugin +# links to components in https://maven.apache.org/components +maven-acr-plugin../components/plugins/maven-acr-plugin +maven-ant-plugin=../components/plugins/maven-ant-plugin +maven-antrun-plugin=../components/plugins/maven-antrun-plugin +maven-assembly-plugin=../components/plugins/maven-assembly-plugin +maven-changelog-plugin=../components/plugins/maven-changelog-plugin +maven-changes-plugin=../components/plugins/maven-changes-plugin +maven-checkstyle-plugin=../components/plugins/maven-checkstyle-plugin +maven-clean-plugin=../components/plugins/maven-clean-plugin +maven-compiler-plugin=../components/plugins/maven-compiler-plugin +maven-dependency-plugin=../components/plugins/maven-dependency-plugin +maven-deploy-plugin=../components/plugins/maven-deploy-plugin +maven-doap-plugin=../components/plugins/maven-doap-plugin +maven-docck-plugin=../components/plugins/maven-docck-plugin +maven-ear-plugin=../components/plugins/maven-ear-plugin +maven-eclipse-plugin=../components/plugins/maven-eclipse-plugin +maven-ejb-plugin=../components/plugins/maven-ejb-plugin +maven-gpg-plugin=../components/plugins/maven-gpg-plugin +maven-help-plugin=../components/plugins/maven-help-plugin +maven-idea-plugin=../components/plugins/maven-idea-plugin +maven-install-plugin=../components/plugins/maven-install-plugin +maven-invoker-plugin=../components/plugins/maven-invoker-plugin +maven-jar-plugin=../components/plugins/maven-jar-plugin +maven-jarsigner-plugin=../components/plugins/maven-jarsigner-plugin +maven-javadoc-plugin=../components/plugins/maven-javadoc-plugin +maven-jdeprscan-plugin=../components/plugins/maven-jdeprscan-plugin +maven-jdeps-plugin=../components/plugins/maven-jdeps-plugin +maven-jlink-plugin=../componen
svn commit: r1815743 - in /maven/site/trunk: content/resources/components.links content/resources/plugins/ content/resources/plugins/components.links pom.xml
Author: hboutemy Date: Sun Nov 19 16:45:23 2017 New Revision: 1815743 URL: http://svn.apache.org/viewvc?rev=1815743&view=rev Log: test symlink creation for each component documentation Added: maven/site/trunk/content/resources/components.links maven/site/trunk/content/resources/plugins/ maven/site/trunk/content/resources/plugins/components.links Modified: maven/site/trunk/pom.xml Added: maven/site/trunk/content/resources/components.links URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/components.links?rev=1815743&view=auto == --- maven/site/trunk/content/resources/components.links (added) +++ maven/site/trunk/content/resources/components.links Sun Nov 19 16:45:23 2017 @@ -0,0 +1,4 @@ +# links property file for Ant's symlink task in pom.xml: +# links to components in https://maven.apache.org/components/ +ant-tasks=components/ant-tasks +ant-tasks-archives=components/ant-tasks-archives Added: maven/site/trunk/content/resources/plugins/components.links URL: http://svn.apache.org/viewvc/maven/site/trunk/content/resources/plugins/components.links?rev=1815743&view=auto == --- maven/site/trunk/content/resources/plugins/components.links (added) +++ maven/site/trunk/content/resources/plugins/components.links Sun Nov 19 16:45:23 2017 @@ -0,0 +1,3 @@ +# links property file for Ant's symlink task in pom.xml: +# links to components in https://maven.apache.org/components/ +maven-acr-plugin=../components/maven-acr-plugin Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1815743&r1=1815742&r2=1815743&view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Sun Nov 19 16:45:23 2017 @@ -149,7 +149,12 @@ + + + + +
[3/4] maven-surefire git commit: [SUREFIRE-1262] Add modulepath support
[SUREFIRE-1262] Add modulepath support Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f337881f Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f337881f Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f337881f Branch: refs/heads/master Commit: f337881ff7f47ab35669d9c499213f5a6b9a4d8b Parents: 660a4cf Author: Tibor17 Authored: Fri Nov 17 15:09:52 2017 +0100 Committer: Tibor17 Committed: Sun Nov 19 01:56:51 2017 +0100 -- maven-surefire-common/pom.xml | 27 +- .../plugin/surefire/AbstractSurefireMojo.java | 271 ++-- .../surefire/InPluginVMSurefireStarter.java | 5 +- .../AbstractClasspathForkConfiguration.java | 73 +++ .../surefire/booterclient/BooterSerializer.java | 94 +-- .../ClasspathForkConfiguration.java | 59 ++ .../booterclient/DefaultForkConfiguration.java | 343 ++ .../booterclient/ForkConfiguration.java | 367 +-- .../surefire/booterclient/ForkStarter.java | 27 +- .../JarManifestForkConfiguration.java | 139 .../ModularClasspathForkConfiguration.java | 230 +++ .../plugin/surefire/booterclient/Platform.java | 29 +- .../maven/plugin/surefire/util/Relocator.java | 39 +- .../surefire/providerapi/ServiceLoader.java | 2 +- .../surefire/AbstractSurefireMojoTest.java | 641 ++- ...terDeserializerStartupConfigurationTest.java | 8 +- .../DefaultForkConfigurationTest.java | 319 + .../booterclient/ForkConfigurationTest.java | 52 +- .../apache/maven/surefire/JUnit4SuiteTest.java | 4 +- .../maven/surefire/util/RelocatorTest.java | 6 +- .../plugin/surefire/SurefirePluginTest.java | 3 +- pom.xml | 65 +- .../maven/surefire/util/DefaultScanResult.java | 24 +- .../maven/surefire/util/ScanResultTest.java | 8 +- .../booter/AbstractPathConfiguration.java | 115 .../apache/maven/surefire/booter/Classpath.java | 19 +- .../surefire/booter/ClasspathConfiguration.java | 73 +-- .../maven/surefire/booter/ForkedBooter.java | 22 +- .../maven/surefire/booter/ModularClasspath.java | 70 ++ .../booter/ModularClasspathConfiguration.java | 62 ++ .../surefire/booter/StartupConfiguration.java | 28 +- .../maven/surefire/booter/SystemUtilsTest.java | 5 +- .../apache/maven/surefire/its/ModulePathIT.java | 45 ++ .../src/test/resources/modulepath/pom.xml | 45 ++ .../modulepath/src/main/java/com/app/Main.java | 34 + .../modulepath/src/main/java/module-info.java | 21 + .../src/test/java/com/app/AppTest.java | 36 ++ 37 files changed, 2759 insertions(+), 651 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f337881f/maven-surefire-common/pom.xml -- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 1bcd7c5..7e063c8 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -97,25 +97,36 @@ org.apache.maven.shared maven-common-artifact-filters - 1.3 - - - org.apache.maven.shared - maven-plugin-testing-harness - - org.fusesource.jansi jansi - 1.13 provided + org.codehaus.plexus + plexus-java + + org.mockito mockito-core test + + org.powermock + powermock-core + test + + + org.powermock + powermock-module-junit4 + test + + + org.powermock + powermock-api-mockito2 + test + http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f337881f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java -- 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 7aa1e37..16b59ca 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 @@ -24,6 +24,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException; import org.apache.maven.artifact.resolv
[4/4] maven-surefire git commit: [refactoring ]used stringPropertyNames() from Java 1.6 in SystemPropertyManager
[refactoring ]used stringPropertyNames() from Java 1.6 in SystemPropertyManager
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7b9815c8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7b9815c8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7b9815c8
Branch: refs/heads/master
Commit: 7b9815c8be370bc165fd97cb97772ced3871475a
Parents: f337881
Author: Tibor17
Authored: Sun Nov 19 09:13:43 2017 +0100
Committer: Tibor17
Committed: Sun Nov 19 09:13:43 2017 +0100
--
.../org/apache/maven/surefire/booter/SystemPropertyManager.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7b9815c8/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
--
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
index 713d4fe..c8df291 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
@@ -49,10 +49,9 @@ public class SystemPropertyManager
Properties p = new Properties();
p.load( inStream );
Map map = new ConcurrentHashMap(
p.size() );
-// @todo use .stringPropertyNames() JDK6 instead of .keySet()
-for ( Map.Entry entry : p.entrySet() )
+for ( String key : p.stringPropertyNames() )
{
-map.put( (String) entry.getKey(), (String) entry.getValue() );
+map.put( key, p.getProperty( key ) );
}
return new PropertiesWrapper( map );
}
[1/4] maven-surefire git commit: [SUREFIRE-1262] Add modulepath support
Repository: maven-surefire
Updated Branches:
refs/heads/master 660a4cfab -> 7b9815c8b
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f337881f/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
--
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index 33662d1..92253d1 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -90,7 +90,7 @@ public final class ForkedBooter
{
BooterDeserializer booterDeserializer =
new BooterDeserializer( createSurefirePropertiesIfFileExists(
tmpDir, surefirePropsFileName ) );
-// todo: print PID in debug console logger in version 2.20.2
+// todo: print PID in debug console logger in version 2.21.2
pingScheduler = isDebugging() ? null : listenToShutdownCommands(
booterDeserializer.getPluginPid() );
setSystemProperties( new File( tmpDir,
effectiveSystemPropertiesFileName ) );
@@ -98,20 +98,24 @@ public final class ForkedBooter
DumpErrorSingleton.getSingleton().init( dumpFileName,
providerConfiguration.getReporterConfiguration() );
startupConfiguration = booterDeserializer.getProviderConfiguration();
-systemExitTimeoutInSeconds =
-providerConfiguration.systemExitTimeout(
DEFAULT_SYSTEM_EXIT_TIMEOUT_IN_SECONDS );
+systemExitTimeoutInSeconds = providerConfiguration.systemExitTimeout(
DEFAULT_SYSTEM_EXIT_TIMEOUT_IN_SECONDS );
-ClasspathConfiguration classpathConfiguration =
startupConfiguration.getClasspathConfiguration();
-if ( startupConfiguration.isManifestOnlyJarRequestedAndUsable() )
+AbstractPathConfiguration classpathConfiguration =
startupConfiguration.getClasspathConfiguration();
+
+if ( classpathConfiguration.isClassPathConfig() )
{
-classpathConfiguration.trickClassPathWhenManifestOnlyClasspath();
+if ( startupConfiguration.isManifestOnlyJarRequestedAndUsable() )
+{
+classpathConfiguration.toRealPath(
ClasspathConfiguration.class )
+.trickClassPathWhenManifestOnlyClasspath();
+}
+startupConfiguration.writeSurefireTestClasspathProperty();
}
ClassLoader classLoader = currentThread().getContextClassLoader();
classLoader.setDefaultAssertionStatus(
classpathConfiguration.isEnableAssertions() );
-startupConfiguration.writeSurefireTestClasspathProperty();
-testSet = createTestSet( providerConfiguration.getTestForFork(),
-
providerConfiguration.isReadTestsFromInStream(), classLoader );
+boolean readTestsFromCommandReader =
providerConfiguration.isReadTestsFromInStream();
+testSet = createTestSet( providerConfiguration.getTestForFork(),
readTestsFromCommandReader, classLoader );
}
private void execute()
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f337881f/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ModularClasspath.java
--
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ModularClasspath.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ModularClasspath.java
new file mode 100644
index 000..0d7b8eb
--- /dev/null
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ModularClasspath.java
@@ -0,0 +1,70 @@
+package org.apache.maven.surefire.booter;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Collection;
+import java.util.List;
+
+import static java.util.Collections.unmodifiableCollection;
+import static java.util.Collections.unmodifiableList;
+
+/**
+ * Jigsaw class-path and module-path.
+ *
+ * @author mailto:tibordig...@apache.org";>Tibor Digana (tibor17)
[2/4] maven-surefire git commit: [SUREFIRE-1262] Add modulepath support
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f337881f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
--
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
new file mode 100644
index 000..2b47c03
--- /dev/null
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java
@@ -0,0 +1,230 @@
+package org.apache.maven.plugin.surefire.booterclient;
+
+/*
+ * 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.plugin.surefire.booterclient.lazytestprovider.OutputStreamFlushableCommandline;
+import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
+import org.apache.maven.surefire.booter.AbstractPathConfiguration;
+import org.apache.maven.surefire.booter.Classpath;
+import org.apache.maven.surefire.booter.ModularClasspath;
+import org.apache.maven.surefire.booter.ModularClasspathConfiguration;
+import org.apache.maven.surefire.booter.StartupConfiguration;
+import org.apache.maven.surefire.booter.SurefireBooterForkException;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ModuleVisitor;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import static java.io.File.createTempFile;
+import static java.io.File.pathSeparatorChar;
+import static
org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath;
+import static org.objectweb.asm.Opcodes.ASM6;
+
+/**
+ * @author mailto:tibordig...@apache.org";>Tibor Digana (tibor17)
+ * @since 2.21.0.Jigsaw
+ */
+public class ModularClasspathForkConfiguration
+extends DefaultForkConfiguration
+{
+@SuppressWarnings( "checkstyle:parameternumber" )
+public ModularClasspathForkConfiguration( @Nonnull Classpath bootClasspath,
+ @Nonnull File tempDirectory,
+ @Nullable String debugLine,
+ @Nonnull File workingDirectory,
+ @Nonnull Properties
modelProperties,
+ @Nullable String argLine,
+ @Nonnull Map
environmentVariables,
+ boolean debug,
+ int forkCount,
+ boolean reuseForks,
+ @Nonnull Platform pluginPlatform,
+ @Nonnull ConsoleLogger log )
+{
+super( bootClasspath, tempDirectory, debugLine, workingDirectory,
modelProperties, argLine,
+environmentVariables, debug, forkCount, reuseForks,
pluginPlatform, log );
+}
+
+@Override
+protected void resolveClasspath( OutputStreamFlushableCommandline cli,
String startClass,
+ StartupConfiguration config )
+throws SurefireBooterForkException
+{
+try
+{
+AbstractPathConfiguration pathConfig =
config.getClasspathConfiguration();
+
+ModularClasspathConfiguration modularClasspathConfiguration =
+pathConfig.toRealPath( ModularClasspathConfiguration.class
);
+
+ModularClasspath modularClasspath =
modularClasspathConfiguration.getModularClasspath();
+
+File descriptor = modularClasspath.getModuleDescriptor();
+List modulePath = modularClasspath.getModulePath();
+Collection
maven-surefire git commit: [refactoring ]used stringPropertyNames() from Java 1.6 in SystemPropertyManager
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1262_3 f337881ff -> 7b9815c8b
[refactoring ]used stringPropertyNames() from Java 1.6 in SystemPropertyManager
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7b9815c8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7b9815c8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7b9815c8
Branch: refs/heads/SUREFIRE-1262_3
Commit: 7b9815c8be370bc165fd97cb97772ced3871475a
Parents: f337881
Author: Tibor17
Authored: Sun Nov 19 09:13:43 2017 +0100
Committer: Tibor17
Committed: Sun Nov 19 09:13:43 2017 +0100
--
.../org/apache/maven/surefire/booter/SystemPropertyManager.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7b9815c8/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
--
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
index 713d4fe..c8df291 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
@@ -49,10 +49,9 @@ public class SystemPropertyManager
Properties p = new Properties();
p.load( inStream );
Map map = new ConcurrentHashMap(
p.size() );
-// @todo use .stringPropertyNames() JDK6 instead of .keySet()
-for ( Map.Entry entry : p.entrySet() )
+for ( String key : p.stringPropertyNames() )
{
-map.put( (String) entry.getKey(), (String) entry.getValue() );
+map.put( key, p.getProperty( key ) );
}
return new PropertiesWrapper( map );
}
