[maven-surefire] Git Push Summary

2018-02-18 Thread olamy 
Repository: maven-surefire
Updated Branches:
  refs/heads/feature/jdk10 [deleted] 3b2e1aaf9

maven-integration-testing git commit: [MNG-6364] - Make an activation also for JDK 9 o This will make this test pass for JDK 9.

2018-02-18 Thread khmarbaise 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6364 [created] 5307189f8


[MNG-6364] - Make an activation also for JDK 9
  o This will make this test pass for JDK 9.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/5307189f
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/5307189f
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/5307189f

Branch: refs/heads/MNG-6364
Commit: 5307189f890200c8e47e9fc28e3ea2b0786c0c96
Parents: aaace66
Author: Karl Heinz Marbaise 
Authored: Sun Feb 18 16:13:47 2018 +0100
Committer: Karl Heinz Marbaise 
Committed: Sun Feb 18 16:13:47 2018 +0100

--
 core-it-suite/src/test/resources/mng-1957/pom.xml | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/5307189f/core-it-suite/src/test/resources/mng-1957/pom.xml
--
diff --git a/core-it-suite/src/test/resources/mng-1957/pom.xml 
b/core-it-suite/src/test/resources/mng-1957/pom.xml
index bf24ede..9651c47 100644
--- a/core-it-suite/src/test/resources/mng-1957/pom.xml
+++ b/core-it-suite/src/test/resources/mng-1957/pom.xml
@@ -166,5 +166,15 @@ under the License.
 PASSED
   
 
+
+  
+  test-6g
+  
+[9,10)
+  
+  
+PASSED
+  
+

maven-integration-testing git commit: Fixed IT's related to JDK 9 o Need to separate between JDK..8 and JDK 9 cause the error output looks different for JDK 9.

2018-02-18 Thread khmarbaise 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6364 5307189f8 -> 1327a7e16


Fixed IT's related to JDK 9
 o Need to separate between JDK..8 and JDK 9 cause
   the error output looks different for JDK 9.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/1327a7e1
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/1327a7e1
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/1327a7e1

Branch: refs/heads/MNG-6364
Commit: 1327a7e16b3ed14ff9efcd91d4b4765a8ab613af
Parents: 5307189
Author: Karl Heinz Marbaise 
Authored: Sun Feb 18 20:10:46 2018 +0100
Committer: Karl Heinz Marbaise 
Committed: Sun Feb 18 20:10:46 2018 +0100

--
 ...avenITmng5958LifecyclePhaseBinaryCompat.java | 28 +---
 1 file changed, 24 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/1327a7e1/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
index 3ee3fe1..4891fe2 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java
@@ -17,19 +17,20 @@ public class MavenITmng5958LifecyclePhaseBinaryCompat
 throws Exception
 {
 File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5958-lifecycle-phases/good" );
-
+
 Verifier verifier = newVerifier( testDir.getAbsolutePath() );
 verifier.executeGoal( "validate" );
 verifier.verifyErrorFreeLog();
 verifier.verifyTextInLog( "CLASS_NAME=java.lang.String" );
 verifier.resetStreams();
 }
-
-public void testBad()
+
+public void testBadTillJDK8()
 throws Exception
 {
+requiresJavaVersion( "[,1.8]" );
 File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5958-lifecycle-phases/bad" );
-
+
 Verifier verifier = newVerifier( testDir.getAbsolutePath() );
 try
 {
@@ -42,4 +43,23 @@ public class MavenITmng5958LifecyclePhaseBinaryCompat
 }
 verifier.resetStreams();
 }
+
+public void testBadJDK9()
+throws Exception
+{
+requiresJavaVersion( "[9.0,)" );
+File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/mng-5958-lifecycle-phases/bad" );
+
+Verifier verifier = newVerifier( testDir.getAbsolutePath() );
+try
+{
+verifier.executeGoal( "validate" );
+}
+catch ( VerificationException e )
+{
+verifier.verifyTextInLog( "[ERROR] Internal error: 
java.lang.ClassCastException: "
++ "org.apache.maven.lifecycle.mapping.LifecyclePhase cannot be 
cast to java.base/java.lang.String -> [Help 1]" );
+}
+verifier.resetStreams();
+}
 }

svn commit: r1824692 - in /maven/archetypes/trunk/maven-archetype-j2ee-simple/src: main/resources/META-INF/maven/ main/resources/archetype-resources/ main/resources/archetype-resources/ear/ main/resou

2018-02-18 Thread hboutemy 
Author: hboutemy
Date: Sun Feb 18 19:37:23 2018
New Revision: 1824692

URL: http://svn.apache.org/viewvc?rev=1824692=rev
Log:
[MARCHETYPES-53] switch from Archetype 1 to Archetype NG

Modified:

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt

Modified: 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1824692=1824691=1824692=diff
==
--- 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
 Sun Feb 18 19:37:23 2018
@@ -17,21 +17,74 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0
 http://maven.apache.org/xsd/archetype-1.0.0.xsd;>
-  j2ee
+http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd;
+  name="j2ee">
 
-  
-pom.xml
-ear/pom.xml
-ejbs/src/main/resources/META-INF/ejb-jar.xml
-ejbs/pom.xml
-primary-source/pom.xml
-projects/logging/pom.xml
-projects/pom.xml
-servlets/pom.xml
-servlets/servlet/pom.xml
-servlets/servlet/src/main/webapp/index.jsp
-servlets/servlet/src/main/webapp/WEB-INF/web.xml
-  
-
+  
+
+  
+
+  src/main/java
+
+
+  src/test/java
+
+  
+
+
+  
+
+  src/main/java
+
+
+  src/main/resources
+
+
+  src/test/java
+
+  
+
+
+  
+
+  src/main/java
+
+
+  src/test/java
+
+  
+
+
+  
+
+  
+
+  src/main/java
+
+
+  src/test/java
+
+  
+
+  
+
+
+  
+
+  
+
+  src/main/java
+
+
+  src/main/webapp
+
+
+  src/test/java
+
+  
+
+  
+
+  
+

Modified: 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml?rev=1824692=1824691=1824692=diff
==
--- 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
 Sun Feb 18 19:37:23 2018
@@ -5,35 +5,33 @@
   4.0.0
 
   
-root
-project
-1.0
+${groupId}
+${rootArtifactId}
+${version}
   
 
-  root.project
   ear
-  1.0
   ear
 
   ear assembly
 
   
 
-  root.project
+  ${groupId}
   ejbs
   ejb
 
 
-  root.project.servlets
+  ${groupId}
   servlet
   war
 
 
-  root.project
+  ${groupId}
   primary-source
 
 
-  root.project.projects
+  ${groupId}
   logging

svn commit: r1824653 - in /maven/archetypes/trunk: maven-archetype-archetype/src/test/resources/projects/basic/ maven-archetype-archetype/src/test/resources/projects/it-basic/ maven-archetype-j2ee-sim

2018-02-18 Thread hboutemy 
Author: hboutemy
Date: Sun Feb 18 10:01:26 2018
New Revision: 1824653

URL: http://svn.apache.org/viewvc?rev=1824653=rev
Log:
renamed basic directory to it-basic and generated artifactId to 
basic-${archetype objective}

Added:

maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/
  - copied from r1816661, 
maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/goal.txt
  - copied unchanged from r1824641, 
maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/basic/goal.txt

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/
  - copied from r1816661, 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
  - copied unchanged from r1824083, 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/basic/goal.txt

maven/archetypes/trunk/maven-archetype-plugin-site/src/test/resources/projects/it-basic/
  - copied from r1824652, 
maven/archetypes/trunk/maven-archetype-plugin-site/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-plugin/src/test/resources/projects/it-basic/
  - copied from r1824652, 
maven/archetypes/trunk/maven-archetype-plugin/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-portlet/src/test/resources/projects/it-basic/
  - copied from r1824652, 
maven/archetypes/trunk/maven-archetype-portlet/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-profiles/src/test/resources/projects/it-basic/
  - copied from r1824652, 
maven/archetypes/trunk/maven-archetype-profiles/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/
  - copied from r1816661, 
maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
  - copied, changed from r1824642, 
maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/basic/reference/pom.xml

maven/archetypes/trunk/maven-archetype-site/src/test/resources/projects/it-basic/
  - copied from r1824652, 
maven/archetypes/trunk/maven-archetype-site/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-webapp/src/test/resources/projects/it-basic/
  - copied from r1824652, 
maven/archetypes/trunk/maven-archetype-webapp/src/test/resources/projects/basic/
Removed:

maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-plugin-site/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-plugin/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-portlet/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-profiles/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-site/src/test/resources/projects/basic/

maven/archetypes/trunk/maven-archetype-webapp/src/test/resources/projects/basic/
Modified:

maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/archetype.properties

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/archetype.properties

maven/archetypes/trunk/maven-archetype-plugin-site/src/test/resources/projects/it-basic/archetype.properties

maven/archetypes/trunk/maven-archetype-portlet/src/test/resources/projects/it-basic/archetype.properties

maven/archetypes/trunk/maven-archetype-profiles/src/test/resources/projects/it-basic/archetype.properties

maven/archetypes/trunk/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties

maven/archetypes/trunk/maven-archetype-site-simple/src/test/resources/projects/it-basic/archetype.properties

maven/archetypes/trunk/maven-archetype-site/src/test/resources/projects/it-basic/archetype.properties

maven/archetypes/trunk/maven-archetype-webapp/src/test/resources/projects/it-basic/archetype.properties

Modified: 
maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/archetype.properties
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/archetype.properties?rev=1824653=1816661=1824653=diff
==
---

maven-surefire git commit: simplify configuration, push this in a branch to test on ci as build is too long...

2018-02-18 Thread olamy 
Repository: maven-surefire
Updated Branches:
  refs/heads/feature/jdk10 [created] 02a1fe8d8


simplify configuration, push this in a branch to test on ci as build is too 
long...

Signed-off-by: olivier lamy 


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/02a1fe8d
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/02a1fe8d
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/02a1fe8d

Branch: refs/heads/feature/jdk10
Commit: 02a1fe8d82cf8315d2b06495f5c75e4ef0a20138
Parents: d46556f
Author: olivier lamy 
Authored: Sun Feb 18 20:26:58 2018 +1000
Committer: olivier lamy 
Committed: Sun Feb 18 20:26:58 2018 +1000

--
 pom.xml |  1 +
 surefire-booter/pom.xml | 13 -
 2 files changed, 1 insertion(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/02a1fe8d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4a768a5..fc9ba15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,7 @@
 
   
 2.2.1
+6
 
 3.5
 3.5

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/02a1fe8d/surefire-booter/pom.xml
--
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index a69b38b..d685e6d 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -108,24 +108,11 @@
 surefire-shadefire
 2.12.4 
   
-  
-
-org.apache.commons
-commons-lang3
-3.7
-  
 
 
   
 **/JUnit4SuiteTest.java
   
-  
-  
-
org.apache.commons:commons-lang3
-  
-  
-
${maven.repo.local}/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar
-

svn commit: r1824685 - /maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java

2018-02-18 Thread hboutemy 
Author: hboutemy
Date: Sun Feb 18 18:25:55 2018
New Revision: 1824685

URL: http://svn.apache.org/viewvc?rev=1824685=rev
Log:
[MARCHETYPES-50] fixed spell checking
Submitted by: Adam Williams

Modified:

maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java

Modified: 
maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java?rev=1824685=1824684=1824685=diff
==
--- 
maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java
 Sun Feb 18 18:25:55 2018
@@ -10,7 +10,7 @@ import org.junit.Test;
 public class AppTest 
 {
 /**
- * Rigourous Test :-)
+ * Rigorous Test :-)
  */
 @Test
 public void shouldAnswerWithTrue()

svn commit: r1824687 - in /maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources: ear/pom.xml ejbs/pom.xml primary-source/pom.xml projects/logging/pom.xml projects/

2018-02-18 Thread hboutemy 
Author: hboutemy
Date: Sun Feb 18 18:33:48 2018
New Revision: 1824687

URL: http://svn.apache.org/viewvc?rev=1824687=rev
Log:
[MARCHETYPES-37] added XML prolog specifying encoding to generated pom.xml

Modified:

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml

maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml

Modified: 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml?rev=1824687=1824686=1824687=diff
==
--- 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
 Sun Feb 18 18:33:48 2018
@@ -1,3 +1,5 @@
+
+
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0

Modified: 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml?rev=1824687=1824686=1824687=diff
==
--- 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
 Sun Feb 18 18:33:48 2018
@@ -1,3 +1,5 @@
+
+
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0

Modified: 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml?rev=1824687=1824686=1824687=diff
==
--- 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
 Sun Feb 18 18:33:48 2018
@@ -1,3 +1,5 @@
+
+
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0

Modified: 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml?rev=1824687=1824686=1824687=diff
==
--- 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
 (original)
+++ 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
 Sun Feb 18 18:33:48 2018
@@ -1,3 +1,5 @@
+
+
 http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
   4.0.0

Modified: 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml?rev=1824687=1824686=1824687=diff
==
--- 
maven/archetypes/trunk/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
 (original)
+++

[maven-integration-testing] Git Push Summary

2018-02-18 Thread khmarbaise 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/MNG-6352-print-version [deleted] aaace6628

maven git commit: [MNG-6364] - Enhanced Jenkinsfile to Build Core with JDK 9

2018-02-18 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/MNG-6364 [created] d5dd8a26c


[MNG-6364] - Enhanced Jenkinsfile to Build Core with JDK 9


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d5dd8a26
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d5dd8a26
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d5dd8a26

Branch: refs/heads/MNG-6364
Commit: d5dd8a26c1758769dd9f854f1d9532037db5fdbc
Parents: 8f619ac
Author: Karl Heinz Marbaise 
Authored: Sun Feb 18 15:15:47 2018 +0100
Committer: Karl Heinz Marbaise 
Committed: Sun Feb 18 15:15:47 2018 +0100

--
 Jenkinsfile | 43 +++
 1 file changed, 43 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/d5dd8a26/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 697e6eb..0729689 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -98,6 +98,25 @@ parallel linuxJava7:{
 }
 }
 }
+},linuxJava9: {
+node(jenkinsEnv.labelForOS('linux')) {
+stage ('Linux Java 9') {
+String jdkName = jenkinsEnv.jdkFromVersion('linux', '9')
+String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn)
+dir('test') {
+def WORK_DIR=pwd()
+checkout tests
+sh "rm -rvf $WORK_DIR/apache-maven-dist.zip 
$WORK_DIR/it-local-repo"
+unstash 'dist'
+withMaven(jdk: jdkName, maven: mvnName, 
mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
+junitPublisher(ignoreAttachments: false)
+]) {
+sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+}
+deleteDir() // clean up after ourselves to reduce disk 
space
+}
+}
+}
 }, winJava7: {
 node(jenkinsEnv.labelForOS('windows')) {
 stage ('Windows Java 7') {
@@ -146,6 +165,30 @@ parallel linuxJava7:{
 }
 }
 }
+}, winJava9: {
+node(jenkinsEnv.labelForOS('windows')) {
+stage ('Windows Java 9') {
+String jdkName = jenkinsEnv.jdkFromVersion('windows', '9')
+String mvnName = jenkinsEnv.mvnFromVersion('windows', buildMvn)
+
+// need a short path or we hit 256 character limit for paths
+// using EXECUTOR_NUMBER guarantees that concurrent builds on 
same agent
+// will not trample each other
+dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") {
+def WORK_DIR=pwd()
+checkout tests
+bat "if exist it-local-repo rmdir /s /q it-local-repo"
+bat "if exist apache-maven-dist.zip del /q 
apache-maven-dist.zip"
+unstash 'dist'
+withMaven(jdk: jdkName, maven: mvnName, 
mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
+junitPublisher(ignoreAttachments: false)
+]) {
+bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V 
-Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip"
+}
+deleteDir() // clean up after ourselves to reduce disk 
space
+}
+}
+}
 }
 
 // JENKINS-34376 seems to make it hard to detect the aborted builds

maven-integration-testing git commit: [MNG-6352] - Added IT's for print version output.

2018-02-18 Thread khmarbaise 
Repository: maven-integration-testing
Updated Branches:
  refs/heads/master d2b9d890e -> aaace6628


[MNG-6352] - Added IT's for print version output.


Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/aaace662
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/aaace662
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/aaace662

Branch: refs/heads/master
Commit: aaace66282d5e3ae5c71191b9996c050ba815eef
Parents: d2b9d89
Author: Karl Heinz Marbaise 
Authored: Sat Feb 17 19:26:30 2018 +0100
Committer: Karl Heinz Marbaise 
Committed: Sat Feb 17 20:29:05 2018 +0100

--
 .../apache/maven/it/IntegrationTestSuite.java   |   1 +
 .../it/MavenITmng6352PrintVersionTest.java  | 157 +++
 .../module-1/pom.xml|  30 
 .../module-2/pom.xml|  30 
 .../module-3/pom.xml|  30 
 .../mng-6352-print-version-aggregator/pom.xml   |  58 +++
 .../mng-6352-print-version/module-1/pom.xml |  33 
 .../mng-6352-print-version/module-2/pom.xml |  41 +
 .../mng-6352-print-version/module-3/pom.xml |  41 +
 .../resources/mng-6352-print-version/pom.xml|  58 +++
 10 files changed, 479 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/aaace662/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java 
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index c8bced7..ca46e3a 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -702,6 +702,7 @@ public class IntegrationTestSuite
 suite.addTestSuite( MavenIT0009GoalConfigurationTest.class );
 suite.addTestSuite( MavenIT0008SimplePluginTest.class );
 suite.addTestSuite( MavenITmng6210CoreExtensionsCustomScopesTest.class 
);
+suite.addTestSuite( MavenITmng6352PrintVersionTest.class );
 
 /*
  * Add tests in reverse alpha order above.

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/aaace662/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
new file mode 100644
index 000..aeafcc2
--- /dev/null
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
@@ -0,0 +1,157 @@
+package org.apache.maven.it;
+
+/*
+ * 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.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * An integration test to check the enhancements to print out version
+ * information during the reactor summary output at the correct
+ * positions.
+ *  
+ * https://issues.apache.org/jira/browse/MNG-6352;>MNG-6352.
+ * 
+ * @author Karl Heinz Marbaise khmarba...@apache.org
+ */
+public class MavenITmng6352PrintVersionTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng6352PrintVersionTest()
+{
+super( "[3.5.3-SNAPSHOT,)" );
+}
+
+/**
+ * Check that the resulting output is
+ * as expected for the root module and last 
+ * module in build but not for the intermediate
+ * modules. 
+ */
+public void testitShouldPrintVersionAtTopAndAtBottom()
+throws Exception
+{
+File testDir =

maven git commit: [MNG-6352] - Printout version information at the end of the build

2018-02-18 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/master cd34b08df -> 8f619acd3


[MNG-6352] - Printout version information at the end of the build


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8f619acd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8f619acd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8f619acd

Branch: refs/heads/master
Commit: 8f619acd3a70152bdb9f3f068626bb4b48b73912
Parents: cd34b08
Author: Karl Heinz Marbaise 
Authored: Sat Feb 17 18:37:36 2018 +0100
Committer: Karl Heinz Marbaise 
Committed: Sat Feb 17 19:27:52 2018 +0100

--
 .../apache/maven/cli/event/ExecutionEventLogger.java   | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8f619acd/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 d4171f7..51d00b7 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
@@ -151,13 +151,24 @@ public class ExecutionEventLogger
 
 MavenExecutionResult result = session.getResult();
 
-for ( MavenProject project : session.getProjects() )
+List projects = session.getProjects();
+MavenProject lastProject = projects.get( projects.size() - 1 );
+MavenProject topProject = session.getTopLevelProject();
+
+for ( MavenProject project : projects )
 {
 StringBuilder buffer = new StringBuilder( 128 );
 
 buffer.append( project.getName() );
 buffer.append( ' ' );
 
+if ( topProject.equals( project ) || lastProject.equals( project )
+|| !topProject.getVersion().equals( project.getVersion() ) )
+{
+buffer.append( project.getVersion() );
+buffer.append( ' ' );
+}
+
 if ( buffer.length() <= MAX_PROJECT_NAME_LENGTH )
 {
 while ( buffer.length() < MAX_PROJECT_NAME_LENGTH )

[maven] Git Push Summary

2018-02-18 Thread khmarbaise 
Repository: maven
Updated Branches:
  refs/heads/MNG-6352-print-version [deleted] 8f619acd3

svn commit: r1025547 - /websites/production/maven/components/surefire-archives/surefire-LATEST/

2018-02-18 Thread tibordigana 
Author: tibordigana
Date: Sun Feb 18 11:14:20 2018
New Revision: 1025547

Log:
[SUREFIRE] Removed old site

Removed:
websites/production/maven/components/surefire-archives/surefire-LATEST/

svn commit: r1025549 - in /websites/production/maven/components/surefire-archives/surefire-LATEST: ./ css/ images/ images/logos/ images/profiles/ img/ js/ maven-failsafe-plugin/ maven-failsafe-plugin/

2018-02-18 Thread tibordigana 
Author: tibordigana
Date: Sun Feb 18 11:34:40 2018
New Revision: 1025549

Log:
[SUREFIRE] Surefire 2.21.0 release site


[This commit notification would consist of 759 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]