svn commit: r1733518 - /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml

[krosenvold]

Author: krosenvold
Date: Thu Mar  3 20:30:47 2016
New Revision: 1733518

URL: http://svn.apache.org/viewvc?rev=1733518=rev
Log:
Changed directory permissions to something that will allow archiver to actually 
write files

The problem was that the testcase enforces a default file mode of 0555, which 
means that basically the plexus
archiver is not capable of writing files into the directory, since the 
permisssions prohibit this.

It may be possible to make the archiver apply permissions /after/ creating the 
files within,
but this is currently not implemented.

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml?rev=1733518=1733517=1733518=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/depSet-unpacked-rdonly/child2/src/assemble/bin.xml
 Thu Mar  3 20:30:47 2016
@@ -34,7 +34,7 @@ under the License.
   true
   /${artifact.artifactId}
   0444
-  0555
+  0755
 
   
 

svn commit: r1733048 - /maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml

[krosenvold]

Author: krosenvold
Date: Tue Mar  1 12:15:32 2016
New Revision: 1733048

URL: http://svn.apache.org/viewvc?rev=1733048=rev
Log:
Avoid jar plugin 2.4, which is broken beyond hope regarding symlinks

Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml?rev=1733048=1733047=1733048=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml 
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/it-project-parent/pom.xml 
Tue Mar  1 12:15:32 2016
@@ -72,6 +72,10 @@ under the License.
 ${testVersion}
 true
   
+  
+ maven-jar-plugin
+ 2.6
+  
 
   
 

maven-surefire git commit: Generalized closer somewhat

[krosenvold]

Repository: maven-surefire
Updated Branches:
  refs/heads/master 502d18442 -> e0bcffd05


Generalized closer somewhat


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

Branch: refs/heads/master
Commit: e0bcffd05bb04001f97bf752de56bca7137da3e2
Parents: 502d184
Author: Kristian Rosenvold 
Authored: Mon Feb 8 11:41:47 2016 +0100
Committer: Kristian Rosenvold 
Committed: Mon Feb 8 11:41:47 2016 +0100

--
 .../surefire/booterclient/ForkStarter.java  | 101 ---
 .../output/ThreadedStreamConsumer.java  |   3 +-
 2 files changed, 68 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e0bcffd0/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index 10eca6a..d43dd62 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -33,6 +33,7 @@ import 
org.apache.maven.plugin.surefire.booterclient.output.ThreadedStreamConsum
 import org.apache.maven.plugin.surefire.report.DefaultReporterFactory;
 import org.apache.maven.shared.utils.cli.CommandLineCallable;
 import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.apache.maven.shared.utils.cli.ShutdownHookUtils;
 import org.apache.maven.surefire.booter.Classpath;
 import org.apache.maven.surefire.booter.ClasspathConfiguration;
 import org.apache.maven.surefire.booter.KeyValueSource;
@@ -49,12 +50,13 @@ import org.apache.maven.surefire.suite.RunResult;
 import org.apache.maven.surefire.testset.TestRequest;
 import org.apache.maven.surefire.util.DefaultScanResult;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Queue;
@@ -65,33 +67,33 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static java.lang.StrictMath.min;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static 
org.apache.maven.plugin.surefire.AbstractSurefireMojo.createCopyAndReplaceForkNumPlaceholder;
+import static 
org.apache.maven.plugin.surefire.booterclient.lazytestprovider.TestLessInputStream
+.TestLessInputStreamBuilder;
 import static 
org.apache.maven.shared.utils.cli.CommandLineUtils.executeCommandLineAsCallable;
 import static 
org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook;
 import static 
org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook;
-import static 
org.apache.maven.surefire.util.internal.StringUtils.FORK_STREAM_CHARSET_NAME;
-import static 
org.apache.maven.surefire.util.internal.DaemonThreadFactory.newDaemonThread;
-import static 
org.apache.maven.surefire.util.internal.DaemonThreadFactory.newDaemonThreadFactory;
-import static 
org.apache.maven.plugin.surefire.AbstractSurefireMojo.createCopyAndReplaceForkNumPlaceholder;
-import static org.apache.maven.plugin.surefire.booterclient.lazytestprovider.
-TestLessInputStream.TestLessInputStreamBuilder;
-import static 
org.apache.maven.surefire.util.internal.ConcurrencyUtils.countDownToZero;
 import static org.apache.maven.surefire.booter.Classpath.join;
 import static 
org.apache.maven.surefire.booter.SystemPropertyManager.writePropertiesFile;
 import static org.apache.maven.surefire.suite.RunResult.timeout;
 import static org.apache.maven.surefire.suite.RunResult.failure;
 import static 

svn commit: r1720232 - in /maven/plugins/trunk/maven-assembly-plugin: ./ src/it/projects/bugs/massembly-731/ src/it/projects/bugs/massembly-731/symlinks/ src/it/projects/bugs/massembly-731/symlinks/di

[krosenvold]

Author: krosenvold
Date: Tue Dec 15 19:40:04 2015
New Revision: 1720232

URL: http://svn.apache.org/viewvc?rev=1720232=rev
Log:
Changed massembly-731 IT not to use file system symlinks

It simply does not work in a cross-platform compatible way

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/invoker.properties

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/setup.groovy

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/verify.bsh
  - copied, changed from r1720006, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/not-verify.bsh
Removed:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/not-verify.bsh

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/dirOnTheOutside/FileInDirOnTheOutside.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/onTheOutside.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/regen.sh

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/aRegularDir/aRegularFile.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/fileR.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/fileW.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/fileX.txt

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symDir

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToDirOnTheOutside

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symLinkToFileOnTheOutside

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symR

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symW

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/symX

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/symlinks/src/targetDir/targetFile.txt
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1720232=1720231=1720232=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Dec 15 19:40:04 2015
@@ -359,7 +359,7 @@ under the License.
   
 
   
-3.0.0-SNAPSHOT
+2.0.0
 
file://${project.build.testOutputDirectory}/remote-repository
 false
 ${project.version}
@@ -408,6 +408,11 @@ under the License.
 commons-compress
 1.9
   
+  
+commons-io
+commons-io
+2.4
+  
 
   
 

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/invoker.properties?rev=1720232=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/invoker.properties
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/invoker.properties
 Tue Dec 15 19:40:04 2015
@@ -0,0 +1 @@
+invoker.java.version = 1.7+

Added: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/setup.groovy
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/setup.groovy?rev=1720232=auto
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/setup.groovy
 (added)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-731/setup.groovy
 Tue Dec 15 19:40:04 2015
@@ -0,0 +1,57 @@
+/*
+ * 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,
+ 

svn commit: r1717974 - in /maven/shared/trunk/maven-dependency-analyzer: ./ src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ src/test/java/org/apache/maven/shared/dependency/analyzer/ sr

[krosenvold]

Author: krosenvold
Date: Fri Dec  4 14:48:05 2015
New Revision: 1717974

URL: http://svn.apache.org/viewvc?rev=1717974=rev
Log:
Added support for constant pool parsing to find more deps

Now detectes jdk8 lambdas and static refs on jdk8

Added:

maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/inlinedStaticReference/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/inlinedStaticReference/pom.xml

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/inlinedStaticReference/src/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/inlinedStaticReference/src/main/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/inlinedStaticReference/src/main/java/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/inlinedStaticReference/src/main/java/inlinedStaticReference/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/inlinedStaticReference/src/main/java/inlinedStaticReference/Project.java
  - copied, changed from r1717675, 
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithTestDependency/project2/src/test/java/jarWithTestDependency/project2/Project2.java

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/java8methodRefs/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/java8methodRefs/pom.xml

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/java8methodRefs/src/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/java8methodRefs/src/main/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/java8methodRefs/src/main/java/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/java8methodRefs/src/main/java/inlinedStaticReference/

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/java8methodRefs/src/main/java/inlinedStaticReference/Project.java
  - copied, changed from r1717675, 
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithTestDependency/project2/src/test/java/jarWithTestDependency/project2/Project2.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/pom.xml

maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java

maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java

maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithTestDependency/project2/src/test/java/jarWithTestDependency/project2/Project2.java

Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1717974=1717973=1717974=diff
==
--- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Fri Dec  4 14:48:05 
2015
@@ -64,6 +64,12 @@
   5.0.2
 
 
+  commons-lang
+  commons-lang
+  2.6
+  test
+
+
   org.codehaus.plexus
   plexus-utils
   1.5.1
@@ -103,7 +109,7 @@
 
   junit
   junit
-  3.8.2
+  4.12
   test
 
   
@@ -113,6 +119,7 @@
   
 org.apache.maven.plugins
 maven-surefire-plugin
+2.18.1
 
   
 

Added: 
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java?rev=1717974=auto
==
--- 
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
 (added)
+++ 
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
 Fri Dec  4 14:48:05 2015
@@ -0,0 +1,171 @@
+package org.apache.maven.shared.dependency.analyzer.asm;
+
+/*
+ * 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 distrib

svn commit: r1715100 - /maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:19:36 2015
New Revision: 1715100

URL: http://svn.apache.org/viewvc?rev=1715100=rev
Log:
Fixed file handle leak in testcase

Modified:

maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java

Modified: 
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java?rev=1715100=1715099=1715100=diff
==
--- 
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
 (original)
+++ 
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraUnicodeTestCase.java
 Thu Nov 19 06:19:36 2015
@@ -48,7 +48,13 @@ public class JiraUnicodeTestCase
 
 JiraMojo mojo = (JiraMojo) lookupMojo( "jira-report", pom );
 InputStream testJiraXmlStream = 
JiraUnicodeTestCase.class.getResourceAsStream( "unicode-jira-results.xml" );
-String jiraXml = IOUtils.toString( testJiraXmlStream, "utf-8" );
+String jiraXml = null;
+try {
+jiraXml = IOUtils.toString(testJiraXmlStream, "utf-8");
+} finally {
+testJiraXmlStream.close();
+}
+
 MockJiraDownloader mockDownloader = new MockJiraDownloader();
 mockDownloader.setJiraXml( jiraXml );
 mojo.setMockDownloader( mockDownloader );

svn commit: r1715099 - /maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:19:18 2015
New Revision: 1715099

URL: http://svn.apache.org/viewvc?rev=1715099=rev
Log:
Removed file handle leak in testcase

Modified:

maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java

Modified: 
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java?rev=1715099=1715098=1715099=diff
==
--- 
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java
 Thu Nov 19 06:19:18 2015
@@ -125,8 +125,12 @@ public class AntMojoTest
 new File( antBasedir, "target/" + 
currentProject.getBuild().getFinalName() + ".jar" ).exists() );
 
 Properties properties = new Properties();
-properties.load(
-new FileInputStream( new File( antBasedir, 
AntBuildWriter.DEFAULT_MAVEN_PROPERTIES_FILENAME ) ) );
+final FileInputStream inStream = new FileInputStream(new 
File(antBasedir, AntBuildWriter.DEFAULT_MAVEN_PROPERTIES_FILENAME));
+try {
+properties.load(inStream);
+} finally {
+inStream.close();
+}
 String repo = properties.getProperty( "maven.repo.local" );
 assertTrue( repo.equals( new File( getBasedir(), 
"target/local-repo" ).getAbsolutePath() ) );
 }

svn commit: r1715108 - in /maven/plugins/trunk: maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/ maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:50:15 2015
New Revision: 1715108

URL: http://svn.apache.org/viewvc?rev=1715108=rev
Log:
Close streams even in test cases

Modified:

maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java

maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java

maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project003Stub.java

maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project005Stub.java

maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project007Stub.java

maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project009Stub.java

maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project010Stub.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java?rev=1715108=1715107=1715108=diff
==
--- 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/stubs/SiteMavenProjectStub.java
 Thu Nov 19 06:50:15 2015
@@ -27,7 +27,9 @@ import org.apache.maven.model.Model;
 import org.apache.maven.model.Site;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 /**
  * @author mailto:vincent.sive...@gmail.com;>Vincent Siveton
@@ -48,18 +50,24 @@ public class SiteMavenProjectStub
 MavenXpp3Reader pomReader = new MavenXpp3Reader();
 Model model;
 
+XmlStreamReader reader = null;
 try
 {
 File pomFile =
 new File( getBasedir(), pomFilePath == null ? 
"/src/test/resources/unit/interpolated-site/pom.xml"
 : pomFilePath );
-model = pomReader.read( ReaderFactory.newXmlReader( pomFile ) );
+reader = ReaderFactory.newXmlReader( pomFile );
+model = pomReader.read( reader );
 setModel( model );
 }
 catch ( Exception e )
 {
 throw new RuntimeException( e );
 }
+finally
+{
+IOUtil.close( reader);
+}
 Site site = new Site();
 site.setId( "localhost" );
 distributionManagement.setSite( site );

Modified: 
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java?rev=1715108=1715107=1715108=diff
==
--- 
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
 (original)
+++ 
maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugins/source/stubs/Project001Stub.java
 Thu Nov 19 06:50:15 2015
@@ -1,12 +1,18 @@
 package org.apache.maven.plugins.source.stubs;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,9 +33,6 @@ import org.apache.maven.model.io.xpp3.Ma
  * under the License.
  */
 
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.util.ReaderFactory;
-
 /**
  * @author mailto:och...@exist.com;>Maria Odea Ching
  */
@@ -44,13 +47,11 @@ public class Project001Stub
 
 public Project001Stub()
 {
-MavenXpp3Reader pomReader = new MavenXpp3Reader();
 Model model;
 
 try
 {
-model = pomReader.read(
-ReaderFactory.newXmlReader( new File( getBasedir(), 
"target/test-c

svn commit: r1715109 - in /maven/plugins/trunk/maven-pmd-plugin/src: main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMa

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:50:28 2015
New Revision: 1715109

URL: http://svn.apache.org/viewvc?rev=1715109=rev
Log:
Fixed file handle leak

Modified:

maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java

maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java?rev=1715109=1715108=1715109=diff
==
--- 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
 Thu Nov 19 06:50:28 2015
@@ -19,19 +19,6 @@ package org.apache.maven.plugin.pmd;
  * under the License.
  */
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.pmd.model.PmdErrorDetail;
@@ -46,6 +33,19 @@ import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+
 /**
  * Fail the build if there were any PMD violations in the source code.
  *
@@ -112,8 +112,11 @@ public class PmdViolationCheckMojo
 for ( final Entry<Object, Object> propEntry : props.entrySet() )
 {
 final Set excludedRuleSet = new HashSet();
-final String className = propEntry.getKey().toString();
-final String[] excludedRules = 
propEntry.getValue().toString().split( "," );
+final String className = propEntry.getKey()
+  .toString();
+final String[] excludedRules = propEntry.getValue()
+.toString()
+.split( "," );
 for ( final String excludedRule : excludedRules )
 {
 excludedRuleSet.add( excludedRule.trim() );
@@ -141,7 +144,8 @@ public class PmdViolationCheckMojo
 {
 final String fileName = errorDetail.getFileName();
 final int javaIdx = fileName.indexOf( "\\java\\" );
-return fileName.substring( javaIdx >= 0 ? javaIdx + 6 : 0, 
fileName.length() - 5 ).replace( '\\', '.' );
+return fileName.substring( javaIdx >= 0 ? javaIdx + 6 : 0, 
fileName.length() - 5 )
+   .replace( '\\', '.' );
 }
 }
 
@@ -152,7 +156,9 @@ public class PmdViolationCheckMojo
 {
 
 StringBuilder buff = new StringBuilder( 100 );
-buff.append( "PMD " ).append( severity ).append( ": " );
+buff.append( "PMD " )
+.append( severity )
+.append( ": " );
 if ( item.getViolationClass() != null )
 {
 if ( item.getViolationPackage() != null )
@@ -168,32 +174,45 @@ public class PmdViolationCheckMojo
 }
 buff.append( ":" );
 buff.append( item.getBeginline() );
-buff.append( " Rule:" ).append( item.getRule() );
-buff.append( " Priority:" ).append( item.getPriority() );
-buff.append( " " ).append( item.getText() ).append( "." );
+buff.append( " Rule:" )
+.append( item.getRule() );
+buff.append( " Priority:" )
+.append( item.getPriority() );
+buff.append( " " )
+.append( item.getText() )
+.append( "." );
 
-this.getLog().info( buff.toString() );
+this.getLog()
+.info( buff.toString() );
 }
 
 @Override
 protected List getErrorDetails( File pmdFile )
 throws XmlPullParserException, IOException
 {
-PmdXpp3Reader reader = new PmdXpp3Reader();
-PmdErrorDetail details = reader.read( n

svn commit: r1715103 - /maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:28:45 2015
New Revision: 1715103

URL: http://svn.apache.org/viewvc?rev=1715103=rev
Log:
Fixed file handle leak in testcase

Modified:

maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java

Modified: 
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java?rev=1715103=1715102=1715103=diff
==
--- 
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java
 Thu Nov 19 06:28:45 2015
@@ -43,10 +43,15 @@ public class DefaultMavenProjectStub
 
 try
 {
-model =
-pomReader.read( new FileReader( new File( getBasedir()
-+ 
"/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml"
 ) ) );
-setModel( model );
+final FileReader reader = new FileReader(new File(getBasedir()
++ 
"/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml"));
+try {
+model =
+pomReader.read(reader);
+} finally {
+reader.close();
+}
+setModel(model);
 }
 catch ( Exception e )
 {

svn commit: r1715101 - /maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:24:40 2015
New Revision: 1715101

URL: http://svn.apache.org/viewvc?rev=1715101=rev
Log:
Fixed file handle leak

Modified:

maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java

Modified: 
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java?rev=1715101=1715100=1715101=diff
==
--- 
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-repository-plugin/src/main/java/org/apache/maven/plugins/repository/BundlePackMojo.java
 Thu Nov 19 06:24:40 2015
@@ -40,8 +40,10 @@ import org.codehaus.plexus.archiver.Arch
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.components.interactivity.InputHandler;
+import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.WriterFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
@@ -218,18 +220,20 @@ public class BundlePackMojo
 licenses.add( license );
 rewrite = true;
 }
-
+
 if ( disableMaterialization )
 {
 getLog().warn( "Validations to confirm support for project 
materialization have been DISABLED."
-   + "\n\nYour project may not provide the POM elements 
necessary to allow users to retrieve "
-   + "sources on-demand,"
-   + "\nor to easily checkout your project in an IDE. THIS 
CAN SERIOUSLY INCONVENIENCE YOUR USERS."
-   + "\n\nContinue? [y/N]" );
-
+   + "\n\nYour project may not provide the POM 
elements necessary to allow "
+   + "users to retrieve sources on-demand,"
+   + "\nor to easily checkout your project in 
an IDE. "
+   + "THIS CAN SERIOUSLY INCONVENIENCE YOUR 
USERS.\n\nContinue? [y/N]" );
+
 try
 {
-if ( 'y' != inputHandler.readLine().toLowerCase().charAt( 
0 ) )
+if ( 'y' != inputHandler.readLine()
+.toLowerCase()
+.charAt( 0 ) )
 {
 disableMaterialization = false;
 }
@@ -238,9 +242,9 @@ public class BundlePackMojo
 {
 getLog().debug( "Error reading confirmation: " + 
e.getMessage(), e );
 }
-
+
 }
-
+
 if ( !disableMaterialization )
 {
 Scm scm = model.getScm();
@@ -249,7 +253,7 @@ public class BundlePackMojo
 scm = new Scm();
 model.setScm( scm );
 }
-
+
 if ( scm.getUrl() == null )
 {
 if ( scmUrl != null )
@@ -263,7 +267,7 @@ public class BundlePackMojo
 rewrite = true;
 }
 }
-
+
 if ( scm.getConnection() == null )
 {
 if ( scmConnection != null )
@@ -295,13 +299,14 @@ public class BundlePackMojo
 
 if ( model.getBuild() != null )
 {
-finalName = model.getBuild().getFinalName();
+finalName = model.getBuild()
+ .getFinalName();
 }
 if ( finalName == null )
 {
 finalName = model.getArtifactId() + "-" + model.getVersion();
 }
-
+
 boolean batchMode = settings == null ? false : 
!settings.isInteractiveMode();
 List files = BundleUtils.selectProjectFiles( dir, 
inputHandler, finalName, pom, getLog(), batchMode );
 
@@ -312,21 +317,23 @@ public class BundlePackMojo
 boolean artifactChecks = !"pom".equals( model.getPackaging() );
 boolean sourcesFound = false;
 boolean javadocsFound = false;
-
+
 for ( File f : files )
 {
-if ( artifactChecks && f.getName().endsWith( finalName + 
"-sources.jar&q

svn commit: r1715106 - /maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:49:39 2015
New Revision: 1715106

URL: http://svn.apache.org/viewvc?rev=1715106=rev
Log:
Fixed file handle leak in testcase

Modified:

maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java

Modified: 
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java?rev=1715106=1715105=1715106=diff
==
--- 
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
 (original)
+++ 
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
 Thu Nov 19 06:49:39 2015
@@ -39,10 +39,10 @@ public class ResourcesMojoTest
 extends AbstractMojoTestCase
 {
 protected final static String defaultPomFilePath = 
"/target/test-classes/unit/resources-test/plugin-config.xml";
-
+
 /**
  * test mojo lookup, test harness should be working fine
- * 
+ *
  * @throws Exception
  */
 public void testHarnessEnvironment()
@@ -53,7 +53,7 @@ public class ResourcesMojoTest
 
 assertNotNull( mojo );
 }
-
+
 /**
  * @throws Exception
  */
@@ -63,7 +63,8 @@ public class ResourcesMojoTest
 File testPom = new File( getBasedir(), defaultPomFilePath );
 ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom 
);
 MavenProjectResourcesStub project = new MavenProjectResourcesStub( 
"resourceDirectoryStructure" );
-List resources = project.getBuild().getResources();
+List resources = project.getBuild()
+.getResources();
 
 assertNotNull( mojo );
 
@@ -76,7 +77,8 @@ public class ResourcesMojoTest
 
 setVariableValueToObject( mojo, "project", project );
 setVariableValueToObject( mojo, "resources", resources );
-setVariableValueToObject( mojo, "outputDirectory", new File( 
project.getBuild().getOutputDirectory() ) );
+setVariableValueToObject( mojo, "outputDirectory", new File( 
project.getBuild()
+
.getOutputDirectory() ) );
 setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
 setVariableValueToObject( mojo, "useBuildFilters", Boolean.TRUE );
 mojo.execute();
@@ -99,7 +101,8 @@ public class ResourcesMojoTest
 File testPom = new File( getBasedir(), defaultPomFilePath );
 ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom 
);
 MavenProjectResourcesStub project = new MavenProjectResourcesStub( 
"resourceDirectoryStructure_RelativePath" );
-List resources = project.getBuild().getResources();
+List resources = project.getBuild()
+.getResources();
 
 assertNotNull( mojo );
 
@@ -111,7 +114,8 @@ public class ResourcesMojoTest
 project.addFile( "notpackage/test/file2.txt" );
 project.setupBuildEnvironment();
 
-setVariableValueToObject( mojo, "outputDirectory", new File( 
project.getBuild().getOutputDirectory() ) );
+setVariableValueToObject( mojo, "outputDirectory", new File( 
project.getBuild()
+
.getOutputDirectory() ) );
 setVariableValueToObject( mojo, "project", project );
 setVariableValueToObject( mojo, "resources", resources );
 setVariableValueToObject( mojo, "buildFilters", new LinkedList() );
@@ -136,7 +140,8 @@ public class ResourcesMojoTest
 File testPom = new File( getBasedir(), defaultPomFilePath );
 ResourcesMojo mojo = (ResourcesMojo) lookupMojo( "resources", testPom 
);
 MavenProjectResourcesStub project = new MavenProjectResourcesStub( 
"encoding" );
-List resources = project.getBuild().getResources();
+List resources = project.getBuild()
+.getResources();
 
 assertNotNull( mojo );
 
@@ -147,7 +152,8 @@ public class ResourcesMojoTest
 setVariableValueToObject( mojo, "encoding", "UTF-8" );
 setVariableValueToObject( mojo, "project", project );
 setVariableValueToObject( mojo, "resources", resources );
-setVariableValueToObject( mojo, "outputDirectory", new File( 
project.getBuild().getOutputDirectory() ) );
+setVariableValueToObject( mojo, "outputDirectory", n

svn commit: r1715107 - in /maven/plugins/trunk/maven-doap-plugin/src: main/java/org/apache/maven/plugin/doap/DoapMojo.java test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:49:59 2015
New Revision: 1715107

URL: http://svn.apache.org/viewvc?rev=1715107=rev
Log:
Added closing of writer, even upon exception

Modified:

maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java

maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?rev=1715107=1715106=1715107=diff
==
--- 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
 Thu Nov 19 06:49:59 2015
@@ -540,6 +540,69 @@ public class DoapMojo
 throw new MojoExecutionException( "Error creating DOAP file " + 
outputFile.getAbsolutePath(), e );
 }
 
+try
+{
+doWrite( project, outputFile, w );
+}
+finally
+{
+
+try
+{
+w.close();
+}
+catch ( IOException e )
+{
+throw new MojoExecutionException( "Error when closing the 
writer.", e );
+}
+}
+
+if ( !messages.getWarnMessages().isEmpty() )
+{
+for ( String warn : messages.getWarnMessages() )
+{
+getLog().warn( warn );
+}
+}
+
+if ( !messages.getErrorMessages().isEmpty() )
+{
+getLog().error( "" );
+for ( String error : messages.getErrorMessages() )
+{
+getLog().error( error );
+}
+getLog().error( "" );
+
+if ( ASFExtOptionsUtil.isASFProject( project ) )
+{
+getLog().error( "For more information about the errors and 
possible solutions, "
++ "please read the plugin documentation:" 
);
+getLog().error( 
"http://maven.apache.org/plugins/maven-doap-plugin/usage.html#DOAP_ASF_Configuration;
 );
+throw new MojoExecutionException( "The generated DOAP doesn't 
respect ASF rules, see above." );
+}
+}
+
+if ( validate )
+{
+List errors = DoapUtil.validate( outputFile );
+if ( !errors.isEmpty() )
+{
+getLog().error( "" );
+for ( String error : errors )
+{
+getLog().error( error );
+}
+getLog().error( "" );
+
+throw new MojoExecutionException( "Error parsing the generated 
DOAP file, see above." );
+}
+}
+}
+
+private void doWrite( MavenProject project, File outputFile, Writer w )
+throws MojoExecutionException
+{
 if ( asfExtOptions.isIncluded() )
 {
 getLog().info( "Generating an ASF DOAP file " + 
outputFile.getAbsolutePath() );
@@ -753,57 +816,6 @@ public class DoapMojo
 writeOrganizations( writer );
 
 writer.endElement(); // rdf:RDF
-
-try
-{
-w.close();
-}
-catch ( IOException e )
-{
-throw new MojoExecutionException( "Error when closing the 
writer.", e );
-}
-
-if ( !messages.getWarnMessages().isEmpty() )
-{
-for ( String warn : messages.getWarnMessages() )
-{
-getLog().warn( warn );
-}
-}
-
-if ( !messages.getErrorMessages().isEmpty() )
-{
-getLog().error( "" );
-for ( String error : messages.getErrorMessages() )
-{
-getLog().error( error );
-}
-getLog().error( "" );
-
-if ( ASFExtOptionsUtil.isASFProject( project ) )
-{
-getLog().error( "For more information about the errors and 
possible solutions, "
-+ "please read the plugin documentation:" 
);
-getLog().error( 
"http://maven.apache.org/plugins/maven-doap-plugin/usage.html#DOAP_ASF_Configuration;
 );
-throw new MojoExecutionException( "The generated DOAP doesn't 
respect ASF rules, see above." );
-}
-}
-
-if ( validate )
-{
-List errors = DoapUtil.validate( outputFile );
-if ( !errors.isEmpty() )
-{
-getL

svn commit: r1715111 - /maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:58:11 2015
New Revision: 1715111

URL: http://svn.apache.org/viewvc?rev=1715111=rev
Log:
Close streams even in test cases

Modified:

maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java?rev=1715111=1715110=1715111=diff
==
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
 Thu Nov 19 06:58:11 2015
@@ -38,7 +38,9 @@ import org.apache.maven.model.Model;
 import org.apache.maven.model.PluginManagement;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.apache.maven.shared.utils.io.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 /**
  * @author Edwin Punzalan
@@ -59,15 +61,21 @@ public abstract class ProjectInfoProject
 public ProjectInfoProjectStub()
 {
 MavenXpp3Reader pomReader = new MavenXpp3Reader();
+XmlStreamReader reader = null;
 try
 {
-model = pomReader.read( ReaderFactory.newXmlReader( new File( 
getBasedir(), getPOM() ) ) );
+reader = ReaderFactory.newXmlReader( new File( getBasedir(), 
getPOM() ) );
+model = pomReader.read( reader );
 setModel( model );
 }
 catch ( Exception e )
 {
 throw new RuntimeException( e );
 }
+finally
+{
+IOUtil.close( reader );
+}
 
 setGroupId( model.getGroupId() );
 setArtifactId( model.getArtifactId() );
@@ -76,8 +84,7 @@ public abstract class ProjectInfoProject
 setUrl( model.getUrl() );
 setPackaging( model.getPackaging() );
 
-Artifact artifact = new ProjectInfoPluginArtifactStub( getGroupId(), 
getArtifactId(), getVersion(),
-   getPackaging() 
);
+Artifact artifact = new ProjectInfoPluginArtifactStub( getGroupId(), 
getArtifactId(), getVersion(), getPackaging() );
 artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
 setArtifact( artifact );
 
@@ -85,11 +92,9 @@ public abstract class ProjectInfoProject
 build.setFinalName( model.getArtifactId() );
 build.setDirectory( super.getBasedir() + "/target/test/unit/" + 
model.getArtifactId() + "/target" );
 build.setSourceDirectory( getBasedir() + "/src/main/java" );
-build.setOutputDirectory( super.getBasedir() + "/target/test/unit/" + 
model.getArtifactId()
-  + "/target/classes" );
+build.setOutputDirectory( super.getBasedir() + "/target/test/unit/" + 
model.getArtifactId() + "/target/classes" );
 build.setTestSourceDirectory( getBasedir() + "/src/test/java" );
-build.setTestOutputDirectory( super.getBasedir() + 
"/target/test/unit/" + model.getArtifactId()
-+ "/target/test-classes" );
+build.setTestOutputDirectory( super.getBasedir() + 
"/target/test/unit/" + model.getArtifactId() + "/target/test-classes" );
 setBuild( build );
 
 List compileSourceRoots = new ArrayList();

svn commit: r1715113 - /maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 07:02:11 2015
New Revision: 1715113

URL: http://svn.apache.org/viewvc?rev=1715113=rev
Log:
Fixed testcase file handle leak

Modified:

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java?rev=1715113=1715112=1715113=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java
 Thu Nov 19 07:02:11 2015
@@ -60,11 +60,13 @@ public class ComponentsXmlResourceTransf
 transformer.processResource( "components-1.xml", resourceAsStream1,
  Collections. emptyList() );
 resourceAsStream1.close();
+final InputStream resourceAsStream2 = getClass().getResourceAsStream( 
"/components-expected.xml" );
 Diff diff = XMLUnit.compareXML(
-IOUtil.toString( getClass().getResourceAsStream( 
"/components-expected.xml" ), "UTF-8" ),
+IOUtil.toString( resourceAsStream2, "UTF-8" ),
 IOUtil.toString( transformer.getTransformedResource(), "UTF-8" ) );
 //assertEquals( IOUtil.toString( getClass().getResourceAsStream( 
"/components-expected.xml" ), "UTF-8" ),
 //  IOUtil.toString( transformer.getTransformedResource(), 
"UTF-8" ).replaceAll("\r\n", "\n") );
+resourceAsStream2.close();
 XMLAssert.assertXMLIdentical( diff, true );
 }
 }
\ No newline at end of file

svn commit: r1715110 - /maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 19 06:53:38 2015
New Revision: 1715110

URL: http://svn.apache.org/viewvc?rev=1715110=rev
Log:
Fixed file handle leak

Modified:

maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java

Modified: 
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java?rev=1715110=1715109=1715110=diff
==
--- 
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/BundleRemoteResourcesMojo.java
 Thu Nov 19 06:53:38 2015
@@ -27,6 +27,7 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.plugins.annotations.Parameter;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -138,13 +139,15 @@ public class BundleRemoteResourcesMojo
 
 RemoteResourcesBundleXpp3Writer w = new 
RemoteResourcesBundleXpp3Writer();
 
+Writer writer = null;
 try
 {
 File f = new File( outputDirectory, RESOURCES_MANIFEST );
 
-FileUtils.mkdir( f.getParentFile().getAbsolutePath() );
+FileUtils.mkdir( f.getParentFile()
+  .getAbsolutePath() );
 
-Writer writer = new FileWriter( f );
+writer = new FileWriter( f );
 
 w.write( writer, remoteResourcesBundle );
 }
@@ -152,5 +155,9 @@ public class BundleRemoteResourcesMojo
 {
 throw new MojoExecutionException( "Error creating remote resources 
manifest.", e );
 }
+finally
+{
+IOUtil.close( writer );
+}
 }
 }

svn commit: r1714643 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/ main/java/org/apache/maven/plugins/shade/resource/ test/java/org/apache/maven/plugins/s

[krosenvold]

Author: krosenvold
Date: Mon Nov 16 17:52:52 2015
New Revision: 1714643

URL: http://svn.apache.org/viewvc?rev=1714643=rev
Log:
[MSHADE-213] Clarified the contract of the ResourceTransformer wrt closing of 
stream

Modified:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ResourceTransformer.java

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerParameterTests.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformerTest.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1714643=1714642=1714643=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 Mon Nov 16 17:52:52 2015
@@ -88,9 +88,7 @@ public class DefaultShader
 RelocatorRemapper remapper = new RelocatorRemapper( 
shadeRequest.getRelocators() );
 
 // noinspection ResultOfMethodCallIgnored
-shadeRequest.getUberJar()
-.getParentFile()
-.mkdirs();
+shadeRequest.getUberJar().getParentFile().mkdirs();
 FileOutputStream fileOutputStream = new FileOutputStream( 
shadeRequest.getUberJar() );
 JarOutputStream jos = new JarOutputStream( new BufferedOutputStream( 
fileOutputStream ) );
 
@@ -121,8 +119,7 @@ public class DefaultShader
 // Log a summary of duplicates
 logSummaryOfDuplicates( overlapping );
 
-if ( overlapping.keySet()
-.size() > 0 )
+if ( overlapping.keySet().size() > 0 )
 {
 showOverlappingWarning();
 }
@@ -269,8 +266,15 @@ public class DefaultShader
 if ( manifestTransformer.canTransformResource( resource ) )
 {
 resources.add( resource );
-manifestTransformer.processResource( resource, 
jarFile.getInputStream( entry ),
- 
shadeRequest.getRelocators() );
+InputStream inputStream = jarFile.getInputStream( 
entry );
+try
+{
+manifestTransformer.processResource( resource, 
inputStream, shadeRequest.getRelocators() );
+}
+finally
+{
+inputStream.close();
+}
 break;
 }
 }
@@ -308,13 +312,12 @@ public class DefaultShader
 
 for ( String clazz : overlapping.get( jarz ) )
 {
-classes.add( clazz.replace( ".class", "" )
-  .replace( "/", "." ) );
+classes.add( clazz.replace( ".class", "" ).replace( "/", "." ) 
);
 }
 
 //CHECKSTYLE_OFF: LineLength
-getLogger().warn( Joiner.on( ", " )
-.join( jarzS ) + " define " + 
classes.size() + " overlapping classes: " );
+getLogger().warn(
+Joiner.on( ", " ).join( jarzS ) + " define " + classes.size() 
+ " overlapping classes: " );
 //CHECKSTYLE_ON: LineLength
 
 int max = 10;
@@ -480,8 +483,7 @@ public class DefaultShader
 {
 if ( transformer.canTransformResource( name ) )
 {
-getLogger().debug( "Transforming " + name + " using " + 
transformer.getClass()
-   
.getName() );
+getLogger().debug(

svn commit: r1714646 - in /maven/plugins/trunk/maven-shade-plugin/src: main/java/org/apache/maven/plugins/shade/DefaultShader.java test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTran

[krosenvold]

Author: krosenvold
Date: Mon Nov 16 18:06:35 2015
New Revision: 1714646

URL: http://svn.apache.org/viewvc?rev=1714646=rev
Log:
[MSHADE-171] Yet more resources needing close

Modified:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1714646=1714645=1714646=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 Mon Nov 16 18:06:35 2015
@@ -259,25 +259,33 @@ public class DefaultShader
 for ( File jar : shadeRequest.getJars() )
 {
 JarFile jarFile = newJarFile( jar );
-for ( Enumeration en = jarFile.entries(); 
en.hasMoreElements(); )
+try
 {
-JarEntry entry = en.nextElement();
-String resource = entry.getName();
-if ( manifestTransformer.canTransformResource( resource ) )
+for ( Enumeration en = jarFile.entries(); 
en.hasMoreElements(); )
 {
-resources.add( resource );
-InputStream inputStream = jarFile.getInputStream( 
entry );
-try
+JarEntry entry = en.nextElement();
+String resource = entry.getName();
+if ( manifestTransformer.canTransformResource( 
resource ) )
 {
-manifestTransformer.processResource( resource, 
inputStream, shadeRequest.getRelocators() );
+resources.add( resource );
+InputStream inputStream = jarFile.getInputStream( 
entry );
+try
+{
+manifestTransformer.processResource( resource, 
inputStream,
+ 
shadeRequest.getRelocators() );
+}
+finally
+{
+inputStream.close();
+}
+break;
 }
-finally
-{
-inputStream.close();
-}
-break;
 }
 }
+finally
+{
+jarFile.close();
+}
 }
 if ( manifestTransformer.hasTransformedResource() )
 {

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java?rev=1714646=1714645=1714646=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
 Mon Nov 16 18:06:35 2015
@@ -75,6 +75,7 @@ public class ServiceResourceTransformerT
 assertEquals("borg.foo.Service\n", xformedContent);
 } finally {
 IOUtils.closeQuietly( entryStream );
+jarFile.close();
 }
 } finally {
 if (jos != null)
@@ -139,6 +140,7 @@ public class ServiceResourceTransformerT
 assertTrue( h1 && h2 );
 } finally {
 IOUtils.closeQuietly( entryStream );
+jarFile.close();
 }
 } finally {
 if (jos != null)

svn commit: r1714645 - /maven/plugins/trunk/maven-shade-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Mon Nov 16 17:59:30 2015
New Revision: 1714645

URL: http://svn.apache.org/viewvc?rev=1714645=rev
Log:
[MSHADE-214] Updated jdependency

Modified:
maven/plugins/trunk/maven-shade-plugin/pom.xml

Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom.xml?rev=1714645=1714644=1714645=diff
==
--- maven/plugins/trunk/maven-shade-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-shade-plugin/pom.xml Mon Nov 16 17:59:30 2015
@@ -145,7 +145,7 @@
 
   org.vafer
   jdependency
-  1.0
+  1.1
   
  
   commons-io

svn commit: r1713986 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

[krosenvold]

Author: krosenvold
Date: Thu Nov 12 09:24:06 2015
New Revision: 1713986

URL: http://svn.apache.org/viewvc?rev=1713986=rev
Log:
Fixed shoddy handling of closing streams upon errors, might be cause of 
MSHADE-171

Modified:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1713986=1713985=1713986=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 Thu Nov 12 09:24:06 2015
@@ -19,6 +19,23 @@ package org.apache.maven.plugins.shade;
  * under the License.
  */
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.shade.filter.Filter;
+import org.apache.maven.plugins.shade.relocation.Relocator;
+import org.apache.maven.plugins.shade.resource.ManifestResourceTransformer;
+import org.apache.maven.plugins.shade.resource.ResourceTransformer;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.IOUtil;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.commons.Remapper;
+import org.objectweb.asm.commons.RemappingClassAdapter;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -41,24 +58,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.ZipException;
 
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.shade.filter.Filter;
-import org.apache.maven.plugins.shade.relocation.Relocator;
-import org.apache.maven.plugins.shade.resource.ManifestResourceTransformer;
-import org.apache.maven.plugins.shade.resource.ResourceTransformer;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.commons.RemappingClassAdapter;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 /**
  * @author Jason van Zyl
  */
@@ -89,16 +88,69 @@ public class DefaultShader
 RelocatorRemapper remapper = new RelocatorRemapper( 
shadeRequest.getRelocators() );
 
 // noinspection ResultOfMethodCallIgnored
-shadeRequest.getUberJar().getParentFile().mkdirs();
+shadeRequest.getUberJar()
+.getParentFile()
+.mkdirs();
 FileOutputStream fileOutputStream = new FileOutputStream( 
shadeRequest.getUberJar() );
 JarOutputStream jos = new JarOutputStream( new BufferedOutputStream( 
fileOutputStream ) );
 
-goThroughAllJarEntriesForManifestTransformer( shadeRequest, resources, 
manifestTransformer, jos );
+try
+{
+
+goThroughAllJarEntriesForManifestTransformer( shadeRequest, 
resources, manifestTransformer, jos );
+
+// CHECKSTYLE_OFF: MagicNumber
+Multimap<String, File> duplicates = HashMultimap.create( 1, 3 
);
+// CHECKSTYLE_ON: MagicNumber
+
+shadeJars( shadeRequest, resources, transformers, remapper, jos, 
duplicates );
+
+// CHECKSTYLE_OFF: MagicNumber
+Multimap<Collection, String> overlapping = 
HashMultimap.create( 20, 15 );
+// CHECKSTYLE_ON: MagicNumber
+
+for ( String clazz : duplicates.keySet() )
+{
+Collection jarz = duplicates.get( clazz );
+if ( jarz.size() > 1 )
+{
+overlapping.put( jarz, clazz );
+}
+}
+
+// Log a summary of duplicates
+logSummaryOfDuplicates( overlapping );
+
+if ( overlapping.keySet()
+.size() > 0 )
+{
+showOverlappingWarning();
+}
 
-// CHECKSTYLE_OFF: MagicNumber
-Multimap<String, File> duplicates = HashMultimap.create( 1, 3 );
-// CHECKSTYLE_ON: MagicNumber
+for ( ResourceTransformer tr

svn commit: r1714158 - in /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade: DefaultShader.java resource/ApacheNoticeResourceTransformer.java

[krosenvold]

Author: krosenvold
Date: Fri Nov 13 07:39:28 2015
New Revision: 1714158

URL: http://svn.apache.org/viewvc?rev=1714158=rev
Log:
Fixed a few findbugs warnings

Modified:

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java

maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1714158=1714157=1714158=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
 Fri Nov 13 07:39:28 2015
@@ -523,7 +523,7 @@ public class DefaultShader
 resources.add( name );
 }
 
-class RelocatorRemapper
+static class RelocatorRemapper
 extends Remapper
 {
 

Modified: 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java?rev=1714158=1714157=1714158=diff
==
--- 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
 (original)
+++ 
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
 Fri Nov 13 07:39:28 2015
@@ -82,12 +82,8 @@ public class ApacheNoticeResourceTransfo
 
 public boolean canTransformResource( String resource )
 {
-if ( NOTICE_PATH.equalsIgnoreCase( resource ) || 
NOTICE_TXT_PATH.equalsIgnoreCase( resource ) )
-{
-return true;
-}
+return NOTICE_PATH.equalsIgnoreCase( resource ) || 
NOTICE_TXT_PATH.equalsIgnoreCase( resource );
 
-return false;
 }
 
 public void processResource( String resource, InputStream is, 
List relocators )

maven-surefire git commit: Added close in finally-blocks to avoid resource leakage on non-forced kills

[krosenvold]

Repository: maven-surefire
Updated Branches:
  refs/heads/master d4135dd77 -> bb99b232d


Added close in finally-blocks to avoid resource leakage on non-forced kills


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

Branch: refs/heads/master
Commit: bb99b232da0e93f2772be6945a410ea9ba666c4f
Parents: d4135dd
Author: Kristian Rosenvold 
Authored: Sun Oct 25 11:47:41 2015 +0100
Committer: Kristian Rosenvold 
Committed: Sun Oct 25 11:47:41 2015 +0100

--
 .../booterclient/ForkConfiguration.java |  60 ++-
 .../plugin/surefire/report/FileReporter.java|  29 +++---
 .../runorder/RunEntryStatisticsMap.java |  16 ++-
 .../report/LegacyPojoStackTraceWriter.java  |  13 ++-
 .../apache/maven/surefire/suite/RunResult.java  |  23 +++--
 .../surefire/report/PojoStackTraceWriter.java   |  10 +-
 .../maven/surefire/junit/JUnit3Provider.java|  36 ---
 .../maven/surefire/junit4/JUnit4Provider.java   | 102 ++-
 .../surefire/junitcore/JUnitCoreProvider.java   |  21 ++--
 .../maven/surefire/junitcore/pc/Scheduler.java  |  10 +-
 .../junitcore/pc/SchedulingStrategy.java|  10 +-
 .../surefire/junitcore/JUnitCoreTester.java |  41 
 .../maven/surefire/testng/TestNGProvider.java   |  83 ---
 13 files changed, 269 insertions(+), 185 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bb99b232/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
--
diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
index e5c8a42..1477e87 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
@@ -19,6 +19,16 @@ package org.apache.maven.plugin.surefire.booterclient;
  * under the License.
  */
 
+import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
+import 
org.apache.maven.plugin.surefire.booterclient.lazytestprovider.OutputStreamFlushableCommandline;
+import org.apache.maven.plugin.surefire.util.Relocator;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.surefire.booter.Classpath;
+import org.apache.maven.surefire.booter.ForkedBooter;
+import org.apache.maven.surefire.booter.StartupConfiguration;
+import org.apache.maven.surefire.booter.SurefireBooterForkException;
+import org.apache.maven.surefire.util.UrlUtils;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -30,16 +40,6 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 
-import org.apache.maven.plugin.surefire.AbstractSurefireMojo;
-import 
org.apache.maven.plugin.surefire.booterclient.lazytestprovider.OutputStreamFlushableCommandline;
-import org.apache.maven.plugin.surefire.util.Relocator;
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.surefire.booter.Classpath;
-import org.apache.maven.surefire.booter.ForkedBooter;
-import org.apache.maven.surefire.booter.StartupConfiguration;
-import org.apache.maven.surefire.booter.SurefireBooterForkException;
-import org.apache.maven.surefire.util.UrlUtils;
-
 /**
  * Configuration for forking tests.
  *
@@ -275,27 +275,33 @@ public class ForkConfiguration
 }
 FileOutputStream fos = new FileOutputStream( file );
 JarOutputStream jos = new JarOutputStream( fos );
-jos.setLevel( JarOutputStream.STORED );
-JarEntry je = new JarEntry( "META-INF/MANIFEST.MF" );
-jos.putNextEntry( je );
+try
+{
+jos.setLevel( JarOutputStream.STORED );
+JarEntry je = new JarEntry( "META-INF/MANIFEST.MF" );
+jos.putNextEntry( je );
 
-Manifest man = new Manifest();
+Manifest man = new Manifest();
 
-// we can't use StringUtils.join here since we need to add a '/' to
-// the end of directory entries - otherwise the jvm will ignore them.
-String cp = "";
-for ( String el : classPath )
-{
-// NOTE: if File points to a directory, this entry MUST end in '/'.
-cp += UrlUtils.getURL( new File( el ) ).toExternalForm() + " ";
-}
+// we 

svn commit: r1703970 - /maven/project/KEYS

[krosenvold]

Author: krosenvold
Date: Sat Sep 19 09:57:55 2015
New Revision: 1703970

URL: http://svn.apache.org/viewvc?rev=1703970=rev
Log:
New key, moar bits

Modified:
maven/project/KEYS

Modified: maven/project/KEYS
URL: 
http://svn.apache.org/viewvc/maven/project/KEYS?rev=1703970=1703969=1703970=diff
==
--- maven/project/KEYS (original)
+++ maven/project/KEYS Sat Sep 19 09:57:55 2015
@@ -2644,3 +2644,61 @@ f7GF7eHkLJ9L5R+yHZBH3rNPKiEQJstbmBdlIN0Q
 VgbCdPI=
 =oqu2
 -END PGP PUBLIC KEY BLOCK-
+pub   4096R/56CACE56 2015-07-07
+uid  Kristian Rosenvold (CODE SIGNING KEY) 
<krosenv...@apache.org>
+sub   4096R/F7512FD2 2015-07-07
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQINBFWbdloBEADqUwoIyP0oIU9Wl7AMa+CmCciNFaJ4roUcmBBmpifW9pyj8rjc
+Zo31RrIvqLO2YijkN+lc7zb8GDBKtEr6QW8/IA95T3d5TjzwSAFcX+9b6Fq6yqbJ
+QdIrjPZ5igFzUb1e85s1368gm9r53V4luoluCxcj6yd5Nwek/UgVoLa+sI8bIga1
+jckUE9fpGLrjxpojmigTTkfTcOigo8TbXFpHxUi348Z8z3QN2yf9jezL4S/ixtHN
+O9iYPGn3KzAWLFS4GkP8OzuGMfeBVf5eJLSqLmYZ7970j1GUSLpV5Yw7ChZyK5tW
+OSqQGakiVPNdS31+21zYgG8rj7k6/1FnAsNRW2klhjHLXf19b5xsLD2lz/iTHrR1
+ZbfZicBzl8qjndyUWeB2JPQyeTYvrbzk3dbVodMW/W5OsfXG2F1MIKNM61RQpLWX
+GbnqXjNgWOIw+1S0UvQXXqwIdX0SLhsMnSW2JBUCUJX7VEwodtxDJNDPpgi0y+zO
+kpcb3P3E5mAOWDD9MLCrEwzbJiXJmHolaPunKldjIK8UNh4DGXQer4vGm30UQCaM
+2bSy41+Gm4pwnrDSj+4aUtiETvmAjObUG1tm6s07NZfTo0XAQxei3vY6y0pRts2D
+oJDymxwuQf7GnUZ9f/co4r7+9Y47Vj+/HGiNyPTV5HC0y9TbL2KleBq7kwARAQAB
+tD1LcmlzdGlhbiBSb3NlbnZvbGQgKENPREUgU0lHTklORyBLRVkpIDxrcm9zZW52
+b2xkQGFwYWNoZS5vcmc+iQI3BBMBCgAhBQJVm3ZaAhsDBQsJCAcDBRUKCQgLBRYC
+AwEAAh4BAheAAAoJEO4uvYlWys5WEeIQAJQK2P59xsOO+MyYyoQu5hGZ2J6DQ/ZZ
+8YVnlFD3WfJt8+aD+4el+vnYoBvwdJAiylKG7FGV8zTbqsqSganxBzWlf3TqlK8d
+wTq8fKw+6d9iLgDceAUDxtA65eiVBm0clMQNNnKZ6LzF3aBdgAOXhrRlgJTTjrtp
+08psrB+0Ov1Gqs7VCykSFYxWeVWpHbgYMebdQRzrG9mtJqIC4ZgFqNtfeJMuO7PL
+Yfxp3QNa+mmS0clX+jho9Efj12QtB9B4wNs0JtOxwERt+GKqj1b3mMJsM1wQ/hUg
+WgHwUXkb7Kwmh17iNSEv9Rqx4kwlmdP1LCoaAbFPJevlftFvJobpCTHB20WT9QLH
+Cv5jpIaRDi3s0+PQIYf53MFbjkIdQ5Wf9cyG7S14KGL99npORWmSScTm5P/dE3ST
+FLwEzbu/X6lgbXLLMsJPFX85MIIy9Zh/P9MsuagT7ZHCj3I1l0wnIkVPP89HtiXm
+8HQbLWsS/pOP5fL+eqvm1nueuwyXPLZoo94j534i3vncPxNbohEylK/JK9lIuzWH
+XvbyD64IuA/y9lPf2NAip+L8ckUKZFb+WUihpli0gsYZYCmbP+g0LIb8OyB8V3Ta
+Oz4R1vmn9fMQupFXSOKpSyg/ftFpCCnvJxoIKq35wArRJxi1d5eb9oZqWd7XOBsl
+Nmr6TitqV/ViiF4EEBEKAAYFAlWbeMMACgkQRmyu1uB0fVDxVgD9HfZ2ti0RlTFh
+B7+UlGrF6ILb+bLk4hNkmz/i/0Zpx3UBAKxZzfYtqhI01SfjSU56vIB01FWYGuU5
+AXWykg+7Y1uyuQINBFWbdloBEACzWel/LNymMAOKzIeO55ekHgsHeI/fI0UBxnn2
+Vq/yHbenNZvE/YQa/f6c/A8i0xWYFmxMtQ8tgHe0Q3ZXmhfSyTxQD45tN82KcoRx
+lC5i537fDkgoK6MLPpYaaaP8/DCOkX05YW6zzzjSXZoGKDPdnGaDZCa4gO19YZVA
+egoA5zxiJFfII3o36duzIcbITPkObP9oQq8A5+tUxCHi1QNeI69zVej8ii/T8kB4
+2ZWa+rJfJcfy19GyNsrvjXFJn05L+vbNTXa83auOK142/JNGghIbLk8UQ6tqL1pV
+0lvI2LwXiNQhP67bJ9nN7bOIw13bagFxK24LxzcYg4u/yHy4gEfqMYZKAnsLZKoR
+x/XT7i2e0lthWqifNEDlJMdY+/UmX7PBf4JtUh5VfhRUKeyLj/K/CzQtHbadkUIQ
+JHCdrtU2jU/S13LiELGXCo9ueoqfZojpV/SuAGCCzI38Is8s+Cn1+ArL1ypddVHR
+SACqYfUZrb0kzriwyesb7xGJaPeJcOCi3GuVvXgUg02qV6TMv8yeCqgiPNIufAfD
+hSEPn5RaArdlmnokXO4KSK3gqg/QjZihVFg4ip2N3wbB78WblYZkrhy/BKrNx+EX
+VnS7vSdsDSWYMx9nCokdXcjeidJjiD8IGXSUjSickBlhgoHl3g9lkf0d8QRXWnEG
+30FD2wARAQABiQIfBBgBCgAJBQJVm3ZaAhsMAAoJEO4uvYlWys5Wi3MQAOMzIEn6
+0yu11olARdNDl+7AZ7HxDkwExGAtqhXv0RsJ8Dcg2NctkxfT+syYALiRz1/Mz7GA
+55/TsKaPXCU1lTO+DFwQp8HT7CRcEqsswqQxqassABabRxwKx9YYr9Gjx/a085sW
+7DZ853Smnw5bNR5XXje874S2e+IInGQljnEIH6KD9AWojGwZSJ+3DsRkqvpHEZ0E
+y0Ggfd3sZqencoRh+UgIzLDGTxk5jahm0QViAn/pkiDuKAelpwfbZb1Ynva1HQaD
+U2FMLFp6/EO/y2usyVIPtAafr+BTATgcFADOWqQ/AnPig4njbtNEV5XQRoS4vMwQ
+7lfgmfgoz0slpii5yyHJC2fTJMPL8fqWT664G69cN5olGPi4HkbNnzdQOSzD18H5
+039A+75O4Wg86/SLrGO8N/TIDHBfiBPOWueVKmDVwDrMUp4sZFzWpWIs2HunKXuQ
+1Otyn0EVlCz2aW6ZjjiME9hgMsabkHRFSe8assoeSBRLdA5K89UHEULhAIydcHnE
+7EWyyzk+zyTOWP60OMKgihWR4tO6d3fsBl0uCR31kMWSpmEsM9Ca9al0GcXPJqlb
+hYyLuaqrIDV8CNZe+K6H17TLgo9JDpz+0jEU/2W3lax8gqndgKPAlu3dPU5z70ek
+VyXnSvgpAMnPzbJMUWHOwkbXDpXp9PiXta4z
+=wlrw
+-END PGP PUBLIC KEY BLOCK-

svn commit: r1703454 - in /maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io: DirectoryScannerTest.java FileUtilsTest.java SymlinkTestSetup.java

[krosenvold]

Author: krosenvold
Date: Wed Sep 16 19:41:59 2015
New Revision: 1703454

URL: http://svn.apache.org/r1703454
Log:
Made creation of all symlinks part of the testcase, so we do not rely on 
symlink support in os creating release.

Fixes release problem

Added:

maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/SymlinkTestSetup.java
Modified:

maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java

maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java?rev=1703454=1703453=1703454=diff
==
--- 
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/DirectoryScannerTest.java
 Wed Sep 16 19:41:59 2015
@@ -19,6 +19,7 @@ package org.apache.maven.shared.utils.io
  * under the License.
  */
 
+import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.testhelpers.FileTestHelper;
 import org.junit.Assert;
 import org.junit.Ignore;
@@ -34,6 +35,8 @@ import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 public class DirectoryScannerTest
 {
@@ -120,9 +123,10 @@ public class DirectoryScannerTest
 }
 
 @Test
-public void checkSymlinkBehaviour(){
+public void checkSymlinkBehaviour()
+{
 DirectoryScanner ds = new DirectoryScanner();
-ds.setBasedir( new File("src/test/resources/symlinks/src") );
+ds.setBasedir( new File( "src/test/resources/symlinks/src" ) );
 ds.setFollowSymlinks( false );
 ds.scan();
 String[] includedDirectories = ds.getIncludedDirectories();
@@ -133,12 +137,16 @@ public class DirectoryScannerTest
 }
 
 @Test
-@Ignore("Wait until we can run with assembly 2.5 which will support 
symlinks properly")
 public void followSymlinksFalse()
+throws IOException
 {
-if (!Java7Support.isAtLeastJava7()) return;
+assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+assumeTrue( Java7Support.isAtLeastJava7() );
+
+File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new 
File( "target/test/symlinkTestCase" ) );
+
 DirectoryScanner ds = new DirectoryScanner();
-ds.setBasedir( new File( "src/test/resources/symlinks/src/" ) );
+ds.setBasedir( testDir );
 ds.setFollowSymlinks( false );
 ds.scan();
 List included = Arrays.asList( ds.getIncludedFiles() );
@@ -168,10 +176,15 @@ public class DirectoryScannerTest
 
 @Test
 public void followSymlinks()
+throws IOException
 {
-if (!Java7Support.isAtLeastJava7()) return;
+assumeFalse( Os.isFamily( Os.FAMILY_WINDOWS ) );
+assumeTrue( Java7Support.isAtLeastJava7() );
+
 DirectoryScanner ds = new DirectoryScanner();
-ds.setBasedir( new File( "src/test/resources/symlinks/src/" ) );
+File testDir = SymlinkTestSetup.createStandardSymlinkTestDir( new 
File( "target/test/symlinkTestCase" ) );
+
+ds.setBasedir( testDir );
 ds.setFollowSymlinks( true );
 ds.scan();
 List included = Arrays.asList( ds.getIncludedFiles() );
@@ -189,6 +202,10 @@ public class DirectoryScannerTest
 assertEquals( 5, includedDirs.size() );
 }
 
+/*
+Creates a standard directory layout with symlinks and files.
+ */
+
 @Test
 public void testSimpleExcludes()
 throws Exception
@@ -362,7 +379,8 @@ public class DirectoryScannerTest
 assertEquals( 2, removedFiles.length );
 }
 
-@Ignore( "Enable this test to run performance checks" ) @Test
+@Ignore( "Enable this test to run performance checks" )
+@Test
 public void performanceTest()
 throws Exception
 {

Modified: 
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java?rev=1703454=1703453=1703454=diff
==
--- 
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
 (original)
+++ 
maven/shared/trunk/maven-

svn commit: r1702856 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Mon Sep 14 05:38:16 2015
New Revision: 1702856

URL: http://svn.apache.org/r1702856
Log:
p-c 2.6

Modified:
maven/plugins/trunk/maven-compiler-plugin/pom.xml

Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1702856=1702855=1702856=diff
==
--- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Mon Sep 14 05:38:16 2015
@@ -63,7 +63,7 @@ under the License.
   ! The following property is used in the integration tests MCOMPILER-157
 -->
 3.3
-2.5
+2.6
 1.8.0
 2.7.0-01
 2.0.4-04

svn commit: r1702682 - in /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml: PrettyPrintXMLWriter.java XMLEncode.java

[krosenvold]

Author: krosenvold
Date: Sat Sep 12 21:30:18 2015
New Revision: 1702682

URL: http://svn.apache.org/r1702682
Log:
Improved performance of PrettyPrintXMLWriter by approx 45%. Reduced garbage 
production by 80%

Modified:

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/XMLEncode.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java?rev=1702682=1702681=1702682=diff
==
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/PrettyPrintXMLWriter.java
 Sat Sep 12 21:30:18 2015
@@ -19,11 +19,11 @@ package org.apache.maven.shared.utils.xm
  * under the License.
  */
 
+import org.apache.maven.shared.utils.Os;
+
 import java.io.PrintWriter;
 import java.io.Writer;
-import java.util.LinkedList;
-
-import org.apache.maven.shared.utils.Os;
+import java.util.ArrayList;
 
 /**
  * XMLWriter with nice indentation
@@ -31,9 +31,15 @@ import org.apache.maven.shared.utils.Os;
 public class PrettyPrintXMLWriter
 implements XMLWriter
 {
+private static final char[] CLOSE_1 = "/>".toCharArray();
+
+private static final char[] CLOSE_2 = " elementStack = new LinkedList();
+private ArrayList elementStack = new ArrayList();
 
 private boolean processingElement = false;
 
@@ -43,9 +49,9 @@ public class PrettyPrintXMLWriter
 
 private int depth = 0;
 
-private String lineIndent;
+private char[] lineIndent;
 
-private String lineSeparator;
+private char[] lineSeparator;
 
 private String encoding;
 
@@ -93,7 +99,7 @@ public class PrettyPrintXMLWriter
  */
 public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent, String 
encoding, String doctype )
 {
-this( writer, lineIndent, Os.LINE_SEP, encoding, doctype );
+this( writer, lineIndent.toCharArray(), Os.LINE_SEP.toCharArray(), 
encoding, doctype );
 }
 
 /**
@@ -114,7 +120,7 @@ public class PrettyPrintXMLWriter
  */
 public PrettyPrintXMLWriter( PrintWriter writer, String encoding, String 
doctype )
 {
-this( writer, "  ", encoding, doctype );
+this( writer, DEFAULT_LINE_INDENT, Os.LINE_SEP.toCharArray(), 
encoding, doctype );
 }
 
 /**
@@ -137,6 +143,19 @@ public class PrettyPrintXMLWriter
 public PrettyPrintXMLWriter( PrintWriter writer, String lineIndent, String 
lineSeparator, String encoding,
  String doctype )
 {
+this( writer, lineIndent.toCharArray(), lineSeparator.toCharArray(), 
encoding, doctype );
+}
+
+/**
+ * @param writernot null
+ * @param lineIndentcould be null, but the normal way is some spaces.
+ * @param lineSeparator could be null, but the normal way is valid line 
separator
+ * @param encoding  could be null or the encoding to use.
+ * @param doctype   could be null.
+ */
+private PrettyPrintXMLWriter( PrintWriter writer, char[] lineIndent, 
char[] lineSeparator, String encoding,
+  String doctype )
+{
 this.writer = writer;
 this.lineIndent = lineIndent;
 this.lineSeparator = lineSeparator;
@@ -156,7 +175,7 @@ public class PrettyPrintXMLWriter
 writer.write( ' ' );
 writer.write( key );
 writer.write( '=' );
-writer.write( XMLEncode.xmlEncodeTextForAttribute( value, '"' ) );
+XMLEncode.xmlEncodeTextAsPCDATA( value, true, '"', writer );
 }
 
 public void setEncoding( String encoding )
@@ -186,7 +205,7 @@ public class PrettyPrintXMLWriter
 throw new IllegalStateException( "Document headers already 
written!" );
 }
 
-this.lineSeparator = lineSeparator;
+this.lineSeparator = lineSeparator.toCharArray();
 }
 
 public void setLineIndenter( String lineIndent )
@@ -196,7 +215,7 @@ public class PrettyPrintXMLWriter
 throw new IllegalStateException( "Document headers already 
written!" );
 }
 
-this.lineIndent = lineIndent;
+this.lineIndent = lineIndent.toCharArray();
 }
 
 public void startElement( String elementName )
@@ -214,9 +233,8 @@ public class PrettyPrintXMLWriter
 writer.write( elementName );
 
 processingElement = true;
-depth++;
 
-elementStack.addLast( elementName );
+elementStack.add( depth++, elementName );
 }
 
 publi

maven git commit: Upgraded to pelxus-components 1.6 that uses asm 5.x

[krosenvold]

Repository: maven
Updated Branches:
  refs/heads/master d12f6501f -> 8169fe290


Upgraded to pelxus-components 1.6 that uses asm 5.x


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

Branch: refs/heads/master
Commit: 8169fe2902dea1193ded1e23c2eb8dd8f2064972
Parents: d12f650
Author: Kristian Rosenvold 
Authored: Fri Sep 11 10:05:54 2015 +0200
Committer: Kristian Rosenvold 
Committed: Fri Sep 11 10:05:54 2015 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/8169fe29/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9f087af..b253f8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 2.5.2
 1.2
 4.11
-1.5.5
+1.6
 1.21
 3.0.20
 

maven-wagon git commit: Added .apt to gitattributes

[krosenvold]

Repository: maven-wagon
Updated Branches:
  refs/heads/master 199e3de37 -> e711fd60e


Added .apt to gitattributes


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

Branch: refs/heads/master
Commit: e711fd60e0ee703b7bcda57b2cb0ede7f4151e1f
Parents: 199e3de
Author: Kristian Rosenvold 
Authored: Fri Sep 4 07:35:57 2015 +0200
Committer: Kristian Rosenvold 
Committed: Fri Sep 4 07:35:57 2015 +0200

--
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/e711fd60/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
index 3bb3b5e..e716d09 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,4 @@
 *.csstext
 *.js text
 *.sqltext
+*.apttext

svn commit: r1691766 [2/2] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ it/projects/basic-features/classpath-descriptor/ it/projects/bas

[krosenvold]

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml?rev=1691766r1=1691765r2=1691766view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child1/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -1,23 +1,24 @@
-?xml version=1.0?project
+?xml version=1.0?
+project
 
-!--
-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
+  !--
+  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
+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.
---
+  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.
+  --
 
   parent
 artifactIdassembly-attached-with-module-binaries/artifactId
@@ -30,6 +31,7 @@ under the License.
   nameMaven Quick Start Archetype/name
   version1.0-SNAPSHOT/version
   urlhttp://maven.apache.org/url
+
   dependencies
 dependency
   groupIdjunit/groupId

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml?rev=1691766r1=1691765r2=1691766view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/pom.xml
 Sat Jul 18 18:59:37 2015
@@ -1,23 +1,24 @@
-?xml version=1.0?project
+?xml version=1.0?
+project
 
-!--
-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.
---
+  !--
+  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 

svn commit: r1691766 [1/2] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ it/projects/basic-features/classpath-descriptor/ it/projects/bas

[krosenvold]

Author: krosenvold
Date: Sat Jul 18 18:59:37 2015
New Revision: 1691766

URL: http://svn.apache.org/r1691766
Log:
[MASSEMBLY-704]Removed all deprecated goals

Added:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/child-3/src/main/assembly/bin.xml
  - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/bugs/massembly-190/src/main/assembly/bin.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/assembly/src/main/assembly/bin.xml
  - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/src/main/assemblies/bin.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/assemblies/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/module-b/src/main/assemblies/bin.xml
  - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/src/main/assemblies/bin.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/assemble/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/child2/src/assemble/bin.xml
  - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/forking-tests/assembly-attached-with-module-binaries/src/assemble/bin.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/massembly-298/assembly/src/main/assembly/bin.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/assembly/src/main/assembly/bin.xml
  - copied, changed from r1691728, 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/multimodule-binariesNotSource/src/assemble/bin.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-level-multimodule/assembly/src/main/assembly/bin.xml
  - copied, changed from r1691728, 
maven/plugins/trunk

svn commit: r1691769 - in /maven/plugins/trunk/maven-assembly-plugin/src: it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/ main/java/org/apache/maven/plugins/assem

[krosenvold]

Author: krosenvold
Date: Sat Jul 18 19:22:05 2015
New Revision: 1691769

URL: http://svn.apache.org/r1691769
Log:
Removed unused code

Removed:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReflectionProperties.java
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml?rev=1691769r1=1691768r2=1691769view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/assembly/src/main/assembly/src.xml
 Sat Jul 18 19:22:05 2015
@@ -1,27 +1,29 @@
 ?xml version='1.0'?
 !--
-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
+  ~ /*
+  ~  * 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.
+  ~  */
+  --
 
-  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.
---
-
-
-assembly 
xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0; 
-  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-  
xsi:schemaLocation=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd;
+assembly 
xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0;
+  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+  
xsi:schemaLocation=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
 http://maven.apache.org/xsd/assembly-1.1.0.xsd;
   idsrc/id
   formats
 formatdir/format

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java?rev=1691769r1=1691768r2=1691769view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
 Sat Jul 18 19:22:05 2015
@@ -642,16 +642,6 @@ public abstract class AbstractAssemblyMo
 return result;
 }
 
-AssemblyArchiver getAssemblyArchiver()
-{
-return assemblyArchiver;
-}
-
-AssemblyReader getAssemblyReader()
-{
-return assemblyReader;
-}
-
 public File getBasedir()
 {
 return basedir;
@@ -676,17 +666,6 @@ public abstract class AbstractAssemblyMo
 /**
  * {@inheritDoc}
  *
- * @deprecated This has been replaced by {@link #setDescriptors(String[])}
- */
-@Deprecated
-public void setDescriptor( final String descriptor

svn commit: r1691132 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/ test/java/org/apache/maven/plugin/

[krosenvold]

Author: krosenvold
Date: Wed Jul 15 06:54:06 2015
New Revision: 1691132

URL: http://svn.apache.org/r1691132
Log:
Removed directories. git-svn was hiding these :)

Removed:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/

svn commit: r9666 - /release/maven/KEYS

[krosenvold]

Author: krosenvold
Date: Tue Jul  7 07:26:06 2015
New Revision: 9666

Log:
Added a stronger gpg key

Modified:
release/maven/KEYS

Modified: release/maven/KEYS
==
--- release/maven/KEYS (original)
+++ release/maven/KEYS Tue Jul  7 07:26:06 2015
@@ -2746,3 +2746,99 @@ VlPqjBfVh5N1DjirNire/h1uiCIg+iQt4Syrb/Ev
 /mppKyqICYAcv7q0QO7B
 =kJOo
 -END PGP PUBLIC KEY BLOCK-
+
+pub   4096R/56CACE56 2015-07-07
+uid  Kristian Rosenvold (CODE SIGNING KEY) 
krosenv...@apache.org
+sig 356CACE56 2015-07-07  Kristian Rosenvold (CODE SIGNING KEY) 
krosenv...@apache.org
+sig  E0747D50 2015-07-07  Kristian Rosenvold krosenv...@apache.org
+sub   4096R/F7512FD2 2015-07-07
+sig  56CACE56 2015-07-07  Kristian Rosenvold (CODE SIGNING KEY) 
krosenv...@apache.org
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+mQMuBEvV3b0RCACwbaRYW3GoHAKzxEtiGl5YCXDKjKBmSVal/iMG6rEqadXNCy3R
+u7h67TEyIGe8c3WVh3ykz5YAZgFoy0ZsdnhdpuLWQVaqtLR8upaEwIfX0Gh6dol0
+GcGg4HBkC+Kz++jV1G+iIBYXa5jRYQlRIbCt/u7WZxm6qG//6DBJ7qzwFyt8HUqU
+5u928P/eyQM4+VRvs7vxeyOrqN1VO4qxY/ummjTZTRwMNNuiFJNjUF4Q6IDYjIKT
+/tISSp0mu8hnIUrj1haF6yuwYOH9QmQPjXSvKMSFspIdDI7ytRkydEvHwmpw9J0B
+/CJidSIIRjR5iGVlgwIvUTf883fZZ9DqQuqzAQD75oJdxhi/OkHp+auHyRV+Lvoq
+ZBOrUZlg0JVtmQPlEQf7Bi4GqyKJL6i6HP9YAP3Lvgtq+p1ae3bfyb8/Fpevp7w3
+CT1Kj/fiHYRS1HXF8M70HBmZL4g2E+FO5s5FMcdfwzeArHLcLZaJzpvKPKb+5KQ7
+u8Q0aJnzj4v64LIWuoATI9lmeoDjDaHH4TsOZBx29WSl611oAYHE3IGFWR1GjTr4
+xo5auCFzL0reZ5B6DX6peAeJzMDCClRUWi/jZe+7xRuWrRPJsleEkV8VcVdOY5C1
+wKDuVZR0zvFwNK0s6K9c1HyAHHvmq7BhOls/cBnZc37IxFMZ6vlqX2lpRY0n8g3L
+YsvUWvQFypzDRlXwUgHotquDQ9b3WF2P4ncl15+vLAf+O8VwTgM1zWHG+zZ8pTU+
+Rsy0URT2hQoELu7pTPexoC3SbkzxeVSNgC/bXe6OxRJ3LYGV0R5aoeRP8JVzGk+u
+gNIr8SpQct0yoAA9mGWIptbeORGu3yQhjqrZkjGGxYQ+3ZRu+fvaHkbv5VYfFJJD
+F7C8cXdY3t9iRLmcSwTNHik+D2SBrCgqolHVTJne7CqUQxlH+3IeWRpL6z2Gl958
+ayWmeJRsFhRm6nnszQbiL3eZ8KhYADVuJwa3DEjB99XoczkwF908qzz/V2vr4J3k
+AXVY2EqcIkVtLdSkD5gBis7nfkwSSfbgmsVZBAS6ggxoxYirzRVRsbF0w6YYUnBL
+p7QqS3Jpc3RpYW4gUm9zZW52b2xkIDxrcm9zZW52b2xkQGFwYWNoZS5vcmc+iHkE
+ExEKACECGwMCHgECF4AFAlWbdW0FCwkIBwMFFQoJCAsFFgIDAQAACgkQRmyu1uB0
+fVBH+wD7Bx2bsPJ3KizlnrzQWwT0CtRvnXtZKy5DJTJhg0tyb8cA/2j9znajxIjo
+E8m7mOaRBPwvFK97UZcqNSpaBx2LA8kFuQINBEvV3b0QCACIgUfiMhSe46HZLJP1
+r/JtSsjEzgmDFN7Fwdk9cCazrgR7gbh70FkB0gM4YlhfjdafOBqUBYcZtTz4ljJL
+2JBbwIH8Dczmei61BHo4lL/7YgV5YG+TT1NR+jADCOjRt9KS7FAeFuP1yX+rdIny
++5rqSqs6t28rZcMeCrjk+zwlSh7ExSrm+T2Un7ahBqwwiiXYdY/8cNeR7vkl/JTO
+iaXE6CWGtNIK/c6Hqyew+AR5Is7xm7RsH5/LIxfoHpZLJt23PQAfwYiGCe89vLCY
+8YFcOIqV6XXqQE5NHPvzbrbG5AORafDVMINZpqjqpXM4Q7G/XXUVLG2ca9GEMOR4
+WyjPAAMFB/4pAjlLxILAQHv4NMDp1jomNBzqQmIQr47tVyt57j2t017vnTrpaSo4
+ur0oZld0R49E1BLX8eVTu6wXI25vSbV62X++FJwOG772EkdIwezyMJOz1fTIZLjt
++Hnc9qwICcWX7GvXxS0dqLLr1ZCI3QTiAz0kdESiAwTSwwJGjj0Gy3oE8i9DxAQ2
+2qt9oXzoGT3PNNRjkf4iDFC7yMIvkRbibW7GXmF4ioW/QxVHpeGj4W/7SLFUZ87+
+c9HI7AoUiFboXOn4jSyudPYpWsznkkdi9QJ/BJPHdDjla4dy16C4jzLVrRogze1j
+1FQD/56ZMz34Mz5zPd5sGaKYyXOorVHOiGEEGBEIAAkFAkvV3b0CGwwACgkQRmyu
+1uB0fVBX6AEAjp0BHvbQZRqNjMbo2p4ltfxg4nYjewhNCJASvIF+iEgA/A3AuuUj
+xRbkipq5kbABFNMIYhPt43ejOHmt5nv+mOe4mQINBFWbdloBEADqUwoIyP0oIU9W
+l7AMa+CmCciNFaJ4roUcmBBmpifW9pyj8rjcZo31RrIvqLO2YijkN+lc7zb8GDBK
+tEr6QW8/IA95T3d5TjzwSAFcX+9b6Fq6yqbJQdIrjPZ5igFzUb1e85s1368gm9r5
+3V4luoluCxcj6yd5Nwek/UgVoLa+sI8bIga1jckUE9fpGLrjxpojmigTTkfTcOig
+o8TbXFpHxUi348Z8z3QN2yf9jezL4S/ixtHNO9iYPGn3KzAWLFS4GkP8OzuGMfeB
+Vf5eJLSqLmYZ7970j1GUSLpV5Yw7ChZyK5tWOSqQGakiVPNdS31+21zYgG8rj7k6
+/1FnAsNRW2klhjHLXf19b5xsLD2lz/iTHrR1ZbfZicBzl8qjndyUWeB2JPQyeTYv
+rbzk3dbVodMW/W5OsfXG2F1MIKNM61RQpLWXGbnqXjNgWOIw+1S0UvQXXqwIdX0S
+LhsMnSW2JBUCUJX7VEwodtxDJNDPpgi0y+zOkpcb3P3E5mAOWDD9MLCrEwzbJiXJ
+mHolaPunKldjIK8UNh4DGXQer4vGm30UQCaM2bSy41+Gm4pwnrDSj+4aUtiETvmA
+jObUG1tm6s07NZfTo0XAQxei3vY6y0pRts2DoJDymxwuQf7GnUZ9f/co4r7+9Y47
+Vj+/HGiNyPTV5HC0y9TbL2KleBq7kwARAQABtD1LcmlzdGlhbiBSb3NlbnZvbGQg
+KENPREUgU0lHTklORyBLRVkpIDxrcm9zZW52b2xkQGFwYWNoZS5vcmc+iQI3BBMB
+CgAhBQJVm3ZaAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEO4uvYlWys5W
+EeIQAJQK2P59xsOO+MyYyoQu5hGZ2J6DQ/ZZ8YVnlFD3WfJt8+aD+4el+vnYoBvw
+dJAiylKG7FGV8zTbqsqSganxBzWlf3TqlK8dwTq8fKw+6d9iLgDceAUDxtA65eiV
+Bm0clMQNNnKZ6LzF3aBdgAOXhrRlgJTTjrtp08psrB+0Ov1Gqs7VCykSFYxWeVWp
+HbgYMebdQRzrG9mtJqIC4ZgFqNtfeJMuO7PLYfxp3QNa+mmS0clX+jho9Efj12Qt
+B9B4wNs0JtOxwERt+GKqj1b3mMJsM1wQ/hUgWgHwUXkb7Kwmh17iNSEv9Rqx4kwl
+mdP1LCoaAbFPJevlftFvJobpCTHB20WT9QLHCv5jpIaRDi3s0+PQIYf53MFbjkId
+Q5Wf9cyG7S14KGL99npORWmSScTm5P/dE3STFLwEzbu/X6lgbXLLMsJPFX85MIIy
+9Zh/P9MsuagT7ZHCj3I1l0wnIkVPP89HtiXm8HQbLWsS/pOP5fL+eqvm1nueuwyX
+PLZoo94j534i3vncPxNbohEylK/JK9lIuzWHXvbyD64IuA/y9lPf2NAip+L8ckUK
+ZFb+WUihpli0gsYZYCmbP+g0LIb8OyB8V3TaOz4R1vmn9fMQupFXSOKpSyg/ftFp
+CCnvJxoIKq35wArRJxi1d5eb9oZqWd7XOBslNmr6TitqV/ViiF4EEBEKAAYFAlWb
+eMMACgkQRmyu1uB0fVDxVgD9HfZ2ti0RlTFhB7+UlGrF6ILb+bLk4hNkmz/i/0Zp
+x3UBAKxZzfYtqhI01SfjSU56vIB01FWYGuU5AXWykg+7Y1uyuQINBFWbdloBEACz
+Wel/LNymMAOKzIeO55ekHgsHeI/fI0UBxnn2Vq/yHbenNZvE/YQa/f6c/A8i0xWY

maven-integration-testing git commit: Moved test extension and support code to the proper place. Hopefully this will make test more reliable

[krosenvold]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master d333f1254 - e7a7cff9f


Moved test extension and support code to the proper place. Hopefully this will 
make
test more reliable


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/e7a7cff9
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/e7a7cff9
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/e7a7cff9

Branch: refs/heads/master
Commit: e7a7cff9fcf29fa5b21dcbf870b7ffcf448413ca
Parents: d333f12
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Tue Jun 23 19:00:50 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Tue Jun 23 19:14:10 2015 +0200

--
 .../MavenITmng5805PkgTypeMojoConfiguration.java | 18 +
 .../test/resources/bootstrap/group-3/pom.xml| 19 ++
 .../test/resources/bootstrap/group-7/pom.xml| 67 --
 .../src/test/resources/bootstrap/pom.xml|  2 +-
 .../extension/pom.xml   | 30 -
 .../resources/META-INF/plexus/components.xml| 53 ---
 .../plugin-dep/pom.xml  | 30 -
 .../apache/maven/its/mng5805/TestClass1.java|  5 --
 .../plugin/pom.xml  | 49 --
 .../maven/its/mng5805/plugin/TestMojo.java  | 51 --
 .../pom.xml | 40 +++
 .../project/pom.xml | 40 ---
 .../core-it-plugins/mng5805-extension/pom.xml   | 37 ++
 .../resources/META-INF/plexus/components.xml| 71 
 .../core-it-plugins/mng5805-plugin-dep/pom.xml  | 37 ++
 .../apache/maven/its/mng5805/TestClass1.java| 28 
 .../core-it-plugins/mng5805-plugin/pom.xml  | 55 +++
 .../maven/its/mng5805/plugin/TestMojo.java  | 51 ++
 core-it-support/core-it-plugins/pom.xml |  3 +
 19 files changed, 344 insertions(+), 342 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7a7cff9/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
index 73d317f..ada7448 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
@@ -20,22 +20,8 @@ public class MavenITmng5805PkgTypeMojoConfiguration
 
 Verifier verifier;
 
-verifier = newVerifier( new File( testDir, extension 
).getAbsolutePath() );
-verifier.executeGoal( install );
-verifier.verifyErrorFreeLog();
-verifier.resetStreams();
-
-verifier = newVerifier( new File( testDir, plugin 
).getAbsolutePath() );
-verifier.executeGoal( install );
-verifier.verifyErrorFreeLog();
-verifier.resetStreams();
-
-verifier = newVerifier( new File( testDir, plugin-dep 
).getAbsolutePath() );
-verifier.executeGoal( install );
-verifier.verifyErrorFreeLog();
-verifier.resetStreams();
-
-verifier = newVerifier( new File( testDir, project 
).getAbsolutePath() );
+
+verifier = newVerifier( testDir.getAbsolutePath() );
 verifier.executeGoal( validate );
 verifier.verifyErrorFreeLog();
 verifier.verifyTextInLog( 
CLASS_NAME=org.apache.maven.its.mng5805.TestClass1 );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/e7a7cff9/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml
index 0e27527..1538441 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-3/pom.xml
@@ -126,6 +126,25 @@ under the License.
 /dependency
 dependency
   groupIdorg.apache.maven.its.plugins/groupId
+  artifactIdmng-5805-pkg-type-mojo-configuration-extension/artifactId
+  version${itPluginVersion}/version
+  scoperuntime/scope
+/dependency
+dependency
+  groupIdorg.apache.maven.its.plugins/groupId
+  artifactIdmng-5805-pkg-type-mojo-configuration-plugin/artifactId
+  version${itPluginVersion}/version
+  

svn commit: r1686704 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugin/checkstyle/ main/java/org/apache/maven/plugin/checkstyle/exec/ main/java/org/apache/maven/

[krosenvold]

Author: krosenvold
Date: Sun Jun 21 12:02:24 2015
New Revision: 1686704

URL: http://svn.apache.org/r1686704
Log:
Java7 updates

Modified:

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleCheckerListener.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleResults.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/DefaultCheckstyleExecutor.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/rss/DefaultCheckstyleRssGenerator.java

maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/rss/VelocityTemplate.java

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleReportListenerTest.java

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/exec/CheckstyleResultsTest.java

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MinMavenProjectStub.java

maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/ModuleMavenProjectStub.java

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java?rev=1686704r1=1686703r2=1686704view=diff
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
 Sun Jun 21 12:02:24 2015
@@ -517,7 +517,7 @@ public abstract class AbstractCheckstyle
 plugin = mojoExecution.getMojoDescriptor().getPluginDescriptor();
 }
 
-ListArtifact artifacts = new ArrayListArtifact();
+ListArtifact artifacts = new ArrayList();
 
 PluginManagement pluginManagement = 
project.getBuild().getPluginManagement();
 if ( pluginManagement != null )
@@ -532,7 +532,7 @@ public abstract class AbstractCheckstyle
 
 private ListArtifact getCheckstylePluginDependenciesAsArtifacts( 
MapString, Plugin plugins, String hint )
 {
-ListArtifact artifacts = new ArrayListArtifact();
+ListArtifact artifacts = new ArrayList();
 
 Plugin checkstylePlugin = plugins.get( plugin.getGroupId() + : + 
plugin.getArtifactId() );
 if ( checkstylePlugin != null )
@@ -732,7 +732,7 @@ public abstract class AbstractCheckstyle
 }
 else
 {
-sourceDirs = new ArrayListFile( sourceDirectories.size() );
+sourceDirs = new ArrayList( sourceDirectories.size() );
 for ( String sourceDir : sourceDirectories )
 {
 sourceDirs.add( FileUtils.resolveFile( project.getBasedir(), 
sourceDir ) );
@@ -753,7 +753,7 @@ public abstract class AbstractCheckstyle
 // probably null-check only required due to MavenProjectStubs
 else if ( testSourceDirectories != null )
 {
-testSourceDirs = new ArrayListFile( testSourceDirectories.size() 
);
+testSourceDirs = new ArrayList( testSourceDirectories.size() );
 for ( String testSourceDir : testSourceDirectories )
 {
 testSourceDirs.add( FileUtils.resolveFile( 
project.getBasedir(), testSourceDir ) );

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=1686704r1=1686703r2=1686704view=diff
==
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java

maven-integration-testing git commit: Added a group 7 to resolve core apis which need to be present in the repository

[krosenvold]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master c28c27949 - 7a6a75022


Added a group 7 to resolve core apis which need to be present in the repository


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/7a6a7502
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/7a6a7502
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/7a6a7502

Branch: refs/heads/master
Commit: 7a6a75022aec06f947068d794e8ab1c894cb40b6
Parents: c28c279
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Jun 21 15:08:06 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Jun 21 15:08:06 2015 +0200

--
 .../test/resources/bootstrap/group-7/pom.xml| 57 
 .../src/test/resources/bootstrap/pom.xml|  1 +
 .../plugin/pom.xml  | 10 ++--
 3 files changed, 65 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7a6a7502/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
new file mode 100644
index 000..ab18bf3
--- /dev/null
+++ b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
@@ -0,0 +1,57 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+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.
+--
+
+project
+  modelVersion4.0.0/modelVersion
+
+  parent
+groupIdorg.apache.maven.its.bootstrap/groupId
+artifactIdmaven-it-boostrap/artifactId
+version1.0/version
+  /parent
+
+  groupIdorg.apache.maven.its.bootstrap/groupId
+  artifactIdgroup-7/artifactId
+  version1.0/version
+  packagingjar/packaging
+
+  nameMaven Integration Test :: Boostrap :: Group-7/name
+
+  properties
+  /properties
+
+  !-- Core version used by all the it projects --
+  !-- todo: update all its to 3.0 --
+
+  dependencies
+dependency
+  groupIdorg.apache.maven/groupId
+  artifactIdmaven-plugin-api/artifactId
+  version2.0/version
+/dependency
+dependency
+  groupIdorg.apache.maven/groupId
+  artifactIdmaven-plugin-registry/artifactId
+  version2.0/version
+/dependency
+
+  /dependencies
+/project

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7a6a7502/core-it-suite/src/test/resources/bootstrap/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/pom.xml
index e0edb9a..358b931 100644
--- a/core-it-suite/src/test/resources/bootstrap/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/pom.xml
@@ -43,6 +43,7 @@ under the License.
 modulegroup-4/module
 modulegroup-5/module
 modulegroup-6/module
+modulegroup-7/module
   /modules
 
   properties

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/7a6a7502/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
 
b/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
index bb27d57..579bce3 100644
--- 
a/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
@@ -28,23 +28,27 @@ under the License.
   version0.1/version
   packagingmaven-plugin/packaging
 
+  properties
+maven-version2.0/maven-version
+  /properties
+
   dependencies
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-plugin-api/artifactId
-  version${maven.version}/version
+  version${maven-version}/version
   scopeprovided/scope
 /dependency
 

maven-integration-testing git commit: Added more plugins

[krosenvold]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 82bc9983d - 3e7623ee7


Added more plugins


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/3e7623ee
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/3e7623ee
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/3e7623ee

Branch: refs/heads/master
Commit: 3e7623ee7d9f5d4afc12bffedc3aa3ee57405ba9
Parents: 82bc998
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Jun 21 18:34:59 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Jun 21 18:34:59 2015 +0200

--
 core-it-suite/src/test/resources/bootstrap/group-7/pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3e7623ee/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
index 948e756..5e72a00 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
@@ -60,6 +60,11 @@ under the License.
 artifactIdmaven-jar-plugin/artifactId
 version2.4/version
   /plugin
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-plugin-plugin/artifactId
+version3.2/version
+  /plugin
 /plugins
   /build
 /project

maven-integration-testing git commit: Added jar plugin 2.4 to bootstrap

[krosenvold]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 7a6a75022 - 82bc9983d


Added jar plugin 2.4 to bootstrap


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/82bc9983
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/82bc9983
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/82bc9983

Branch: refs/heads/master
Commit: 82bc9983da3bf84ab0ab6ef8a6626909c6012ff5
Parents: 7a6a750
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Jun 21 17:52:30 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Jun 21 17:52:30 2015 +0200

--
 .../src/test/resources/bootstrap/group-7/pom.xml  | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/82bc9983/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
index ab18bf3..948e756 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
@@ -52,6 +52,14 @@ under the License.
   artifactIdmaven-plugin-registry/artifactId
   version2.0/version
 /dependency
-
   /dependencies
+  build
+plugins
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-jar-plugin/artifactId
+version2.4/version
+  /plugin
+/plugins
+  /build
 /project

maven-integration-testing git commit: Fix IT, take 5

[krosenvold]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 3e7623ee7 - d333f1254


Fix IT, take 5


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/d333f125
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/d333f125
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/d333f125

Branch: refs/heads/master
Commit: d333f12549362e40e8bb58a560d65249369cc32c
Parents: 3e7623e
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sun Jun 21 21:54:36 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sun Jun 21 21:54:36 2015 +0200

--
 .../test/resources/bootstrap/group-7/pom.xml| 33 +---
 .../plugin/pom.xml  |  8 +
 2 files changed, 16 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d333f125/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
--
diff --git a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml 
b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
index 5e72a00..837c18a 100644
--- a/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
+++ b/core-it-suite/src/test/resources/bootstrap/group-7/pom.xml
@@ -45,26 +45,23 @@ under the License.
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-plugin-api/artifactId
-  version2.0/version
+  version3.0/version
 /dependency
 dependency
-  groupIdorg.apache.maven/groupId
-  artifactIdmaven-plugin-registry/artifactId
-  version2.0/version
+  groupIdorg.apache.maven.plugins/groupId
+  artifactIdmaven-jar-plugin/artifactId
+  version2.4/version
+/dependency
+dependency
+  groupIdorg.apache.maven.plugins/groupId
+  artifactIdmaven-plugin-plugin/artifactId
+  version3.2/version
+/dependency
+dependency
+  groupIdorg.codehaus.plexus/groupId
+  artifactIdplexus-utils/artifactId
+  version1.1/version
+  scoperuntime/scope
 /dependency
   /dependencies
-  build
-plugins
-  plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-jar-plugin/artifactId
-version2.4/version
-  /plugin
-  plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-plugin-plugin/artifactId
-version3.2/version
-  /plugin
-/plugins
-  /build
 /project

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d333f125/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
 
b/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
index 579bce3..c08a250 100644
--- 
a/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
@@ -29,7 +29,7 @@ under the License.
   packagingmaven-plugin/packaging
 
   properties
-maven-version2.0/maven-version
+maven-version3.0/maven-version
   /properties
 
   dependencies
@@ -45,11 +45,5 @@ under the License.
   version${maven-version}/version
   scopeprovided/scope
 /dependency
-dependency
-  groupIdorg.apache.maven/groupId
-  artifactIdmaven-core/artifactId
-  version${maven-version}/version
-  scopeprovided/scope
-/dependency
   /dependencies
 /project

[2/6] maven git commit: Upgraded to java7 language features

[krosenvold]

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java 
b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
index 8ff912f..55b29b6 100644
--- 
a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
+++ 
b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
@@ -62,7 +62,7 @@ public class EmptyLifecycleExecutor
 // NOTE: The upper-case packaging name is intentional, that's a 
special hinting mode used for certain tests
 if ( JAR.equals( packaging ) )
 {
-plugins = new LinkedHashSetPlugin();
+plugins = new LinkedHashSet();
 
 plugins.add( newPlugin( maven-compiler-plugin, compile, 
testCompile ) );
 plugins.add( newPlugin( maven-resources-plugin, resources, 
testResources ) );

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
 
b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
index 21e37f1..fb5c4c0 100644
--- 
a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
+++ 
b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
@@ -45,7 +45,7 @@ public class EmptyProjectBuildingHelper
 }
 else
 {
-return new ArrayListArtifactRepository();
+return new ArrayList();
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java 
b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
index 0c5cd07..1bc75ab 100644
--- a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
@@ -23,9 +23,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.maven.lifecycle.internal.stub.LoggerStub;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java 
b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index f17539b..988df76 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -1741,7 +1741,7 @@ public class PomConstructionTest
 {
 PomTestWrapper pom = buildPom( plugin-inheritance-merge-order/sub );
 
-ListString expected = new ArrayListString();
+ListString expected = new ArrayList();
 expected.add( maven-it-plugin-error );
 expected.add( maven-it-plugin-configuration );
 expected.add( maven-it-plugin-dependency-resolution );
@@ -1751,7 +1751,7 @@ public class PomConstructionTest
 expected.add( maven-it-plugin-fork );
 expected.add( maven-it-plugin-touch );
 
-ListString actual = new ArrayListString();
+ListString actual = new ArrayList();
 @SuppressWarnings( unchecked )
 ListPlugin plugins = (ListPlugin) pom.getValue( build/plugins );
 for ( Plugin plugin : plugins )
@@ -1770,7 +1770,7 @@ public class PomConstructionTest
 {
 PomTestWrapper pom = buildPom( plugin-injection-merge-order );
 
-ListString expected = new ArrayListString();
+ListString expected = new ArrayList();
 expected.add( maven-it-plugin-error );
 expected.add( maven-it-plugin-configuration );
 expected.add( maven-it-plugin-dependency-resolution );
@@ -1780,7 +1780,7 @@ public class PomConstructionTest
 expected.add( maven-it-plugin-fork );
 expected.add( maven-it-plugin-touch );
 
-ListString actual = new ArrayListString();
+ListString actual = new ArrayList();
 @SuppressWarnings( unchecked )
 ListPlugin plugins = (ListPlugin) pom.getValue( build/plugins );
 for ( Plugin plugin : plugins )

[5/6] maven git commit: Upgraded to java7 language features

[krosenvold]

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 2c4a60e..6fa72ce 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -569,9 +569,9 @@ public class DefaultWagonManager
 wagon.addTransferListener( downloadMonitor );
 }
 
-MapString, ChecksumObserver checksums = new HashMapString, 
ChecksumObserver( 2 );
+MapString, ChecksumObserver checksums = new HashMap( 2 );
 
-MapString, String sums = new HashMapString, String( 2 );
+MapString, String sums = new HashMap( 2 );
 
 // TODO: configure these on the repository
 for ( int i = 0; i  CHECKSUM_IDS.length; i++ )
@@ -579,7 +579,7 @@ public class DefaultWagonManager
 checksums.put( CHECKSUM_IDS[i], addChecksumObserver( wagon, 
CHECKSUM_ALGORITHMS[i] ) );
 }
 
-ListFile temporaryFiles = new ArrayListFile();
+ListFile temporaryFiles = new ArrayList();
 
 try
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index 6dd84db..866968b 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -158,7 +158,7 @@ public class LegacyRepositorySystem
 
 if ( !d.getExclusions().isEmpty() )
 {
-ListString exclusions = new ArrayListString();
+ListString exclusions = new ArrayList();
 
 for ( Exclusion exclusion : d.getExclusions() )
 {
@@ -377,7 +377,7 @@ public class LegacyRepositorySystem
 return null;
 }
 
-MapString, ListArtifactRepository reposByKey = new 
LinkedHashMapString, ListArtifactRepository();
+MapString, ListArtifactRepository reposByKey = new 
LinkedHashMap();
 
 for ( ArtifactRepository repository : repositories )
 {
@@ -387,21 +387,21 @@ public class LegacyRepositorySystem
 
 if ( aliasedRepos == null )
 {
-aliasedRepos = new ArrayListArtifactRepository();
+aliasedRepos = new ArrayList();
 reposByKey.put( key, aliasedRepos );
 }
 
 aliasedRepos.add( repository );
 }
 
-ListArtifactRepository effectiveRepositories = new 
ArrayListArtifactRepository();
+ListArtifactRepository effectiveRepositories = new ArrayList();
 
 for ( ListArtifactRepository aliasedRepos : reposByKey.values() )
 {
-ListArtifactRepository mirroredRepos = new 
ArrayListArtifactRepository();
+ListArtifactRepository mirroredRepos = new ArrayList();
 
 ListArtifactRepositoryPolicy releasePolicies =
-new ArrayListArtifactRepositoryPolicy( aliasedRepos.size() );
+new ArrayList( aliasedRepos.size() );
 
 for ( ArtifactRepository aliasedRepo : aliasedRepos )
 {
@@ -412,7 +412,7 @@ public class LegacyRepositorySystem
 ArtifactRepositoryPolicy releasePolicy = getEffectivePolicy( 
releasePolicies );
 
 ListArtifactRepositoryPolicy snapshotPolicies =
-new ArrayListArtifactRepositoryPolicy( aliasedRepos.size() );
+new ArrayList( aliasedRepos.size() );
 
 for ( ArtifactRepository aliasedRepo : aliasedRepos )
 {
@@ -532,7 +532,7 @@ public class LegacyRepositorySystem
 {
 if ( repositories != null )
 {
-MapString, Server serversById = new HashMapString, Server();
+MapString, Server serversById = new HashMap();
 
 if ( servers != null )
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
 
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
index b20bd72..017dd9b 100644
--- 

[1/6] maven git commit: Upgraded to java7 language features

[krosenvold]

Repository: maven
Updated Branches:
  refs/heads/master 40d5087b6 - 7badeb5b5


http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
--
diff --git 
a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java 
b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
index b671d98..187 100644
--- a/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
+++ b/maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
@@ -114,7 +114,7 @@ public class ModelMerger
 return;
 }
 
-MapObject, Object context = new HashMapObject, Object();
+MapObject, Object context = new HashMap();
 if ( hints != null )
 {
 context.putAll( hints );
@@ -313,7 +313,7 @@ public class ModelMerger
 if ( !src.isEmpty() )
 {
 ListLicense tgt = target.getLicenses();
-MapObject, License merged = new LinkedHashMapObject, License( 
( src.size() + tgt.size() ) * 2 );
+MapObject, License merged = new LinkedHashMap( ( src.size() + 
tgt.size() ) * 2 );
 
 for ( License element : tgt )
 {
@@ -330,7 +330,7 @@ public class ModelMerger
 }
 }
 
-target.setLicenses( new ArrayListLicense( merged.values() ) );
+target.setLicenses( new ArrayList( merged.values() ) );
 }
 }
 
@@ -341,7 +341,7 @@ public class ModelMerger
 if ( !src.isEmpty() )
 {
 ListMailingList tgt = target.getMailingLists();
-MapObject, MailingList merged = new LinkedHashMapObject, 
MailingList( ( src.size() + tgt.size() ) * 2 );
+MapObject, MailingList merged = new LinkedHashMap( ( 
src.size() + tgt.size() ) * 2 );
 
 for ( MailingList element : tgt )
 {
@@ -358,7 +358,7 @@ public class ModelMerger
 }
 }
 
-target.setMailingLists( new ArrayListMailingList( 
merged.values() ) );
+target.setMailingLists( new ArrayList( merged.values() ) );
 }
 }
 
@@ -369,7 +369,7 @@ public class ModelMerger
 if ( !src.isEmpty() )
 {
 ListDeveloper tgt = target.getDevelopers();
-MapObject, Developer merged = new LinkedHashMapObject, 
Developer( ( src.size() + tgt.size() ) * 2 );
+MapObject, Developer merged = new LinkedHashMap( ( src.size() 
+ tgt.size() ) * 2 );
 
 for ( Developer element : tgt )
 {
@@ -386,7 +386,7 @@ public class ModelMerger
 }
 }
 
-target.setDevelopers( new ArrayListDeveloper( merged.values() ) 
);
+target.setDevelopers( new ArrayList( merged.values() ) );
 }
 }
 
@@ -397,7 +397,7 @@ public class ModelMerger
 if ( !src.isEmpty() )
 {
 ListContributor tgt = target.getContributors();
-MapObject, Contributor merged = new LinkedHashMapObject, 
Contributor( ( src.size() + tgt.size() ) * 2 );
+MapObject, Contributor merged = new LinkedHashMap( ( 
src.size() + tgt.size() ) * 2 );
 
 for ( Contributor element : tgt )
 {
@@ -414,7 +414,7 @@ public class ModelMerger
 }
 }
 
-target.setContributors( new ArrayListContributor( 
merged.values() ) );
+target.setContributors( new ArrayList( merged.values() ) );
 }
 }
 
@@ -505,7 +505,7 @@ public class ModelMerger
 if ( !src.isEmpty() )
 {
 ListProfile tgt = target.getProfiles();
-MapObject, Profile merged = new LinkedHashMapObject, Profile( 
( src.size() + tgt.size() ) * 2 );
+MapObject, Profile merged = new LinkedHashMap( ( src.size() + 
tgt.size() ) * 2 );
 
 for ( Profile element : tgt )
 {
@@ -522,7 +522,7 @@ public class ModelMerger
 }
 }
 
-target.setProfiles( new ArrayListProfile( merged.values() ) );
+target.setProfiles( new ArrayList( merged.values() ) );
 }
 }
 
@@ -546,7 +546,7 @@ public class ModelMerger
 if ( !src.isEmpty() )
 {
 ListString tgt = target.getModules();
-ListString merged = new ArrayListString( tgt.size() + 
src.size() );
+ListString merged = new ArrayList( tgt.size() + src.size() );
 merged.addAll( tgt );
 merged.addAll( src );
 target.setModules( merged );
@@ -560,7 +560,7 @@ public class ModelMerger
 if ( !src.isEmpty() )
 {
 ListDependency tgt = target.getDependencies();
-MapObject, Dependency merged = new LinkedHashMapObject, 
Dependency( ( src.size() + tgt.size() ) * 2 );
+MapObject, Dependency merged = new LinkedHashMap( ( 

[4/6] maven git commit: Upgraded to java7 language features

[krosenvold]

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
index 5c6689d..669773d 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
@@ -39,12 +39,12 @@ public class AndArtifactFilter
 
 public AndArtifactFilter()
 {
-this.filters = new LinkedHashSetArtifactFilter();
+this.filters = new LinkedHashSet();
 }
 
 public AndArtifactFilter( ListArtifactFilter filters )
 {
-this.filters = new LinkedHashSetArtifactFilter( filters );
+this.filters = new LinkedHashSet( filters );
 }
 
 public boolean include( Artifact artifact )
@@ -68,7 +68,7 @@ public class AndArtifactFilter
 
 public ListArtifactFilter getFilters()
 {
-return new ArrayListArtifactFilter( filters );
+return new ArrayList( filters );
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
index fb0afcf..e92ece2 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java
@@ -45,7 +45,7 @@ public class CumulativeScopeArtifactFilter
  */
 public CumulativeScopeArtifactFilter( CollectionString scopes )
 {
-this.scopes = new HashSetString();
+this.scopes = new HashSet();
 
 addScopes( scopes );
 }
@@ -57,7 +57,7 @@ public class CumulativeScopeArtifactFilter
  */
 public CumulativeScopeArtifactFilter( CumulativeScopeArtifactFilter... 
filters )
 {
-this.scopes = new HashSetString();
+this.scopes = new HashSet();
 
 if ( filters != null )
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
index c3dc981..57c6177 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
@@ -35,7 +35,7 @@ public class ExclusionSetFilter
 
 public ExclusionSetFilter( String[] excludes )
 {
-this.excludes = new LinkedHashSetString( Arrays.asList( excludes ) );
+this.excludes = new LinkedHashSet( Arrays.asList( excludes ) );
 }
 
 public ExclusionSetFilter( SetString excludes )

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
index 403e125..6ac8884 100644
--- 
a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
+++ 
b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
@@ -39,7 +39,7 @@ public class IncludesArtifactFilter
 
 public IncludesArtifactFilter( ListString patterns )
 {
-this.patterns = new LinkedHashSetString( patterns );
+this.patterns = new LinkedHashSet( patterns );
 }
 
 public boolean include( Artifact artifact )
@@ -60,7 +60,7 @@ public class IncludesArtifactFilter
 
 public ListString getPatterns()
 {
-return new ArrayListString( patterns );
+return new ArrayList( patterns );
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
--
diff --git 

[6/6] maven git commit: Upgraded to java7 language features

[krosenvold]

Upgraded to java7 language features


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

Branch: refs/heads/master
Commit: 7badeb5b5bdfb48dd3c9533d224418d0648b76ce
Parents: 40d5087
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Fri Mar 6 07:12:21 2015 +0100
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sat Jun 20 10:56:07 2015 +0200

--
 .../maven/settings/GlobalSettingsTest.java  |  7 +-
 .../ArtifactDescriptorReaderDelegate.java   |  6 +-
 .../DefaultArtifactDescriptorReader.java|  2 +-
 .../internal/DefaultModelResolver.java  |  8 +-
 .../internal/DefaultVersionRangeResolver.java   | 34 +++
 .../internal/DefaultVersionResolver.java| 69 +++---
 .../internal/LocalSnapshotMetadata.java |  6 +-
 .../LocalSnapshotMetadataGenerator.java |  2 +-
 .../repository/internal/MavenAetherModule.java  |  2 +-
 .../internal/MavenSnapshotMetadata.java |  2 +-
 .../internal/RemoteSnapshotMetadata.java|  4 +-
 .../RemoteSnapshotMetadataGenerator.java|  2 +-
 .../repository/internal/VersionsMetadata.java   |  4 +-
 .../internal/VersionsMetadataGenerator.java |  4 +-
 .../internal/util/ConsoleTransferListener.java  |  2 +-
 .../apache/maven/artifact/ArtifactUtils.java|  4 +-
 .../apache/maven/artifact/DefaultArtifact.java  |  2 +-
 .../artifact/versioning/ComparableVersion.java  |  5 +-
 .../maven/artifact/versioning/VersionRange.java |  6 +-
 .../apache/maven/artifact/ArtifactStatus.java   |  2 +-
 .../deployer/DefaultArtifactDeployer.java   |  2 +-
 .../DefaultRepositoryMetadataManager.java   |  9 +-
 .../artifact/resolver/ArtifactResolver.java |  6 +-
 .../resolver/DebugResolutionListener.java   |  2 +-
 .../resolver/DefaultArtifactResolver.java   | 18 ++--
 .../resolver/filter/OrArtifactFilter.java   |  4 +-
 .../maven/profiles/DefaultProfileManager.java   | 16 ++--
 .../apache/maven/profiles/ProfileManager.java   |  4 +-
 .../project/DefaultMavenProjectBuilder.java |  2 +-
 .../org/apache/maven/project/ModelUtils.java| 22 ++---
 .../org/apache/maven/project/ProjectUtils.java  |  2 +-
 .../DefaultModelInheritanceAssembler.java   | 58 ++--
 .../AbstractStringBasedModelInterpolator.java   | 11 +--
 .../StringSearchModelInterpolator.java  | 15 ++--
 .../project/path/DefaultPathTranslator.java |  4 +-
 .../validation/ModelValidationResult.java   |  2 +-
 .../apache/maven/repository/MetadataGraph.java  |  2 +-
 .../maven/repository/MetadataGraphNode.java |  4 +-
 .../repository/MetadataResolutionResult.java|  6 +-
 .../repository/legacy/DefaultWagonManager.java  |  6 +-
 .../legacy/LegacyRepositorySystem.java  | 16 ++--
 .../legacy/TransferListenerAdapter.java |  4 +-
 .../DefaultLegacyArtifactCollector.java | 14 +--
 .../resolver/LegacyArtifactCollector.java   |  6 +-
 .../repository/metadata/ClasspathContainer.java |  2 +-
 .../DefaultClasspathTransformation.java |  2 +-
 .../metadata/DefaultGraphConflictResolver.java  |  4 +-
 .../repository/metadata/MetadataGraph.java  | 12 +--
 .../usability/plugin/ExpressionDocumenter.java  | 10 +--
 .../AbstractArtifactComponentTestCase.java  |  2 +-
 .../maven/artifact/ArtifactUtilsTest.java   |  4 +-
 .../artifact/metadata/TestMetadataSource.java   |  2 +-
 .../ArtifactResolutionExceptionTest.java|  2 +-
 .../artifact/resolver/ArtifactResolverTest.java |  9 +-
 .../artifact/resolver/TestTransferListener.java |  2 +-
 .../artifact/testutils/TestFileManager.java |  2 +-
 .../project/ClasspathArtifactResolver.java  |  2 +-
 .../maven/project/EmptyLifecycleExecutor.java   |  2 +-
 .../project/EmptyLifecyclePluginAnalyzer.java   |  2 +-
 .../apache/maven/project/ModelUtilsTest.java|  1 -
 .../maven/project/ProjectClasspathTest.java |  1 -
 .../inheritance/t00/ProjectInheritanceTest.java |  1 -
 .../inheritance/t02/ProjectInheritanceTest.java |  6 +-
 .../inheritance/t04/ProjectInheritanceTest.java |  1 -
 .../inheritance/t05/ProjectInheritanceTest.java |  1 -
 .../inheritance/t07/ProjectInheritanceTest.java |  1 -
 .../legacy/DefaultWagonManagerTest.java |  4 +-
 .../maven/repository/legacy/StringWagon.java|  2 +-
 .../resolver/DefaultArtifactCollectorTest.java  | 59 ++--
 .../conflict/AbstractConflictResolverTest.java  | 26 +++---
 .../conflict/FarthestConflictResolverTest.java  | 23 +++--
 .../conflict/NearestConflictResolverTest.java   | 23 +++--
 .../conflict/NewestConflictResolverTest.java| 23 +++--
 .../conflict/OldestConflictResolverTest.java| 24 +++--
 .../repository/metadata/TestMetadataSource.java | 10 +--
 

[3/6] maven git commit: Upgraded to java7 language features

[krosenvold]

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java 
b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
index a417219..bf053cc 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
@@ -69,7 +69,7 @@ public class MojoExecution
  * The executions to fork before this execution, indexed by the 
groupId:artifactId:version of the project on which
  * the forked execution are to be run and in reactor build order.
  */
-private MapString, ListMojoExecution forkedExecutions = new 
LinkedHashMapString, ListMojoExecution();
+private MapString, ListMojoExecution forkedExecutions = new 
LinkedHashMap();
 
 public MojoExecution( Plugin plugin, String goal, String executionId )
 {

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
index f397c1e..bb55eb9 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
@@ -39,7 +39,7 @@ public class DefaultLegacySupport
 {
 
 private static final ThreadLocalAtomicReferenceMavenSession SESSION =
-new InheritableThreadLocalAtomicReferenceMavenSession();
+new InheritableThreadLocal();
 
 public void setSession( MavenSession session )
 {
@@ -55,7 +55,7 @@ public class DefaultLegacySupport
 }
 else
 {
-DefaultLegacySupport.SESSION.set( new 
AtomicReferenceMavenSession( session ) );
+DefaultLegacySupport.SESSION.set( new AtomicReference( session ) 
);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index 5b0c271..b79b15f 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -107,7 +107,7 @@ public class DefaultPluginDependenciesResolver
 String requiredMavenVersion = (String) result.getProperties().get( 
prerequisites.maven );
 if ( requiredMavenVersion != null )
 {
-MapString, String props = new LinkedHashMapString, String( 
pluginArtifact.getProperties() );
+MapString, String props = new LinkedHashMap( 
pluginArtifact.getProperties() );
 props.put( requiredMavenVersion, requiredMavenVersion );
 pluginArtifact = pluginArtifact.setProperties( props );
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
--
diff --git 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
index 015060f..e2f4526 100644
--- 
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
+++ 
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
@@ -248,11 +248,7 @@ public class DefaultPluginManager
 {
 throw new PluginNotFoundException( plugin, 
project.getPluginArtifactRepositories() );
 }
-catch ( PluginDescriptorParsingException e )
-{
-throw new PluginManagerException( plugin, e.getMessage(), e );
-}
-catch ( InvalidPluginDescriptorException e )
+catch ( PluginDescriptorParsingException | 
InvalidPluginDescriptorException e )
 {
 throw new PluginManagerException( plugin, e.getMessage(), e );
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/7badeb5b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependencyResolutionListener.java
--
diff --git 

[2/2] maven git commit: try-with-resources

[krosenvold]

try-with-resources

Reformatted to code style by me. This fixes #53


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

Branch: refs/heads/master
Commit: 7f206ef1cc11585094cb045db4ec35fcbb1715a1
Parents: 36b8a6d
Author: sugartxy tgt...@163.com
Authored: Fri Jun 19 17:10:43 2015 +0800
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sat Jun 20 14:32:46 2015 +0200

--
 .../maven/settings/GlobalSettingsTest.java  |   9 +-
 .../repository/internal/MavenMetadata.java  |  33 +---
 .../apache/maven/building/FileSourceTest.java   |  24 +--
 .../apache/maven/building/StringSourceTest.java |  23 +--
 .../apache/maven/building/UrlSourceTest.java|  26 +--
 .../DefaultRepositoryMetadataManager.java   |  97 --
 .../profiles/DefaultMavenProfilesBuilder.java   |  18 +-
 .../legacy/DefaultUpdateCheckManager.java   |  52 +++---
 .../usability/plugin/ExpressionDocumenter.java  |  58 +++---
 .../AbstractArtifactComponentTestCase.java  |  62 ---
 .../metadata/AbstractRepositoryMetadata.java|  51 ++
 .../extension/internal/CoreExtensionEntry.java  |  22 +--
 .../DefaultRepositorySystemSessionFactory.java  |  49 +++--
 .../internal/DefaultMavenPluginManager.java | 123 ++---
 .../project/ExtensionDescriptorBuilder.java |  16 +-
 .../maven/project/ProjectBuildingException.java |  33 ++--
 .../internal/DefaultRuntimeInformation.java |  44 ++---
 .../toolchain/DefaultToolchainsBuilder.java |  21 +--
 .../PomConstructionWithSettingsTest.java|  45 +++--
 .../maven/toolchain/DefaultToolchainTest.java   |  48 ++---
 .../merge/MavenToolchainMergerTest.java | 101 +++---
 .../org/apache/maven/cli/CLIReportingUtils.java |  29 +--
 .../java/org/apache/maven/cli/MavenCli.java | 183 +--
 .../DefaultInheritanceAssemblerTest.java|  29 +--
 .../plugin/descriptor/PluginDescriptor.java |  44 ++---
 25 files changed, 517 insertions(+), 723 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
--
diff --git 
a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java 
b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
index 5176ef0..0d0543e 100644
--- 
a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
+++ 
b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
@@ -19,15 +19,14 @@ package org.apache.maven.settings;
  * under the License.
  */
 
+import junit.framework.TestCase;
+import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 
-import junit.framework.TestCase;
-
-import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
-
 /**
  * Tests that the global settings.xml shipped with the distribution is in good 
state.
  *
@@ -45,7 +44,7 @@ public class GlobalSettingsTest
 File globalSettingsFile = new File( basedir, src/conf/settings.xml );
 assertTrue( globalSettingsFile.getAbsolutePath(), 
globalSettingsFile.isFile() );
 
-try (Reader reader = new InputStreamReader( new FileInputStream( 
globalSettingsFile ), UTF-8 ))
+try ( Reader reader = new InputStreamReader( new FileInputStream( 
globalSettingsFile ), UTF-8 ) )
 {
 new SettingsXpp3Reader().read( reader );
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
--
diff --git 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
index bdf2878..aef44f6 100644
--- 
a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
+++ 
b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
@@ -19,17 +19,9 @@ package org.apache.maven.repository.internal;
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Collections;
-import java.util.Map;
-
 import org.apache.maven.artifact.repository.metadata.Metadata;
 import 
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
 import 

[1/2] maven git commit: try-with-resources

[krosenvold]

Repository: maven
Updated Branches:
  refs/heads/master 36b8a6d56 - 7f206ef1c


http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
index 3bba817..eeb07cf 100644
--- 
a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java
@@ -19,38 +19,38 @@ package org.apache.maven.toolchain;
  * under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.verify;
-
-import java.io.InputStream;
-import java.util.Collections;
-
 import org.apache.maven.toolchain.java.DefaultJavaToolChain;
 import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.apache.maven.toolchain.model.ToolchainModel;
 import org.apache.maven.toolchain.model.io.xpp3.MavenToolchainsXpp3Reader;
 import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.IOUtil;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import java.io.InputStream;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
+
 public class DefaultToolchainTest
 {
 @Mock
 private Logger logger;
-
+
 private MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader();
-
+
 @Before
-public void setUp() throws Exception
+public void setUp()
+throws Exception
 {
 MockitoAnnotations.initMocks( this );
 }
-
+
 private DefaultToolchain newDefaultToolchain( ToolchainModel model )
 {
 return new DefaultToolchain( model, logger )
@@ -102,14 +102,14 @@ public class DefaultToolchainTest
 DefaultToolchain toolchain = newDefaultToolchain( model );
 assertEquals( logger, toolchain.getLog() );
 }
-
+
 @Test
 public void testMissingRequirementProperty()
 {
 ToolchainModel model = new ToolchainModel();
 model.setType( TYPE );
 DefaultToolchain toolchain = newDefaultToolchain( model );
-
+
 assertFalse( toolchain.matchesRequirements( Collections.singletonMap( 
name, John Doe ) ) );
 verify( logger ).debug( Toolchain type:TYPE{} is missing required 
property: name );
 }
@@ -122,22 +122,19 @@ public class DefaultToolchainTest
 model.setType( TYPE );
 DefaultToolchain toolchain = newDefaultToolchain( model );
 toolchain.addProvideToken( name, 
RequirementMatcherFactory.createExactMatcher( Jane Doe ) );
-
+
 assertFalse( toolchain.matchesRequirements( Collections.singletonMap( 
name, John Doe ) ) );
 verify( logger ).debug( Toolchain type:TYPE{name = Jane Doe} doesn't 
match required property: name );
 }
 
 
 @Test
-public void testEquals() throws Exception
+public void testEquals()
+throws Exception
 {
-InputStream jdksIS = null;
-InputStream jdksExtraIS = null;
-try
+try ( InputStream jdksIS = ToolchainModel.class.getResourceAsStream( 
toolchains-jdks.xml );
+  InputStream jdksExtraIS = 
ToolchainModel.class.getResourceAsStream( toolchains-jdks-extra.xml ) )
 {
-jdksIS = ToolchainModel.class.getResourceAsStream( 
toolchains-jdks.xml );
-jdksExtraIS = ToolchainModel.class.getResourceAsStream( 
toolchains-jdks-extra.xml );
-
 PersistedToolchains jdks = reader.read( jdksIS );
 PersistedToolchains jdksExtra = reader.read( jdksExtraIS );
 
@@ -149,10 +146,5 @@ public class DefaultToolchainTest
 assertFalse( tc2.equals( tc1 ) );
 assertTrue( tc2.equals( tc2 ) );
 }
-finally
-{
-IOUtil.close( jdksIS );
-IOUtil.close( jdksExtraIS );
-}
 }
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/7f206ef1/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
--
diff --git 
a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
 
b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
index 9183e17..536e1a6 100644
--- 
a/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
+++ 
b/maven-core/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
@@ -19,18 

[1/5] maven-integration-testing git commit: Added some missing license headers

[krosenvold]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master ef7b0d378 - 3987b9fd6


Added some missing license headers


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/4b717265
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/4b717265
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/4b717265

Branch: refs/heads/master
Commit: 4b7172658ea22c83425809eb56eeb15352656766
Parents: ef7b0d3
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sat Jun 20 13:55:50 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sat Jun 20 13:58:00 2015 +0200

--
 README.md   | 18 +
 .../META-INF/maven/archetype-metadata.xml   | 21 +++-
 .../src/main/resources/rule_set.xml | 18 +
 .../checkstyle-test/src/main/java/Class.java| 19 ++
 .../src/main/resources/rule_set.xml | 18 +
 .../src/main/resources/stc_checks.xml   | 18 +
 .../checkstyle-test/src/main/java/Class.java| 18 +
 run-its.sh  | 19 ++
 src/site/apt/index.apt  | 21 
 9 files changed, 169 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/4b717265/README.md
--
diff --git a/README.md b/README.md
index 214cbf2..47233cb 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,21 @@
+!---
+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.
+--
 Maven Core Integration Tests
 
 

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/4b717265/core-it-support/maven-it-sample-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
--
diff --git 
a/core-it-support/maven-it-sample-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 
b/core-it-support/maven-it-sample-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 4aba45d..9efaf7a 100644
--- 
a/core-it-support/maven-it-sample-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ 
b/core-it-support/maven-it-sample-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,4 +1,23 @@
-?xml version=1.0 encoding=UTF-8?archetype-descriptor 
name=maven-it-sample
+?xml version=1.0 encoding=UTF-8?
+!--
+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.
+--
+archetype-descriptor name=maven-it-sample
   fileSets
 fileSet filtered=true packaged=true encoding=UTF-8
   directorysrc/test/java/directory

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/4b717265/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-/checkstyle-assembly/src/main/resources/rule_set.xml
--
diff --git 
a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-/checkstyle-assembly/src/main/resources/rule_set.xml
 

[4/5] maven-integration-testing git commit: Java7 here too...

[krosenvold]

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
index 15914aa..fd686de 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -29,7 +28,7 @@ import java.util.Properties;
 
 /**
  * This is a test set for a 
href=http://jira.codehaus.org/browse/MNG-4415;MNG-4415/a.
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class MavenITmng4415InheritedPluginOrderTest
@@ -62,7 +61,7 @@ public class MavenITmng4415InheritedPluginOrderTest
 Properties props = verifier.loadProperties( target/it.properties );
 assertNotNull( props.getProperty( project.build.plugins ) );
 
-ListString expected = new ArrayListString();
+ListString expected = new ArrayList();
 expected.add( maven-it-plugin-error );
 expected.add( maven-it-plugin-configuration );
 expected.add( maven-it-plugin-dependency-resolution );
@@ -72,7 +71,7 @@ public class MavenITmng4415InheritedPluginOrderTest
 expected.add( maven-it-plugin-fork );
 expected.add( maven-it-plugin-touch );
 
-ListString actual = new ArrayListString();
+ListString actual = new ArrayList();
 
 int count = Integer.parseInt( props.getProperty( 
project.build.plugins ) );
 for ( int i = 0; i  count; i++ )

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
index e0d23d4..d8e90b1 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
@@ -29,7 +28,7 @@ import java.util.Properties;
 
 /**
  * This is a test set for a 
href=http://jira.codehaus.org/browse/MNG-4416;MNG-4416/a.
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class MavenITmng4416PluginOrderAfterProfileInjectionTest
@@ -62,7 +61,7 @@ public class 
MavenITmng4416PluginOrderAfterProfileInjectionTest
 Properties props = verifier.loadProperties( target/it.properties );
 assertNotNull( props.getProperty( project.build.plugins ) );
 
-ListString expected = new ArrayListString();
+ListString expected = new ArrayList();
 expected.add( maven-it-plugin-error );
 expected.add( maven-it-plugin-configuration );
 expected.add( maven-it-plugin-dependency-resolution );
@@ -72,7 +71,7 @@ public class 
MavenITmng4416PluginOrderAfterProfileInjectionTest
 expected.add( maven-it-plugin-fork );
 expected.add( maven-it-plugin-touch );
 
-ListString actual = new ArrayListString();
+ListString actual = new ArrayList();
 
 int count = Integer.parseInt( props.getProperty( 
project.build.plugins ) );
 for ( int i = 0; i  count; i++ )

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
--
diff --git 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
index 159ed13..c480560 100644
--- 
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
+++ 
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java
@@ -19,7 +19,6 @@ package org.apache.maven.it;
  * under the License.
  */
 
-import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 

[5/5] maven-integration-testing git commit: Java7 here too...

[krosenvold]

Java7 here too...


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/3987b9fd
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/3987b9fd
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/3987b9fd

Branch: refs/heads/master
Commit: 3987b9fd608eee83a43133ad6b1e332da3d9f236
Parents: 4b71726
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sat Jun 20 15:26:59 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sat Jun 20 15:27:14 2015 +0200

--
 .../java/org/apache/maven/it/HttpServer.java| 52 +--
 .../test/java/org/apache/maven/it/ItUtils.java  | 13 +--
 .../it/MavenIT0090EnvVarInterpolationTest.java  |  3 +-
 .../MavenIT0144LifecycleExecutionOrderTest.java |  6 +-
 .../it/MavenITmng0187CollectedProjectsTest.java | 18 ++--
 ...ITmng1021EqualAttachmentBuildNumberTest.java |  7 +-
 ...omValidationErrorIncludesLineNumberTest.java |  5 +-
 .../MavenITmng2362DeployedPomEncodingTest.java  | 10 +--
 ...ITmng2739RequiredRepositoryElementsTest.java | 18 ++--
 .../maven/it/MavenITmng2820PomCommentsTest.java |  8 +-
 .../it/MavenITmng2883LegacyRepoOfflineTest.java | 33 ---
 .../maven/it/MavenITmng3220ImportScopeTest.java | 14 +--
 ...avenITmng3415JunkRepositoryMetadataTest.java | 94 ++--
 ...dataUpdatedFromDeploymentRepositoryTest.java | 23 ++---
 ...MavenITmng3710PollutedClonedPluginsTest.java | 21 ++---
 .../MavenITmng3719PomExecutionOrderingTest.java | 10 +--
 .../it/MavenITmng3732ActiveProfilesTest.java| 11 ++-
 ...807PluginConfigExpressionEvaluationTest.java |  5 +-
 .../it/MavenITmng3843PomInheritanceTest.java| 31 ---
 .../MavenITmng3940EnvVarInterpolationTest.java  | 12 +--
 .../MavenITmng4091BadPluginDescriptorTest.java  |  7 +-
 ...venITmng4180PerDependencyExclusionsTest.java |  5 +-
 .../it/MavenITmng4190MirrorRepoMergingTest.java |  5 +-
 ...ng4203TransitiveDependencyExclusionTest.java |  5 +-
 ...Tmng4235HttpAuthDeploymentChecksumsTest.java | 10 +--
 .../it/MavenITmng4275RelocationWarningTest.java | 13 +--
 ...6LocalSnapshotSuppressesRemoteCheckTest.java | 25 +++---
 ...uginDependencyResolutionFromPomRepoTest.java | 11 +--
 ...4368TimestampAwareArtifactInstallerTest.java | 22 ++---
 ...Tmng4403LenientDependencyPomParsingTest.java |  5 +-
 .../MavenITmng4415InheritedPluginOrderTest.java |  7 +-
 ...416PluginOrderAfterProfileInjectionTest.java |  7 +-
 ...precatedPomInterpolationExpressionsTest.java | 11 ++-
 ...g4470AuthenticatedDeploymentToProxyTest.java | 34 ---
 ...mng4555MetaversionResolutionOfflineTest.java | 19 ++--
 .../it/MavenITmng4666CoreRealmImportTest.java   | 10 +--
 ...4696MavenProjectDependencyArtifactsTest.java |  5 +-
 .../MavenITmng4745PluginVersionUpdateTest.java  | 10 +--
 ...solutionOfDependenciesDuringReactorTest.java |  5 +-
 .../it/MavenITmng5214DontMapWsdlToJar.java  | 25 +++---
 .../it/MavenITmng5224InjectedSettings.java  |  4 +-
 ...avenITmng5452MavenBuildTimestampUTCTest.java |  5 +-
 ...enITmng5608ProfileActivationWarningTest.java | 10 +--
 ...enITmng5639ImportScopePomResolutionTest.java |  4 -
 .../apache/maven/it/TunnelingProxyServer.java   |  6 +-
 .../component/DefaultStatefulSingleton.java |  9 +-
 .../plugin/coreit/CheckThreadSafetyMojo.java| 30 +++
 .../plugin/coreit/DumpRepoLayoutsMojo.java  | 20 ++---
 .../apache/maven/plugin/coreit/CollectMojo.java | 23 +++--
 .../plugin/coreit/CustomRepositoryLayout.java   |  2 +-
 .../apache/maven/plugin/coreit/DeployMojo.java  | 19 ++--
 .../plugin/coreit/InstallArtifactsMojo.java | 11 ++-
 .../apache/maven/plugin/coreit/InstallMojo.java | 17 ++--
 .../apache/maven/plugin/coreit/ResolveMojo.java | 30 +++
 .../plugin/coreit/ResolveTransitiveMojo.java| 46 --
 .../maven/plugin/coreit/AbstractLoadMojo.java   | 29 +++---
 .../plugin/coreit/AssignmentCompatibleMojo.java | 14 ++-
 .../maven/plugin/coreit/ExpressionUtil.java | 21 ++---
 .../maven/plugin/coreit/InstanceofMojo.java | 26 +++---
 .../maven/plugin/coreit/ExpressionUtilTest.java | 18 ++--
 .../apache/maven/plugin/coreit/ConfigMojo.java  | 85 +-
 .../maven/plugin/coreit/PropertiesUtil.java | 19 ++--
 .../maven/plugin/coreit/ResourcesMojo.java  | 25 +++---
 .../plugin/coreit/AbstractDependencyMojo.java   | 15 ++--
 .../maven/plugin/coreit/AggregateTestMojo.java  | 22 +++--
 .../plugin/coreit/AbstractDependencyMojo.java   | 49 +-
 .../maven/plugin/coreit/AggregateTestMojo.java  | 26 +++---
 .../apache/maven/plugin/coreit/InjectMojo.java  | 33 ---
 .../plugin/coreit/ResolveOneDependencyMojo.java | 55 ++--
 .../apache/maven/plugin/coreit/EvalMojo.java| 41 -
 .../maven/plugin/coreit/ExpressionUtil.java | 32 +++
 .../maven/plugin/coreit/PropertyUtil.java   | 39 

[2/5] maven-integration-testing git commit: Java7 here too...

[krosenvold]

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java
--
diff --git 
a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java
 
b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java
index cdeeb1b..8efdb9b 100644
--- 
a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java
+++ 
b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java
@@ -33,12 +33,11 @@ import java.util.Properties;
 
 /**
  * Dumps the authentication info registered with the wagon manager for a 
server to a properties file.
- * 
- * @goal dump-auth
- * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  * @version $Id$
+ * @goal dump-auth
+ * @phase validate
  */
 public class DumpAuthMojo
 extends AbstractMojo
@@ -46,7 +45,7 @@ public class DumpAuthMojo
 
 /**
  * Project base directory used for manual path alignment.
- * 
+ *
  * @parameter default-value=${basedir}
  * @readonly
  */
@@ -54,28 +53,28 @@ public class DumpAuthMojo
 
 /**
  * The Wagon manager used to retrieve authentication infos.
- * 
+ *
  * @component
  */
 private WagonManager wagonManager;
 
 /**
  * The path to the properties file used to dump the auth infos.
- * 
+ *
  * @parameter property=wagon.propertiesFile
  */
 private File propertiesFile;
 
 /**
  * The set of server identifiers whose auth infos should be dumped.
- * 
+ *
  * @parameter
  */
 private String[] serverIds;
 
 /**
  * Runs this mojo.
- * 
+ *
  * @throws MojoFailureException If the output file could not be created.
  */
 public void execute()
@@ -83,9 +82,8 @@ public class DumpAuthMojo
 {
 Properties authProperties = new Properties();
 
-for ( int i = 0; i  serverIds.length; i++ )
+for ( String serverId : serverIds )
 {
-String serverId = serverIds[i];
 getLog().info( [MAVEN-CORE-IT-LOG] Getting authentication info 
for server  + serverId );
 
 AuthenticationInfo authInfo = wagonManager.getAuthenticationInfo( 
serverId );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java
--
diff --git 
a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java
 
b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java
index 00e8987..62161b4 100644
--- 
a/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java
+++ 
b/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java
@@ -37,12 +37,11 @@ import java.util.Properties;
 /**
  * Loads resources from a class loader used to load a wagon provider. The 
wagon is merely used to access the extension
  * class loader it came from which is otherwise not accessible to a plugin.
- * 
- * @goal load-resource
- * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  * @version $Id$
+ * @goal load-resource
+ * @phase validate
  */
 public class LoadResourceMojo
 extends AbstractMojo
@@ -50,14 +49,14 @@ public class LoadResourceMojo
 
 /**
  * The Wagon manager used to retrieve wagon providers.
- * 
+ *
  * @component
  */
 private WagonManager wagonManager;
 
 /**
  * The path to the properties file used to track the results of the 
resource loading via the wagon's class loader.
- * 
+ *
  * @parameter property=wagon.wagonClassLoaderOutput
  */
 private File wagonClassLoaderOutput;
@@ -65,14 +64,14 @@ public class LoadResourceMojo
 /**
  * The role hint for the wagon provider to load. The class loader of this 
provider will be used to load the
  * resources.
- * 
+ *
  * @parameter property=wagon.wagonProtocol
  */
 private String wagonProtocol;
 
 /**
  * The repository to load the wagon for, if applicable.
- * 
+ *
  * @parameter property=wagon.repositoryId
  */
 private String repositoryId;
@@ -82,14 +81,14 @@ public class LoadResourceMojo
  * loaded, the generated properties files will contain a key named 
codeARP/code whose value gives the URL to the
  * 

[3/5] maven-integration-testing git commit: Java7 here too...

[krosenvold]

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
--
diff --git 
a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
 
b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
index db7b026..caf27d8 100644
--- 
a/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
+++ 
b/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
@@ -19,6 +19,9 @@ package org.apache.maven.plugin.coreit;
  * under the License.
  */
 
+import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.configuration.PlexusConfiguration;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -34,12 +37,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.maven.plugin.MojoExecutionException;
-import org.codehaus.plexus.configuration.PlexusConfiguration;
-
 /**
  * Assists in handling properties.
- * 
+ *
  * @author Benjamin Bentmann
  */
 class PropertiesUtil
@@ -164,18 +164,17 @@ class PropertiesUtil
 
 PlexusConfiguration children[] = config.getChildren();
 props.setProperty( key + .children, Integer.toString( 
children.length ) );
-Map indices = new HashMap();
-for ( int i = 0; i  children.length; i++ )
+MapString, Integer indices = new HashMap();
+for ( PlexusConfiguration child : children )
 {
-PlexusConfiguration child = children[i];
 String name = child.getName();
-Integer index = (Integer) indices.get( name );
+Integer index = indices.get( name );
 if ( index == null )
 {
-index = new Integer( 0 );
+index = 0;
 }
 serialize( props, key + .children. + name + . + index, 
child );
-indices.put( name, new Integer( index.intValue() + 1 ) );
+indices.put( name, index + 1 );
 }
 }
 else if ( value instanceof Date )

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3987b9fd/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
--
diff --git 
a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
 
b/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
index 29c8b72..ab4d2ac 100644
--- 
a/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
+++ 
b/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
@@ -31,12 +31,11 @@ import java.io.OutputStreamWriter;
 
 /**
  * Creates a text file in the project base directory.
- * 
- * @goal resources
- * @phase process-resources
- * 
+ *
  * @author Benjamin Bentmann
  * @version $Id$
+ * @goal resources
+ * @phase process-resources
  */
 public class ResourcesMojo
 extends AbstractMojo
@@ -44,7 +43,7 @@ public class ResourcesMojo
 
 /**
  * The current Maven project.
- * 
+ *
  * @parameter default-value=${project}
  * @required
  * @readonly
@@ -53,7 +52,7 @@ public class ResourcesMojo
 
 /**
  * The path to the output file, relative to the project base directory 
directory.
- * 
+ *
  * @parameter
  */
 private String pathname = target/resources-resources.txt;
@@ -61,16 +60,16 @@ public class ResourcesMojo
 /**
  * An optional message line to write to the output file (using UTF-8 
encoding). If given, the output file will be
  * opened in append mode.
- * 
+ *
  * @parameter
  */
 private String message;
 
 /**
  * Runs this mojo.
- * 
+ *
  * @throws MojoExecutionException If the output file could not be created.
- * @throws MojoFailureException If the output file has not been set.
+ * @throws MojoFailureException   If the output file has not been set.
  */
 public void execute()
 throws MojoExecutionException, MojoFailureException
@@ -98,16 +97,12 @@ public class ResourcesMojo
 {

maven git commit: More java7. Bye bye 2006

[krosenvold]

Repository: maven
Updated Branches:
  refs/heads/master 7f206ef1c - cfd1fbe61


More java7. Bye bye 2006


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

Branch: refs/heads/master
Commit: cfd1fbe6131eb9f03f0af0f5942863bc5ef4f2aa
Parents: 7f206ef
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sat Jun 20 15:21:10 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sat Jun 20 15:21:10 2015 +0200

--
 .../metadata/GroupRepositoryMetadata.java   |  6 +--
 .../maven/profiles/DefaultProfileManager.java   | 26 +
 .../apache/maven/profiles/ProfileManager.java   |  6 +--
 .../DefaultLegacyArtifactCollector.java |  8 ++--
 .../ArtifactTransformationManager.java  |  2 +-
 .../DefaultArtifactTransformationManager.java   |  2 +-
 .../usability/plugin/ExpressionDocumenter.java  | 10 ++---
 .../artifact/resolver/ArtifactResolverTest.java |  2 +-
 .../maven/lifecycle/mapping/LifecyclePhase.java |  2 +-
 .../org/apache/maven/plugin/PluginManager.java  |  2 +-
 .../internal/DefaultMavenPluginManager.java | 41 ++--
 .../plugin/internal/DefaultPluginManager.java   |  6 +--
 .../validation/DefaultSettingsValidator.java|  2 +-
 13 files changed, 44 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven/blob/cfd1fbe6/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
index 490b47f..fd88ddc 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
@@ -75,11 +75,11 @@ public class GroupRepositoryMetadata
   String artifactId,
   String name )
 {
-List plugins = getMetadata().getPlugins();
+ListPlugin plugins = getMetadata().getPlugins();
 boolean found = false;
-for ( Iterator i = plugins.iterator(); i.hasNext()  !found; )
+for ( IteratorPlugin i = plugins.iterator(); i.hasNext()  !found; )
 {
-Plugin plugin = (Plugin) i.next();
+Plugin plugin = i.next();
 if ( plugin.getPrefix().equals( goalPrefix ) )
 {
 found = true;

http://git-wip-us.apache.org/repos/asf/maven/blob/cfd1fbe6/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
--
diff --git 
a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
 
b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
index 9cbd7c8..7a9ec09 100644
--- 
a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
+++ 
b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
@@ -93,7 +93,7 @@ public class DefaultProfileManager
 return requestProperties;
 }
 
-public Map getProfilesById()
+public MapString, Profile getProfilesById()
 {
 return profilesById;
 }
@@ -138,13 +138,11 @@ public class DefaultProfileManager
 /* (non-Javadoc)
 * @see 
org.apache.maven.profiles.ProfileManager#explicitlyActivate(java.util.List)
 */
-public void explicitlyActivate( List profileIds )
+public void explicitlyActivate( ListString profileIds )
 {
-for ( Object profileId1 : profileIds )
+for ( String profileId1 : profileIds )
 {
-String profileId = (String) profileId1;
-
-explicitlyActivate( profileId );
+explicitlyActivate( profileId1 );
 }
 }
 
@@ -164,13 +162,11 @@ public class DefaultProfileManager
 /* (non-Javadoc)
 * @see 
org.apache.maven.profiles.ProfileManager#explicitlyDeactivate(java.util.List)
 */
-public void explicitlyDeactivate( List profileIds )
+public void explicitlyDeactivate( ListString profileIds )
 {
-for ( Object profileId1 : profileIds )
+for ( String profileId1 : profileIds )
 {
-String profileId = (String) profileId1;
-
-explicitlyDeactivate( profileId );
+explicitlyDeactivate( profileId1 );
 }
 }
 
@@ -212,13 +208,11 @@ public class 

maven-integration-testing git commit: Fixed testcase

[krosenvold]

Repository: maven-integration-testing
Updated Branches:
  refs/heads/master 3987b9fd6 - c28c27949


Fixed testcase


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/c28c2794
Tree: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/c28c2794
Diff: 
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/c28c2794

Branch: refs/heads/master
Commit: c28c279496ec182a95aca656061434bb0c82542b
Parents: 3987b9f
Author: Kristian Rosenvold krosenv...@apache.org
Authored: Sat Jun 20 21:54:04 2015 +0200
Committer: Kristian Rosenvold krosenv...@apache.org
Committed: Sat Jun 20 21:54:04 2015 +0200

--
 .../mng-5805-pkg-type-mojo-configuration/plugin/pom.xml   | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/c28c2794/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
--
diff --git 
a/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
 
b/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
index 6a30131..bb27d57 100644
--- 
a/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
+++ 
b/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/plugin/pom.xml
@@ -28,27 +28,23 @@ under the License.
   version0.1/version
   packagingmaven-plugin/packaging
 
-  properties
-maven-version3.3.1/maven-version
-  /properties
-
   dependencies
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-plugin-api/artifactId
-  version${maven-version}/version
+  version${maven.version}/version
   scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-model/artifactId
-  version${maven-version}/version
+  version${maven.version}/version
   scopeprovided/scope
 /dependency
 dependency
   groupIdorg.apache.maven/groupId
   artifactIdmaven-core/artifactId
-  version${maven-version}/version
+  version${maven.version}/version
   scopeprovided/scope
 /dependency
   /dependencies

svn commit: r1685987 - /maven/pom/trunk/asf/pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Jun 17 10:13:27 2015
New Revision: 1685987

URL: http://svn.apache.org/r1685987
Log:
Updated to latest assembly plugin

Modified:
maven/pom/trunk/asf/pom.xml

Modified: maven/pom/trunk/asf/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1685987r1=1685986r2=1685987view=diff
==
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Jun 17 10:13:27 2015
@@ -118,7 +118,7 @@ under the License.
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-assembly-plugin/artifactId
-  version2.4.1/version
+  version2.5.5/version
 /plugin
 plugin
   groupIdorg.apache.maven.plugins/groupId

svn commit: r1686055 - /maven/shared/trunk/maven-shared-utils/pom.xml

[krosenvold]

Author: krosenvold
Date: Wed Jun 17 15:37:05 2015
New Revision: 1686055

URL: http://svn.apache.org/r1686055
Log:
Assembly 2.5.5 for build. This makes symlinks included in source zip

Modified:
maven/shared/trunk/maven-shared-utils/pom.xml

Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1686055r1=1686054r2=1686055view=diff
==
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Wed Jun 17 15:37:05 2015
@@ -136,6 +136,11 @@
 /executions
   /plugin
   plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-assembly-plugin/artifactId
+version2.5.5/version
+  /plugin
+  plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdfindbugs-maven-plugin/artifactId
 configuration

svn commit: r1685886 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java src/test/java/org/apache/maven

[krosenvold]

Author: krosenvold
Date: Tue Jun 16 18:26:29 2015
New Revision: 1685886

URL: http://svn.apache.org/r1685886
Log:
Upgraded to plexus-archiver 3.0.1

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1685886r1=1685885r2=1685886view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Jun 16 18:26:29 2015
@@ -128,7 +128,7 @@ under the License.
 dependency
   groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-archiver/artifactId
-  version2.10.2/version
+  version3.0.1/version
 /dependency
 dependency
   groupIdorg.apache.maven.shared/groupId

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1685886r1=1685885r2=1685886view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
 Tue Jun 16 18:26:29 2015
@@ -146,9 +146,8 @@ public class AssemblyProxyArchiver
 inPublicApi.set( Boolean.TRUE );
 try
 {
-final DefaultArchivedFileSet fs = new DefaultArchivedFileSet();
+final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( 
archiveFile );
 
-fs.setArchive( archiveFile );
 fs.setIncludes( includes );
 fs.setExcludes( excludes );
 fs.setPrefix( rootPrefix + prefix );
@@ -180,9 +179,8 @@ public class AssemblyProxyArchiver
 inPublicApi.set( Boolean.TRUE );
 try
 {
-final DefaultArchivedFileSet fs = new DefaultArchivedFileSet();
+final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( 
archiveFile );
 
-fs.setArchive( archiveFile );
 fs.setPrefix( rootPrefix + prefix );
 fs.setFileSelectors( selectors );
 
@@ -204,9 +202,8 @@ public class AssemblyProxyArchiver
 inPublicApi.set( Boolean.TRUE );
 try
 {
-final DefaultArchivedFileSet fs = new DefaultArchivedFileSet();
+final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( 
archiveFile );
 
-fs.setArchive( archiveFile );
 fs.setIncludes( includes );
 fs.setExcludes( excludes );
 fs.setPrefix( rootPrefix );
@@ -230,9 +227,8 @@ public class AssemblyProxyArchiver
 inPublicApi.set( Boolean.TRUE );
 try
 {
-final DefaultArchivedFileSet fs = new DefaultArchivedFileSet();
+final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( 
archiveFile );
 
-fs.setArchive( archiveFile );
 fs.setPrefix( rootPrefix );
 fs.setFileSelectors( selectors );
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java?rev=1685886r1=1685885r2=1685886view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java
 Tue Jun 16 18:26:29 2015
@@ -117,7 +117,7 @@ public class ReaderFormatterTest
 
 private PlexusIoVirtualFileResource dummyResource()
 {
-return new PlexusIoVirtualFileResource( new File( fud ) )
+return new PlexusIoVirtualFileResource( new File( fud ), fud )
 {
 };
 }

svn commit: r1685372 [2/3] - in /maven/shared/trunk/maven-artifact-transfer: ./ src/main/java/org/apache/maven/shared/artifact/deploy/ src/main/java/org/apache/maven/shared/artifact/deploy/internal/ s

[krosenvold]

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java?rev=1685372r1=1685371r2=1685372view=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java
 Sun Jun 14 09:40:45 2015
@@ -1,33 +1,33 @@
-package org.apache.maven.shared.artifact.repository;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * 
- */
-public class RepositoryManagerException extends Exception
-{
-
-public RepositoryManagerException( String message, Throwable cause )
-{
-super( message, cause );
-}
-
-}
+package org.apache.maven.shared.artifact.repository;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * 
+ */
+public class RepositoryManagerException extends Exception
+{
+
+public RepositoryManagerException( String message, Throwable cause )
+{
+super( message, cause );
+}
+
+}

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java?rev=1685372r1=1685371r2=1685372view=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java
 Sun Jun 14 09:40:45 2015
@@ -1,143 +1,143 @@
-package org.apache.maven.shared.artifact.repository.internal;
-
-/*
- * 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 org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.repository.RepositoryManager;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.annotations.Component;
-import 

svn commit: r1685372 [1/3] - in /maven/shared/trunk/maven-artifact-transfer: ./ src/main/java/org/apache/maven/shared/artifact/deploy/ src/main/java/org/apache/maven/shared/artifact/deploy/internal/ s

[krosenvold]

Author: krosenvold
Date: Sun Jun 14 09:40:45 2015
New Revision: 1685372

URL: http://svn.apache.org/r1685372
Log:
Removed windows-style line endings

Modified:
maven/shared/trunk/maven-artifact-transfer/pom.xml

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven302RepositoryManager.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManager.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/EclipseAetherFilterTransformer.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java

maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/SonatypeAetherFilterTransformer.java

maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java

maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManagerTest.java

Modified: maven/shared/trunk/maven-artifact-transfer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/pom.xml?rev=1685372r1=1685371r2=1685372view=diff
==
--- maven/shared/trunk/maven-artifact-transfer/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-transfer/pom.xml Sun Jun 14 09:40:45 2015
@@ -1,223 +1,223 @@
-?xml version='1.0' encoding='UTF-8'?
-!--
-  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.
---
-project xmlns:xsi=http

svn commit: r1685372 [3/3] - in /maven/shared/trunk/maven-artifact-transfer: ./ src/main/java/org/apache/maven/shared/artifact/deploy/ src/main/java/org/apache/maven/shared/artifact/deploy/internal/ s

[krosenvold]

Modified: 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java?rev=1685372r1=1685371r2=1685372view=diff
==
--- 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
 (original)
+++ 
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
 Sun Jun 14 09:40:45 2015
@@ -1,173 +1,173 @@
-package org.apache.maven.shared.artifact.resolve.internal;
-
-/*
- * 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.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactDescriptorException;
-import org.eclipse.aether.resolution.ArtifactDescriptorRequest;
-import org.eclipse.aether.resolution.ArtifactDescriptorResult;
-import org.eclipse.aether.resolution.ArtifactRequest;
-import org.eclipse.aether.resolution.ArtifactResolutionException;
-import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.resolution.DependencyRequest;
-import org.eclipse.aether.resolution.DependencyResolutionException;
-
-/**
- * 
- */
-@Component( role = ArtifactResolver.class, hint = maven31 )
-public class Maven31ArtifactResolver
-implements ArtifactResolver
-{
-@Requirement
-private RepositorySystem repositorySystem;
-
-public org.apache.maven.artifact.Artifact resolveArtifact( 
ProjectBuildingRequest buildingRequest,
-   
org.apache.maven.artifact.Artifact mavenArtifact,
-   
ListArtifactRepository remoteRepositories )
-throws ArtifactResolverException
-{
-Artifact aetherArtifact =
-(Artifact) Invoker.invoke( RepositoryUtils.class, toArtifact, 
org.apache.maven.artifact.Artifact.class,
-   mavenArtifact );
-
-@SuppressWarnings( unchecked )
-ListRemoteRepository aetherRepositories =
-(ListRemoteRepository) Invoker.invoke( RepositoryUtils.class, 
toRepos, List.class, remoteRepositories );
-
-RepositorySystemSession session =
-(RepositorySystemSession) Invoker.invoke( buildingRequest, 
getRepositorySession );
-
-try
-{
-// use descriptor to respect relocation
-ArtifactDescriptorRequest descriptorRequest =
-new ArtifactDescriptorRequest( aetherArtifact, 
aetherRepositories, null );
-
-ArtifactDescriptorResult descriptorResult =
-repositorySystem.readArtifactDescriptor( session, 
descriptorRequest );
-
-ArtifactRequest request = new ArtifactRequest( 
descriptorResult.getArtifact(), aetherRepositories, null );
-
-Artifact resolvedArtifact = repositorySystem.resolveArtifact( 
session, request ).getArtifact();
-
-return (org.apache.maven.artifact.Artifact) Invoker.invoke( 
RepositoryUtils.class, toArtifact,
- 

svn commit: r1685373 - /maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java

[krosenvold]

Author: krosenvold
Date: Sun Jun 14 09:43:41 2015
New Revision: 1685373

URL: http://svn.apache.org/r1685373
Log:
Fixed unused import

Modified:

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java

Modified: 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java?rev=1685373r1=1685372r2=1685373view=diff
==
--- 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
 (original)
+++ 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactTransitivityFilter.java
 Sun Jun 14 09:43:41 2015
@@ -19,14 +19,8 @@ package org.apache.maven.shared.artifact
  * under the License.
  */
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.DependencyResolutionResult;
 import org.apache.maven.project.ProjectBuilder;
@@ -34,9 +28,14 @@ import org.apache.maven.project.ProjectB
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingResult;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * This filter will exclude everything that is not a dependency of the 
selected artifact.
- * 
+ *
  * @author a href=mailto:bri...@apache.org;Brian Fox/a
  * @version $Id$
  */
@@ -49,22 +48,22 @@ public class ArtifactTransitivityFilter
 private SetString transitiveArtifacts;
 
 /**
- * Use {@link MavenSession#getProjectBuildingRequest()} to get the 
buildingRequest. 
+ * Use {@link 
org.apache.maven.execution.MavenSession#getProjectBuildingRequest()} to get the 
buildingRequest.
  * The projectBuilder should be resolved with CDI.
- * 
+ * p/
  * pre
  *   // For Mojo
  *   #64;Component
  *   private ProjectBuilder projectBuilder;
  *
  *   // For Components
- *   #64;Requirement // or #64;Inject  
+ *   #64;Requirement // or #64;Inject
  *   private ProjectBuilder projectBuilder;
  * /pre
- * 
- * @param artifact the artifact to resolve the dependencies from
+ *
+ * @param artifactthe artifact to resolve the dependencies from
  * @param buildingRequest the buildingRequest
- * @param projectBuilder the projectBuilder
+ * @param projectBuilder  the projectBuilder
  * @throws ProjectBuildingException if the project descriptor could not be 
successfully built
  */
 public ArtifactTransitivityFilter( Artifact artifact, 
ProjectBuildingRequest buildingRequest,
@@ -72,9 +71,9 @@ public class ArtifactTransitivityFilter
 throws ProjectBuildingException
 {
 ProjectBuildingRequest request = new DefaultProjectBuildingRequest( 
buildingRequest );
-
+
 request.setResolveDependencies( true );
-
+
 ProjectBuildingResult buildingResult = projectBuilder.build( artifact, 
request );
 
 DependencyResolutionResult resolutionResult = 
buildingResult.getDependencyResolutionResult();
@@ -84,16 +83,15 @@ public class ArtifactTransitivityFilter
 {
 try
 {
-@SuppressWarnings( unchecked )
-Listorg.eclipse.aether.graph.Dependency dependencies =
-(Listorg.eclipse.aether.graph.Dependency) 
Invoker.invoke( resolutionResult, getDependencies );
+@SuppressWarnings( unchecked ) 
Listorg.eclipse.aether.graph.Dependency dependencies =
+(Listorg.eclipse.aether.graph.Dependency) 
Invoker.invoke( resolutionResult,
+   
 getDependencies );
 
 for ( org.eclipse.aether.graph.Dependency dependency : 
dependencies )
 {
-Artifact mavenArtifact =
-(Artifact) Invoker.invoke( RepositoryUtils.class, 
toArtifact,
-   
org.eclipse.aether.artifact.Artifact.class,
-   
dependency.getArtifact() );
+Artifact mavenArtifact = (Artifact

svn commit: r1685369 - /maven/shared/trunk/maven-artifact-transfer/pom.xml

[krosenvold]

Author: krosenvold
Date: Sun Jun 14 09:23:43 2015
New Revision: 1685369

URL: http://svn.apache.org/r1685369
Log:
Sniff for animals

Modified:
maven/shared/trunk/maven-artifact-transfer/pom.xml

Modified: maven/shared/trunk/maven-artifact-transfer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/pom.xml?rev=1685369r1=1685368r2=1685369view=diff
==
--- maven/shared/trunk/maven-artifact-transfer/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-transfer/pom.xml Sun Jun 14 09:23:43 2015
@@ -17,26 +17,27 @@
   specific language governing permissions and limitations
   under the License.
 --
-project xmlns=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;
+project xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xmlns=http://maven.apache.org/POM/4.0.0;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
   modelVersion4.0.0/modelVersion
-  
+
   parent
 groupIdorg.apache.maven.shared/groupId
 artifactIdmaven-shared-components/artifactId
 version20/version
 relativePath../maven-shared-components/pom.xml/relativePath
   /parent
-  
+
   artifactIdmaven-artifact-transfer/artifactId
   version3.0-SNAPSHOT/version
-  
+
   nameApache Maven Artifact Transfer/name
   descriptionAn API to install, deploy and resolving artifacts with 
Maven3/description
-  
+
   scm
 
connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-artifact-transfer/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-artifact-transfer/developerConnection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-artifact-transfer
+/developerConnection
 
urlhttp://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/url
   /scm
   issueManagement
@@ -108,6 +109,27 @@
 /configuration
   /plugin
   plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdanimal-sniffer-maven-plugin/artifactId
+version1.14/version
+executions
+  execution
+idsniff/id
+phasetest/phase
+goals
+  goalcheck/goal
+/goals
+  /execution
+/executions
+configuration
+  signature
+groupIdorg.codehaus.mojo.signature/groupId
+artifactIdjava16/artifactId
+version1.1/version
+  /signature
+/configuration
+  /plugin
+  plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-enforcer-plugin/artifactId
 executions
@@ -125,7 +147,7 @@
   /plugin
 /plugins
   /build
-  
+
   dependencies
 dependency
   groupIdorg.apache.maven/groupId
@@ -137,19 +159,19 @@
   artifactIdmaven-artifact/artifactId
   version3.0/version
 /dependency
-  
+
 dependency
   groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-component-annotations/artifactId
   version1.6/version
 /dependency
-
+
 dependency
   groupIdorg.apache.maven.shared/groupId
   artifactIdmaven-common-artifact-filters/artifactId
   version3.0-SNAPSHOT/version
 /dependency
-  
+
 !-- Maven 3.0.x --
 dependency
   groupIdorg.sonatype.aether/groupId
@@ -169,7 +191,7 @@
   version1.7/version
   scopeprovided/scope
 /dependency
-
+
 !-- Maven 3.1.x and above --
 dependency
   groupIdorg.eclipse.aether/groupId
@@ -189,7 +211,7 @@
   version0.9.0.M2/version
   !-- will be shaded --
 /dependency
-
+
 !-- TEST --
 dependency
   groupIdjunit/groupId

svn commit: r1685427 [3/3] - in /maven/shared/trunk: maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ maven-common-artifact-filters/src/main/java/org/apache

[krosenvold]

Modified: 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java?rev=1685427r1=1685426r2=1685427view=diff
==
--- 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
 (original)
+++ 
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java
 Sun Jun 14 17:09:05 2015
@@ -1,148 +1,148 @@
-package org.apache.maven.shared.project.utils;
-
-/*
- * 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.Map;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.project.MavenProject;
-
-/**
- * 
- */
-public final class ScmUtils
-{
-private ScmUtils()
-{
-}
-
-/**
- * Resolve the scm connection, based on the type of project and 
inheritance.
- * This method assumes that the connection ends with the path and can be 
extended.
- * 
- * @param project the Maven project
- * @return the resolved SCM connection, otherwise an empty String
- * @since 1.0
- */
-public static String resolveScmConnection( MavenProject project )
-{
-String scmConnection = getScmConnection( project.getModel() );
-
-if ( scmConnection == null )
-{
-// prevent null-value
-scmConnection = defaultString( getScmConnection( project ) );
-
-if ( !ProjectUtils.isRootProject( project ) )
-{
-MapString, String modules = ProjectUtils.getAllModules( 
project.getParent() );
-
-for ( String module : modules.keySet() )
-{
-if ( new File( project.getParent().getBasedir(), module 
).equals( project.getFile() ) )
-{
-return scmConnection + '/' + module;
-}
-}
-// project is not a module of its parent, so use project's 
directoryname
-scmConnection += '/' + 
project.getFile().getParentFile().getName();
-}
-}
-return scmConnection;
-}
-
-/**
- * Resolve the scm developer connection, based on the type of project and 
inheritance.
- * This method assumes that the developer connection ends with the path 
and can be extended.
- * 
- * @param project the Maven Project
- * @return the resolved SCM developer connection, otherwise an empty String
- * @since 1.0
- */
-public static String resolveScmDeveloperConnection( MavenProject project )
-{
-String scmDeveloperConnection = getScmDeveloperConnection( 
project.getModel() );
-
-if ( scmDeveloperConnection == null )
-{
-// prevent null-value
-scmDeveloperConnection = defaultString( getScmDeveloperConnection( 
project ) );
-
-if ( !ProjectUtils.isRootProject( project ) )
-{
-MapString, String modules = ProjectUtils.getAllModules( 
project.getParent() );
-
-for ( String module : modules.keySet() )
-{
-if ( new File( project.getParent().getBasedir(), module 
).equals( project.getFile() ) )
-{
-return scmDeveloperConnection + '/' + module;
-}
-}
-// project is not a module of its parent, so use project's 
directoryname
-scmDeveloperConnection += '/' + 
project.getFile().getParentFile().getName();
-}
-}
-return scmDeveloperConnection;
-}
-
-protected static String getScmConnection( Model model )
-{
-if ( model.getScm() == null )
-{
-return null;
-}
-return model.getScm().getConnection();
-}
-
-protected static String getScmConnection( MavenProject project )
-{
-if ( project.getScm() == null )
-{
-return null;
-}
-

svn commit: r1685427 [1/3] - in /maven/shared/trunk: maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ maven-common-artifact-filters/src/main/java/org/apache

[krosenvold]

Author: krosenvold
Date: Sun Jun 14 17:09:05 2015
New Revision: 1685427

URL: http://svn.apache.org/r1685427
Log:
Fixed more ^M's

Modified:

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/AndFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ExclusionsFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/FilterTransformer.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/OrFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternExclusionsFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/PatternInclusionsFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ScopeFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/TransformableFilter.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformer.java

maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformer.java

maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/EclipseAetherFilterTransformerTest.java

maven/shared/trunk/maven-common-artifact-filters/src/test/java/org/apache/maven/shared/artifact/filter/resolve/transform/SonatypeAetherFilterTransformerTest.java

maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java

maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java

maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java

maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java

maven/shared/trunk/maven-project-utils/src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/ResolveProjectMojo.java

maven/shared/trunk/maven-project-utils/src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/ResolveScmMojo.java

maven/shared/trunk/maven-project-utils/src/it/setup-plugin/src/main/java/org/apache/maven/shared/project/utils/it/ResolveSiteMojo.java

maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java

maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java

maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ScmUtils.java

maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/SiteUtils.java

maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ProjectUtilsTest.java

maven/shared/trunk/maven-project-utils/src/test/java/org/apache/maven/shared/project/utils/ScmUtilsTest.java

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java

maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/package-info.java

Modified: 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/AndFilter.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/AndFilter.java?rev=1685427r1=1685426r2=1685427view=diff
==
--- 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/AndFilter.java
 (original)
+++ 
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/AndFilter.java
 Sun Jun 14 17:09:05 2015
@@ -1,70 +1,70 @@
-package org.apache.maven.shared.artifact.filter.resolve;
-
-/*
- * 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

svn commit: r1685427 [2/3] - in /maven/shared/trunk: maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/resolve/ maven-common-artifact-filters/src/main/java/org/apache

[krosenvold]

Modified: 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java?rev=1685427r1=1685426r2=1685427view=diff
==
--- 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
 Sun Jun 14 17:09:05 2015
@@ -1,234 +1,234 @@
-package org.apache.maven.shared.dependency.graph.internal;
-
-/*
- * 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.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.project.DefaultDependencyResolutionRequest;
-import org.apache.maven.project.DependencyResolutionException;
-import org.apache.maven.project.DependencyResolutionRequest;
-import org.apache.maven.project.DependencyResolutionResult;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.ProjectDependenciesResolver;
-import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
-import 
org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
-import org.apache.maven.shared.dependency.graph.DependencyNode;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.version.VersionConstraint;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Wrapper around Eclipse Aether dependency resolver, used in Maven 3.1.
- *
- * @see ProjectDependenciesResolver
- * @author Hervé Boutemy
- * @since 2.1
- */
-@Component( role = DependencyGraphBuilder.class, hint = maven31 )
-public class Maven31DependencyGraphBuilder
-extends AbstractLogEnabled
-implements DependencyGraphBuilder
-{
-@Requirement
-private ProjectDependenciesResolver resolver;
-
-@Requirement
-private ArtifactFactory factory;
-
-/**
- * Builds the dependency graph for Maven 3.1+.
- *
- * @param project the project
- * @param filter artifact filter (can be codenull/code)
- * @return DependencyNode containing the dependency graph.
- * @throws DependencyGraphBuilderException if some of the dependencies 
could not be resolved.
- */
-@Override
-public DependencyNode buildDependencyGraph( MavenProject project, 
ArtifactFilter filter )
-throws DependencyGraphBuilderException
-{
-return buildDependencyGraph( project, filter, null );
-}
-
-/**
- * Builds the dependency graph for Maven 3.1+, eventually hacking for 
collecting projects from
- * reactor not yet built.
- *
- * @param project the project
- * @param filter artifact filter (can be codenull/code)
- * @param reactorProjects Collection of those projects contained in the 
reactor (can be codenull/code).
- * @return DependencyNode containing the dependency graph.
- * @throws DependencyGraphBuilderException if some of the dependencies 
could not be resolved.
- */
-@Override
-public DependencyNode buildDependencyGraph( MavenProject project, 
ArtifactFilter filter,
-CollectionMavenProject 
reactorProjects )
-throws DependencyGraphBuilderException
-{
-ProjectBuildingRequest projectBuildingRequest =
-(ProjectBuildingRequest) 

svn commit: r1685250 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/ main/java/org/apache/maven/plugin/assembly/artifact/ test/java/org/apache/

[krosenvold]

Author: krosenvold
Date: Sat Jun 13 13:30:34 2015
New Revision: 1685250

URL: http://svn.apache.org/r1685250
Log:
Cleaned up code slightly

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1685250r1=1685249r2=1685250view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
 Sat Jun 13 13:30:34 2015
@@ -409,8 +409,7 @@ public class DefaultAssemblyArchiver
  final AssemblerConfigurationSource 
configSource )
 throws ComponentLookupException, ComponentConfigurationException
 {
-final ComponentConfigurator configurator =
-(ComponentConfigurator) container.lookup( 
ComponentConfigurator.ROLE, basic );
+final ComponentConfigurator configurator = container.lookup( 
ComponentConfigurator.class, basic );
 
 final ConfigurationListener listener = new DebugConfigurationListener( 
getLogger() );
 

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=1685250r1=1685249r2=1685250view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
 Sat Jun 13 13:30:34 2015
@@ -103,34 +103,41 @@ public class DefaultDependencyResolver
 updateDependencySetResolutionRequirements( dependencySet, info, 
assemblyId, currentProject );
 updateModuleSetResolutionRequirements( assemblyId, moduleSet, 
dependencySet, info, configSource );
 
-SetArtifact artifacts;
-if ( info.isResolutionRequired() )
-{
-final ListArtifactRepository repos =
-aggregateRemoteArtifactRepositories( 
configSource.getRemoteRepositories(),
- 
info.getEnabledProjects() );
+resolve( assembly, configSource, result, dependencySet, info );
 
-artifacts = info.getArtifacts();
-if ( info.isResolvedTransitively() )
-{
-getLogger().debug( Resolving project dependencies 
transitively. );
-artifacts = resolveTransitively( artifacts, repos, info, 
configSource );
-}
-else
-{
-getLogger().debug( Resolving project dependencies ONLY. 
-   + Transitive dependencies WILL NOT 
be included in the results. );
-artifacts = resolveNonTransitively( assembly, artifacts, 
configSource, repos

svn commit: r1685251 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

[krosenvold]

Author: krosenvold
Date: Sat Jun 13 13:30:51 2015
New Revision: 1685251

URL: http://svn.apache.org/r1685251
Log:
Checkstyle issue

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1685251r1=1685250r2=1685251view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 Sat Jun 13 13:30:51 2015
@@ -663,7 +663,6 @@ public class AssemblyProxyArchiver
 }
 
 public void addArchivedFileSet( ArchivedFileSet archivedFileSet, Charset 
charset )
-throws ArchiverException
 {
 inPublicApi.set( Boolean.TRUE );
 try

svn commit: r1685226 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/artifact/ test/java/org/apache/maven/plugin/assembly/archive/phase/ test/java/org/a

[krosenvold]

Author: krosenvold
Date: Sat Jun 13 09:28:02 2015
New Revision: 1685226

URL: http://svn.apache.org/r1685226
Log:
Switched to non-deprecated 
org.apache.maven.artifact.resolver.ArtifactResolver#resolve(org.apache.maven.artifact.resolver.ArtifactResolutionRequest)

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=1685226r1=1685225r2=1685226view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
 Sat Jun 13 09:28:02 2015
@@ -21,10 +21,8 @@ package org.apache.maven.plugin.assembly
 
 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.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
@@ -69,8 +67,6 @@ public class DefaultDependencyResolver
 @Requirement
 private ArtifactResolver resolver;
 
-@Requirement
-private ArtifactMetadataSource metadataSource;
 
 @Requirement
 private ArtifactFactory factory;
@@ -81,11 +77,10 @@ public class DefaultDependencyResolver
 // for plexus init
 }
 
-protected DefaultDependencyResolver( final ArtifactResolver resolver, 
final ArtifactMetadataSource metadataSource,
- final ArtifactFactory factory, final 
Logger logger )
+protected DefaultDependencyResolver( final ArtifactResolver resolver, 
final ArtifactFactory factory,
+ final Logger logger )
 {
 this.resolver = resolver;
-this.metadataSource = metadataSource;
 this.factory = factory;
 enableLogging( logger );
 }
@@ -195,12 +190,13 @@ public class DefaultDependencyResolver
 final SetArtifact resolved = new LinkedHashSetArtifact();
 for ( final Artifact depArtifact : dependencyArtifacts )
 {
-try
-{
-resolver.resolve( depArtifact, repos, 
configSource.getLocalRepository() );
-resolved.add( depArtifact );
-}
-catch ( final ArtifactResolutionException e )
+ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+req.setLocalRepository( configSource.getLocalRepository() );
+req.setRemoteRepositories( repos );
+req.setArtifact( depArtifact );
+
+ArtifactResolutionResult resolve = resolver.resolve( req );
+if ( resolve.hasExceptions() )
 {
 if ( getLogger().isDebugEnabled() )
 {
@@ -209,18 +205,14 @@ public class DefaultDependencyResolver
 }
 missing.add( depArtifact );
 }
-catch ( final ArtifactNotFoundException e )
+else
 {
-if ( getLogger().isDebugEnabled() )
-{
-getLogger().debug(
-Failed to resolve:  + depArtifact.getId() +  for 
assembly:  + assembly.getId() );
-}
-missing.add( depArtifact );
+resolved.add( depArtifact );
 }
 }
 
 if ( !missing.isEmpty() )
+
 {
 final MavenProject project = configSource.getProject();
 final Artifact rootArtifact = project.getArtifact();
@@ -245,22 +237,31 @@ public class DefaultDependencyResolver
 final MavenProject project = configSource.getProject();
 
 final ArtifactFilter filter = info.getScopeFilter();
-final ArtifactRepository localRepository = 
configSource.getLocalRepository

svn commit: r1685231 - in /maven/plugins/trunk/maven-assembly-plugin: pom.xml src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java src/test/java/org/apache/maven/plug

[krosenvold]

Author: krosenvold
Date: Sat Jun 13 09:56:28 2015
New Revision: 1685231

URL: http://svn.apache.org/r1685231
Log:
Moved maven-compat to test-scope

Its probably possible to get rid of it totally

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1685231r1=1685230r2=1685231view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sat Jun 13 09:56:28 2015
@@ -19,7 +19,8 @@ specific language governing permissions
 under the License.
 --
 
-project xmlns=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;
+project xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xmlns=http://maven.apache.org/POM/4.0.0;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;
   modelVersion4.0.0/modelVersion
 
   parent
@@ -92,6 +93,7 @@ under the License.
   groupIdorg.apache.maven/groupId
   artifactIdmaven-compat/artifactId
   version${mavenVersion}/version
+  scopetest/scope
 /dependency
 dependency
   groupIdorg.apache.maven/groupId

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=1685231r1=1685230r2=1685231view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
 Sat Jun 13 09:56:28 2015
@@ -24,7 +24,6 @@ import org.apache.maven.artifact.factory
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
 import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
@@ -39,6 +38,7 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.plugin.assembly.utils.FilterUtils;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -65,7 +65,7 @@ public class DefaultDependencyResolver
 {
 
 @Requirement
-private ArtifactResolver resolver;
+private RepositorySystem resolver;
 
 
 @Requirement
@@ -77,7 +77,7 @@ public class DefaultDependencyResolver
 // for plexus init
 }
 
-protected DefaultDependencyResolver( final ArtifactResolver resolver, 
final ArtifactFactory factory,
+protected DefaultDependencyResolver( final RepositorySystem resolver, 
final ArtifactFactory factory,
  final Logger logger )
 {
 this.resolver = resolver;
@@ -253,8 +253,6 @@ public class DefaultDependencyResolver
 req.setMirrors( 
configSource.getMavenSession().getRequest().getMirrors() );
 req.setProxies( 
configSource.getMavenSession().getRequest().getProxies() );
 
-
-
 ArtifactResolutionResult result;
 
 result = resolver.resolve( req );

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1685231r1=1685230r2=1685231view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
 (original

svn commit: r1685315 [1/6] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ functional-tests/java/org/apache/maven/plugin/assembly/interpola

[krosenvold]

Author: krosenvold
Date: Sat Jun 13 20:10:29 2015
New Revision: 1685315

URL: http://svn.apache.org/r1685315
Log:
Changed package from org.apache.maven.plugin to org.apache.maven.plugins

Added:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/InvalidAssemblerConfigurationException.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveCreationException.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveExpansionException.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/AssemblyArchiver.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/SarUnArchiver.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java
  - copied, changed from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java

maven/plugins/trunk/maven

svn commit: r1685315 [2/6] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ functional-tests/java/org/apache/maven/plugin/assembly/interpola

[krosenvold]

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
 (from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.javap1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.javar1=1685251r2=1685315rev=1685315view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
 Sat Jun 13 20:10:29 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.assembly.archive.archiver;
+package org.apache.maven.plugins.assembly.archive.archiver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly
  * under the License.
  */
 
-import org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler;
+import org.apache.maven.plugins.assembly.filter.ContainerDescriptorHandler;
 import org.codehaus.plexus.archiver.ArchiveEntry;
 import org.codehaus.plexus.archiver.ArchiveFinalizer;
 import org.codehaus.plexus.archiver.ArchivedFileSet;
@@ -64,18 +64,17 @@ public class AssemblyProxyArchiver
 
 private final Archiver delegate;
 
-private String rootPrefix;
-
-private FileSelector[] selectors;
-
 private final ThreadLocalBoolean inPublicApi = new 
ThreadLocalBoolean();
 
 private final Logger logger;
 
-private boolean forced;
+private final String assemblyWorkPath;
 
+private String rootPrefix;
 
-private final String assemblyWorkPath;
+private FileSelector[] selectors;
+
+private boolean forced;
 
 /**
  * @since 2.2
@@ -461,12 +460,12 @@ public class AssemblyProxyArchiver
 /**
  * {@inheritDoc}
  */
-public int getDefaultFileMode()
+public void setDefaultDirectoryMode( final int mode )
 {
 inPublicApi.set( Boolean.TRUE );
 try
 {
-return delegate.getDefaultFileMode();
+delegate.setDefaultDirectoryMode( mode );
 }
 finally
 {
@@ -477,12 +476,12 @@ public class AssemblyProxyArchiver
 /**
  * {@inheritDoc}
  */
-public File getDestFile()
+public int getDefaultFileMode()
 {
 inPublicApi.set( Boolean.TRUE );
 try
 {
-return delegate.getDestFile();
+return delegate.getDefaultFileMode();
 }
 finally
 {
@@ -490,13 +489,15 @@ public class AssemblyProxyArchiver
 }
 }
 
-@SuppressWarnings( { rawtypes, deprecation } )
-/** {@inheritDoc} */ public MapString, ArchiveEntry getFiles()
+/**
+ * {@inheritDoc}
+ */
+public void setDefaultFileMode( final int mode )
 {
 inPublicApi.set( Boolean.TRUE );
 try
 {
-return delegate.getFiles();
+delegate.setDefaultFileMode( mode );
 }
 finally
 {
@@ -507,12 +508,12 @@ public class AssemblyProxyArchiver
 /**
  * {@inheritDoc}
  */
-public boolean getIncludeEmptyDirs()
+public File getDestFile()
 {
 inPublicApi.set( Boolean.TRUE );
 try
 {
-return delegate.getIncludeEmptyDirs();
+return delegate.getDestFile();
 }
 finally
 {
@@ -523,12 +524,12 @@ public class AssemblyProxyArchiver
 /**
  * {@inheritDoc}
  */
-public boolean isForced()
+public void setDestFile( final File destFile )
 {
 inPublicApi.set( Boolean.TRUE );
 try
 {
-return delegate.isForced();
+delegate.setDestFile( destFile );
 }
 finally
 {
@@ -536,15 +537,13 @@ public class AssemblyProxyArchiver
 }
 }
 
-/**
- * {@inheritDoc}
- */
-public boolean isSupportingForced()
+@SuppressWarnings( { rawtypes, deprecation } )
+/** {@inheritDoc} */ public MapString, ArchiveEntry getFiles()
 {
 inPublicApi.set( Boolean.TRUE );
 try
 {
-return delegate.isSupportingForced();
+return delegate.getFiles();
 }
 finally
 {
@@ -555,12 +554,12 @@ public class AssemblyProxyArchiver
 /**
  * {@inheritDoc}
  */
-public void setDefaultDirectoryMode( final int mode )
+

svn commit: r1685315 [5/6] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ functional-tests/java/org/apache/maven/plugin/assembly/interpola

[krosenvold]

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java
 (from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.javap1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.javar1=1685251r2=1685315rev=1685315view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTaskTest.java
 Sat Jun 13 20:10:29 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.assembly.archive.task;
+package org.apache.maven.plugins.assembly.archive.task;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,19 +19,18 @@ package org.apache.maven.plugin.assembly
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
 import junit.framework.TestCase;
-
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
+import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugins.assembly.testutils.TestFileManager;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.FileSet;
 import org.easymock.classextension.EasyMockSupport;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.expect;
 
@@ -52,8 +51,7 @@ public class AddDirectoryTaskTest
 
 mockManager = new EasyMockSupport();
 
-
-archiver = mockManager.createMock(Archiver.class);
+archiver = mockManager.createMock( Archiver.class );
 }
 
 public void tearDown()
@@ -169,8 +167,8 @@ public class AddDirectoryTaskTest
 private void configureModeExpectations( int defaultDirMode, int 
defaultFileMode, int dirMode, int fileMode,
 boolean expectTwoSets )
 {
-expect(archiver.getOverrideDirectoryMode()).andReturn( defaultDirMode 
);
-expect(archiver.getOverrideFileMode()).andReturn( defaultFileMode );
+expect( archiver.getOverrideDirectoryMode() ).andReturn( 
defaultDirMode );
+expect( archiver.getOverrideFileMode() ).andReturn( defaultFileMode );
 
 if ( expectTwoSets )
 {
@@ -178,7 +176,7 @@ public class AddDirectoryTaskTest
 {
 archiver.setDirectoryMode( dirMode );
 }
-
+
 if ( fileMode  -1 )
 {
 archiver.setFileMode( fileMode );
@@ -189,7 +187,7 @@ public class AddDirectoryTaskTest
 {
 archiver.setDirectoryMode( defaultDirMode );
 }
-
+
 if ( fileMode  -1 )
 {
 archiver.setFileMode( defaultFileMode );

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
 (from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.javap1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.javar1=1685251r2=1685315rev=1685315view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
 Sat Jun 13 20:10:29 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.assembly.archive.task;
+package org.apache.maven.plugins.assembly.archive.task;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,27 +19,26 @@ package org.apache.maven.plugin.assembly
  * under the License.
  

svn commit: r1685315 [3/6] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ functional-tests/java/org/apache/maven/plugin/assembly/interpola

[krosenvold]

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
 (from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.javap1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.javar1=1685251r2=1685315rev=1685315view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
 Sat Jun 13 20:10:29 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.assembly.filter;
+package org.apache.maven.plugins.assembly.filter;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly
  * under the License.
  */
 
-import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
+import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.UnArchiver;
@@ -54,20 +54,20 @@ public class SimpleAggregatingDescriptor
 
 // component configuration.
 
-private String filePattern;
-
-private String outputPath;
-
 @SuppressWarnings( FieldCanBeLocal )
 private final String commentChars = #;
 
+private final StringWriter aggregateWriter = new StringWriter();
+
+private final ListString filenames = new ArrayListString();
+
 // calculated, temporary values.
 
-private boolean overrideFilterAction;
+private String filePattern;
 
-private final StringWriter aggregateWriter = new StringWriter();
+private String outputPath;
 
-private final ListString filenames = new ArrayListString();
+private boolean overrideFilterAction;
 
 // injected by the container.
 
@@ -80,8 +80,8 @@ public class SimpleAggregatingDescriptor
 if ( outputPath.endsWith( / ) )
 {
 throw new ArchiverException( Cannot write aggregated properties 
to a directory. 
-+ You must specify a file name in the outputPath 
configuration for this handler. (handler: 
-+ getClass().getName() );
+ + You must specify a file name 
in the outputPath configuration for this
+ +  handler. (handler:  + 
getClass().getName() );
 }
 
 if ( outputPath.startsWith( / ) )
@@ -149,7 +149,7 @@ public class SimpleAggregatingDescriptor
 return Collections.singletonList( outputPath );
 }
 
-public boolean isSelected(  @Nonnull final FileInfo fileInfo )
+public boolean isSelected( @Nonnull final FileInfo fileInfo )
 throws IOException
 {
 checkConfig();

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java
 (from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.javap1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.javar1=1685251r2=1685315rev=1685315view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/AssemblyFormattingException.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java
 Sat Jun 13 20:10:29 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.assembly.format;
+package org.apache.maven.plugins.assembly.format;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
 (from r1685251, 

svn commit: r1685315 [6/6] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ functional-tests/java/org/apache/maven/plugin/assembly/interpola

[krosenvold]

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
 (from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.javap1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.javar1=1685251r2=1685315rev=1685315view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
 Sat Jun 13 20:10:29 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.assembly.io;
+package org.apache.maven.plugins.assembly.io;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,21 +23,21 @@ import junit.framework.TestCase;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.DefaultAssemblyArchiverTest;
-import org.apache.maven.plugin.assembly.interpolation.AssemblyInterpolator;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.model.Component;
-import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig;
-import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.plugin.assembly.model.FileItem;
-import org.apache.maven.plugin.assembly.model.FileSet;
-import org.apache.maven.plugin.assembly.model.Repository;
-import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Writer;
-import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Reader;
-import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Writer;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
+import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
+import 
org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
+import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest;
+import org.apache.maven.plugins.assembly.interpolation.AssemblyInterpolator;
+import org.apache.maven.plugins.assembly.model.Assembly;
+import org.apache.maven.plugins.assembly.model.Component;
+import 
org.apache.maven.plugins.assembly.model.ContainerDescriptorHandlerConfig;
+import org.apache.maven.plugins.assembly.model.DependencySet;
+import org.apache.maven.plugins.assembly.model.FileItem;
+import org.apache.maven.plugins.assembly.model.FileSet;
+import org.apache.maven.plugins.assembly.model.Repository;
+import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Writer;
+import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Reader;
+import org.apache.maven.plugins.assembly.model.io.xpp3.ComponentXpp3Writer;
+import org.apache.maven.plugins.assembly.testutils.TestFileManager;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
 import org.codehaus.plexus.interpolation.fixed.InterpolationState;
@@ -60,7 +60,7 @@ import java.util.List;
 
 import static org.easymock.EasyMock.expect;
 
-@SuppressWarnings(ResultOfMethodCallIgnored)
+@SuppressWarnings( ResultOfMethodCallIgnored )
 public class DefaultAssemblyReaderTest
 extends TestCase
 {
@@ -89,14 +89,15 @@ public class DefaultAssemblyReaderTest
 fileManager = new TestFileManager( assembly-reader.test., .xml );
 mockManager = new EasyMockSupport();
 
-configSource = 
mockManager.createMock(AssemblerConfigurationSource.class);
+configSource = mockManager.createMock( 
AssemblerConfigurationSource.class );
 
 ArtifactRepository localRepo = mockManager.createMock( 
ArtifactRepository.class );
 
-expect( 
localRepo.getBasedir()).andReturn(/path/to/local/repo).anyTimes();
-expect(configSource.getLocalRepository()).andReturn( localRepo 
).anyTimes();
-expect( configSource.getRemoteRepositories()).andReturn( 
Collections.ArtifactRepositoryemptyList()).anyTimes();
-expect(configSource.getMavenSession()).andReturn( null).anyTimes();
+expect( localRepo.getBasedir() ).andReturn( /path/to/local/repo 
).anyTimes();
+expect( configSource.getLocalRepository() ).andReturn( localRepo 

svn commit: r1685315 [4/6] - in /maven/plugins/trunk/maven-assembly-plugin/src: functional-tests/java/org/apache/maven/plugin/assembly/ functional-tests/java/org/apache/maven/plugin/assembly/interpola

[krosenvold]

Copied: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
 (from r1685251, 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java)
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.javap1=maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.javar1=1685251r2=1685315rev=1685315view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
 Sat Jun 13 20:10:29 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.assembly.archive;
+package org.apache.maven.plugins.assembly.archive;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,15 +22,15 @@ package org.apache.maven.plugin.assembly
 import junit.framework.Assert;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Model;
-import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
-import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
-import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.model.Assembly;
-import org.apache.maven.plugin.assembly.mojos.AbstractAssemblyMojo;
-import org.apache.maven.plugin.assembly.testutils.TestFileManager;
+import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
+import 
org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
+import org.apache.maven.plugins.assembly.archive.phase.AssemblyArchiverPhase;
+import 
org.apache.maven.plugins.assembly.artifact.DependencyResolutionException;
+import org.apache.maven.plugins.assembly.artifact.DependencyResolver;
+import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
+import org.apache.maven.plugins.assembly.model.Assembly;
+import org.apache.maven.plugins.assembly.mojos.AbstractAssemblyMojo;
+import org.apache.maven.plugins.assembly.testutils.TestFileManager;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusContainer;
@@ -270,10 +270,10 @@ public class DefaultAssemblyArchiverTest
 
 final AssemblerConfigurationSource configSource = mm.createMock( 
AssemblerConfigurationSource.class );
 
-expect( configSource.getTarLongFileMode()).andReturn( 
TarLongFileMode.fail.toString()).anyTimes();
-expect( configSource.isDryRun()).andReturn( false ).anyTimes();
+expect( configSource.getTarLongFileMode() ).andReturn( 
TarLongFileMode.fail.toString() ).anyTimes();
+expect( configSource.isDryRun() ).andReturn( false ).anyTimes();
 
-expect( configSource.getArchiverConfig()).andReturn( null ).anyTimes();
+expect( configSource.getArchiverConfig() ).andReturn( null 
).anyTimes();
 
 final DefaultAssemblyArchiver subject = setupStdExpectations( mm, 
macArchiverManager, configSource );
 
@@ -289,15 +289,15 @@ public class DefaultAssemblyArchiverTest
   
MockAndControlForAssemblyArchiver macArchiverManager,
   
AssemblerConfigurationSource configSource )
 {
-expect( configSource.getProject()).andReturn( new MavenProject( new 
Model() ) ).anyTimes();
+expect( configSource.getProject() ).andReturn( new MavenProject( new 
Model() ) ).anyTimes();
 
-expect( configSource.getJarArchiveConfiguration()).andReturn( null 
).anyTimes();
+expect( configSource.getJarArchiveConfiguration() ).andReturn( null 
).anyTimes();
 
-expect( configSource.getWorkingDirectory()).andReturn(  new File( . 
) ).anyTimes();
+expect( configSource.getWorkingDirectory() ).andReturn( new File( . 
) ).anyTimes();
 
-expect( configSource.isUpdateOnly()).andReturn( false ).anyTimes();
+expect( configSource.isUpdateOnly() ).andReturn( false ).anyTimes();
 
-expect( configSource.isIgnorePermissions()).andReturn( true 
).anyTimes();
+expect( configSource.isIgnorePermissions() ).andReturn( 

svn commit: r1685177 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/phase/ main/java/org/apache/maven/plugin/assembly/archive/task/ test/java/o

[krosenvold]

Author: krosenvold
Date: Fri Jun 12 21:33:19 2015
New Revision: 1685177

URL: http://svn.apache.org/r1685177
Log:
Migrated from MavenProjectBuilder to ProjectBuilder

Added:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/ProjectBuildingRequestCreator.java
Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java?rev=1685177r1=1685176r2=1685177view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java
 Fri Jun 12 21:33:19 2015
@@ -29,7 +29,7 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
 import org.apache.maven.plugin.assembly.model.Assembly;
 import org.apache.maven.plugin.assembly.model.DependencySet;
-import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuilder;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.component.annotations.Component;
@@ -53,7 +53,7 @@ public class DependencySetAssemblyPhase
 {
 
 @Requirement
-private MavenProjectBuilder projectBuilder;
+private ProjectBuilder projectBuilder;
 
 @Requirement
 private ArchiverManager archiverManager;
@@ -74,7 +74,7 @@ public class DependencySetAssemblyPhase
  * @param projectBuilder The Maven Project Builder.
  * @param logger The Logger.
  */
-public DependencySetAssemblyPhase( final MavenProjectBuilder 
projectBuilder, DependencyResolver dependencyResolver,
+public DependencySetAssemblyPhase( final ProjectBuilder projectBuilder, 
DependencyResolver dependencyResolver,
final Logger logger )
 {
 this.projectBuilder = projectBuilder;

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=1685177r1=1685176r2=1685177view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
 Fri Jun 12 21:33:19 2015
@@ -43,7 +43,7 @@ import org.apache.maven.plugin.assembly.
 import org.apache.maven.plugin.assembly.utils.ProjectUtils;
 import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuilder;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.codehaus.plexus.component.annotations.Component;
@@ -87,7 +87,7 @@ public class ModuleSetAssemblyPhase
 private static final String LINE_SEPARATOR = System.getProperty( 
line.separator );
 
 @Requirement
-private MavenProjectBuilder projectBuilder;
+private ProjectBuilder projectBuilder;
 
 @Requirement
 private ArchiverManager archiverManager;
@@ -107,7 +107,7 @@ public class ModuleSetAssemblyPhase

svn commit: r1684942 - in /maven/plugins/trunk: ./ maven-assembly-plugin/ maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/ maven-assembly-plugin/src/test/java/org/apache/mav

[krosenvold]

Author: krosenvold
Date: Thu Jun 11 16:49:11 2015
New Revision: 1684942

URL: http://svn.apache.org/r1684942
Log:
Upgraded to 3.0. Still with maven-compat and deprecations

Upped to 1.6

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
maven/plugins/trunk/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1684942r1=1684941r2=1684942view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Jun 11 16:49:11 2015
@@ -57,10 +57,13 @@ under the License.
   /distributionManagement
 
   properties
+maven.compiler.source1.6/maven.compiler.source
+maven.compiler.target1.6/maven.compiler.target
+
 mdoVersion1.1.3/mdoVersion
 mavenArchiverVersion2.5/mavenArchiverVersion
 mavenFilteringVersion1.3/mavenFilteringVersion
-mavenVersion2.2.1/mavenVersion
+mavenVersion3.0/mavenVersion
 testOutputToFiletrue/testOutputToFile
 
checkstyle.violation.ignoreRedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder,JavadocMethod/checkstyle.violation.ignore
   /properties
@@ -87,7 +90,7 @@ under the License.
 /dependency
 dependency
   groupIdorg.apache.maven/groupId
-  artifactIdmaven-project/artifactId
+  artifactIdmaven-compat/artifactId
   version${mavenVersion}/version
 /dependency
 dependency
@@ -115,7 +118,6 @@ under the License.
   groupIdorg.apache.maven.plugin-tools/groupId
   artifactIdmaven-plugin-annotations/artifactId
 /dependency
-
 dependency
   groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-interpolation/artifactId
@@ -129,7 +131,7 @@ under the License.
 dependency
   groupIdorg.apache.maven.shared/groupId
   artifactIdfile-management/artifactId
-  version1.1/version
+  version1.2.1/version
 /dependency
 dependency
   groupIdorg.apache.maven.shared/groupId
@@ -139,7 +141,7 @@ under the License.
 dependency
 groupIdcommons-io/groupId
 artifactIdcommons-io/artifactId
-version2.2/version
+version2.4/version
   /dependency
 dependency
   groupIdorg.apache.maven.shared/groupId
@@ -159,7 +161,7 @@ under the License.
 dependency
   groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-utils/artifactId
-  version3.0.21/version
+  version3.0.22/version
 /dependency
 dependency
   groupIdorg.apache.maven.shared/groupId

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1684942r1=1684941r2=1684942view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
 Thu Jun 11 16:49:11 2015
@@ -581,15 +581,8 @@ public abstract class AbstractAssemblyMo
 if ( session != null )
 {
 commandLineProperties = new Properties();
-if ( session.getExecutionProperties() != null )
-{
-commandLineProperties.putAll( session.getExecutionProperties() 
);
-}
-
-if ( session.getUserProperties() != null )
-{
-commandLineProperties.putAll( session.getUserProperties() );
-}
+commandLineProperties.putAll( session.getSystemProperties() );
+commandLineProperties.putAll( session.getUserProperties() );
 }
 
 PropertiesBasedValueSource cliProps = new PropertiesBasedValueSource( 
commandLineProperties );

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test

svn commit: r1684951 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java

[krosenvold]

Author: krosenvold
Date: Thu Jun 11 17:19:39 2015
New Revision: 1684951

URL: http://svn.apache.org/r1684951
Log:
MASSEMBLY-773 Changed scope to per-lookup

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1684951r1=1684950r2=1684951view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
 Thu Jun 11 17:19:39 2015
@@ -84,7 +84,7 @@ import java.util.Map;
  *
  * @version $Id$
  */
-@Component( role = AssemblyArchiver.class )
+@Component( role = AssemblyArchiver.class, instantiationStrategy = 
per-lookup )
 public class DefaultAssemblyArchiver
 extends AbstractLogEnabled
 implements AssemblyArchiver, Contextualizable

svn commit: r953867 - /websites/production/maven/components/plugins/maven-assembly-plugin/

[krosenvold]

Author: krosenvold
Date: Fri Jun  5 04:49:41 2015
New Revision: 953867

Log:
Remove old site.

Removed:
websites/production/maven/components/plugins/maven-assembly-plugin/

svn commit: r953869 - /websites/production/maven/components/plugins/maven-assembly-plugin/

[krosenvold]

Author: krosenvold
Date: Fri Jun  5 04:53:54 2015
New Revision: 953869

Log:
Publish new site.

Added:
websites/production/maven/components/plugins/maven-assembly-plugin/
  - copied from r953868, 
websites/production/maven/components/plugins-archives/maven-assembly-plugin-2.5.5/

svn commit: r953868 - /websites/production/maven/components/plugins-archives/maven-assembly-plugin-2.5.5/

[krosenvold]

Author: krosenvold
Date: Fri Jun  5 04:51:24 2015
New Revision: 953868

Log:
Archive versioned site.

Added:

websites/production/maven/components/plugins-archives/maven-assembly-plugin-2.5.5/
  - copied from r953867, 
websites/production/maven/components/plugins-archives/maven-assembly-plugin-LATEST/

svn commit: r1682730 - in /maven/plugins/trunk/maven-assembly-plugin/src: main/java/org/apache/maven/plugin/assembly/archive/archiver/ main/java/org/apache/maven/plugin/assembly/format/ main/java/org/

[krosenvold]

Author: krosenvold
Date: Sun May 31 12:59:49 2015
New Revision: 1682730

URL: http://svn.apache.org/r1682730
Log:
Code analysis cleanup prior to release

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java

maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java?rev=1682730r1=1682729r2=1682730view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
 Sun May 31 12:59:49 2015
@@ -24,7 +24,7 @@ import org.codehaus.plexus.archiver.zip.
 /**
  * @author jdcasey
  * @version $Id$
- * @todo delete this class once the plexus maven plugin can merge a generated 
components.xml with an existing one.
+ * //todo delete this class once the plexus maven plugin can merge a generated 
components.xml with an existing one.
  */
 class SarUnArchiver
 extends ZipUnArchiver

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java?rev=1682730r1=1682729r2=1682730view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 Sun May 31 12:59:49 2015
@@ -127,7 +127,7 @@ public class ReaderFormatter
 {
 return new InputStreamTransformer()
 {
-public InputStream transform( PlexusIoResource 
plexusIoResource, InputStream inputStream )
+@Nonnull public InputStream transform( @Nonnull 
PlexusIoResource plexusIoResource, @Nonnull InputStream inputStream )
 throws IOException
 {
 InputStream result = inputStream;

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1682730r1=1682729r2=1682730view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
 Sun May 31 12:59:49 2015
@@ -959,7 +959,7 @@ public abstract class AbstractAssemblyMo
 return delimiters;
 }
 
-public

svn commit: r1682737 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Sun May 31 13:22:19 2015
New Revision: 1682737

URL: http://svn.apache.org/r1682737
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1682737r1=1682736r2=1682737view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sun May 31 13:22:19 2015
@@ -30,7 +30,7 @@ under the License.
   /parent
 
   artifactIdmaven-assembly-plugin/artifactId
-  version2.5.5/version
+  version3.0.0-SNAPSHOT/version
   packagingmaven-plugin/packaging
 
   nameApache Maven Assembly Plugin/name
@@ -41,9 +41,9 @@ under the License.
   /prerequisites
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.5/connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.5/developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.5/url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin//connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin//developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin//url
   /scm
   issueManagement
 systemjira/system

svn commit: r1682733 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

[krosenvold]

Author: krosenvold
Date: Sun May 31 13:19:19 2015
New Revision: 1682733

URL: http://svn.apache.org/r1682733
Log:
Checkstyle issue

Modified:

maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java?rev=1682733r1=1682732r2=1682733view=diff
==
--- 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
 Sun May 31 13:19:19 2015
@@ -53,7 +53,6 @@ public class ReaderFormatter
 MavenReaderFilterRequest filterRequest =
 new MavenReaderFilterRequest( source, true, 
configSource.getProject(), configSource.getFilters(),
   isPropertiesFile, null, 
configSource.getMavenSession(), null );
-//filterRequest.setInjectProjectBuildFilters(true);
 filterRequest.setEscapeString( escapeString );
 
 // if these are NOT set, just use the defaults, which are '${*}' 
and '@'.
@@ -127,7 +126,9 @@ public class ReaderFormatter
 {
 return new InputStreamTransformer()
 {
-@Nonnull public InputStream transform( @Nonnull 
PlexusIoResource plexusIoResource, @Nonnull InputStream inputStream )
+@Nonnull
+public InputStream transform( @Nonnull PlexusIoResource 
plexusIoResource,
+  @Nonnull InputStream inputStream 
)
 throws IOException
 {
 InputStream result = inputStream;

svn commit: r1682736 - /maven/plugins/tags/maven-assembly-plugin-2.5.5/

[krosenvold]

Author: krosenvold
Date: Sun May 31 13:22:09 2015
New Revision: 1682736

URL: http://svn.apache.org/r1682736
Log:
[maven-release-plugin] copy for tag maven-assembly-plugin-2.5.5

Added:
maven/plugins/tags/maven-assembly-plugin-2.5.5/   (props changed)
  - copied from r1682735, maven/plugins/trunk/maven-assembly-plugin/

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.5/
--
bugtraq:logregex = MASSEMBLY-\d+

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.5/
--
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.5/
--
bugtraq:warnifnoissue = false

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.5/
--
--- svn:ignore (added)
+++ svn:ignore Sun May 31 13:22:09 2015
@@ -0,0 +1,14 @@
+MAVEN_ENV
+target
+cobertura.ser
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.wtpmodules
+bin
+.settings
+.idea

Propchange: maven/plugins/tags/maven-assembly-plugin-2.5.5/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun May 31 13:22:09 2015
@@ -0,0 +1 @@
+/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4:773752-780691

svn commit: r1682735 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Sun May 31 13:21:39 2015
New Revision: 1682735

URL: http://svn.apache.org/r1682735
Log:
[maven-release-plugin] prepare release maven-assembly-plugin-2.5.5

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1682735r1=1682734r2=1682735view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Sun May 31 13:21:39 2015
@@ -30,7 +30,7 @@ under the License.
   /parent
 
   artifactIdmaven-assembly-plugin/artifactId
-  version2.5.5-SNAPSHOT/version
+  version2.5.5/version
   packagingmaven-plugin/packaging
 
   nameApache Maven Assembly Plugin/name
@@ -41,9 +41,9 @@ under the License.
   /prerequisites
 
   scm
-
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin//connection
-
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin//developerConnection
-
urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin//url
+
connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.5/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-assembly-plugin-2.5.5/developerConnection
+
urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-assembly-plugin-2.5.5/url
   /scm
   issueManagement
 systemjira/system

svn commit: r953125 - /websites/production/maven/content/

[krosenvold]

Author: krosenvold
Date: Fri May 29 18:58:28 2015
New Revision: 953125

Log:
Publishing svnmucc operation to maven site by krosenvold

Added:
websites/production/maven/content/
  - copied from r953124, websites/staging/maven/trunk/content/

svn commit: r1682529 - /maven/site/trunk/content/resources/xsd/component-1.1.3.xsd

[krosenvold]

Author: krosenvold
Date: Fri May 29 18:57:40 2015
New Revision: 1682529

URL: http://svn.apache.org/r1682529
Log:
CMS commit to maven by krosenvold

Added:
maven/site/trunk/content/resources/xsd/component-1.1.3.xsd   (with props)

Added: maven/site/trunk/content/resources/xsd/component-1.1.3.xsd
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/component-1.1.3.xsd?rev=1682529view=auto
==
Binary file - no diff available.

Propchange: maven/site/trunk/content/resources/xsd/component-1.1.3.xsd
--
svn:mime-type = application/xml

svn commit: r1682530 - /maven/site/trunk/content/resources/xsd/assembly-1.1.3.xsd

[krosenvold]

Author: krosenvold
Date: Fri May 29 19:00:14 2015
New Revision: 1682530

URL: http://svn.apache.org/r1682530
Log:
CMS commit to maven by krosenvold

Added:
maven/site/trunk/content/resources/xsd/assembly-1.1.3.xsd   (with props)

Added: maven/site/trunk/content/resources/xsd/assembly-1.1.3.xsd
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/resources/xsd/assembly-1.1.3.xsd?rev=1682530view=auto
==
Binary file - no diff available.

Propchange: maven/site/trunk/content/resources/xsd/assembly-1.1.3.xsd
--
svn:mime-type = application/xml

svn commit: r953129 - /websites/production/maven/content/

[krosenvold]

Author: krosenvold
Date: Fri May 29 19:02:15 2015
New Revision: 953129

Log:
Publishing svnmucc operation to maven site by krosenvold

Added:
websites/production/maven/content/
  - copied from r953128, websites/staging/maven/trunk/content/

svn commit: r1682528 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml

[krosenvold]

Author: krosenvold
Date: Fri May 29 18:47:40 2015
New Revision: 1682528

URL: http://svn.apache.org/r1682528
Log:
Updated to plexus-archiver 2.10.2

Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1682528r1=1682527r2=1682528view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri May 29 18:47:40 2015
@@ -124,7 +124,7 @@ under the License.
 dependency
   groupIdorg.codehaus.plexus/groupId
   artifactIdplexus-archiver/artifactId
-  version2.10/version
+  version2.10.2/version
 /dependency
 dependency
   groupIdorg.apache.maven.shared/groupId

svn commit: r1682531 - /maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm

[krosenvold]

Author: krosenvold
Date: Fri May 29 19:12:44 2015
New Revision: 1682531

URL: http://svn.apache.org/r1682531
Log:
MASSEMBLY-767 updated index page

Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm

Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm?rev=1682531r1=1682530r2=1682531view=diff
==
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm 
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/index.apt.vm Fri May 
29 19:12:44 2015
@@ -121,6 +121,8 @@ ${project.name}
 
 * Assembly and Component Descriptor Schemas (XSD)
 
+  * 
{{{http://maven.apache.org/xsd/assembly-1.1.3.xsd}http://maven.apache.org/xsd/assembly-1.1.3.xsd}},
+
{{{http://maven.apache.org/xsd/component-1.1.3.xsd}http://maven.apache.org/xsd/component-1.1.3.xsd}}
 (for version 2.5.4 and higher)
   * 
{{{http://maven.apache.org/xsd/assembly-1.1.2.xsd}http://maven.apache.org/xsd/assembly-1.1.2.xsd}},
 
{{{http://maven.apache.org/xsd/component-1.1.2.xsd}http://maven.apache.org/xsd/component-1.1.2.xsd}}
 (for version 2.2 and higher)
 

svn commit: r8725 - in /release/maven/plugins: maven-assembly-plugin-2.5.4-source-release.zip maven-assembly-plugin-2.5.4-source-release.zip.asc maven-assembly-plugin-2.5.4-source-release.zip.md5

[krosenvold]

Author: krosenvold
Date: Mon Apr 27 17:10:52 2015
New Revision: 8725

Log:
assembly 2.5.4

Added:
release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip   
(with props)
release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip.asc
release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip.md5

Added: release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip
==
Binary file - no diff available.

Propchange: release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip.asc
==
--- release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip.asc 
(added)
+++ release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip.asc 
Mon Apr 27 17:10:52 2015
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iF4EABEIAAYFAlU5HEEACgkQRmyu1uB0fVC7fQD+NJ9xH6ukFbdVNAvWZWacUwx5
+Q8qulzqQuNuQI/xLgj0A/jcrb/Xu/Dwz4whYpOQyhh33YQVWHZKqArmb+xVuKniy
+=xO+X
+-END PGP SIGNATURE-

Added: release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip.md5
==
--- release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip.md5 
(added)
+++ release/maven/plugins/maven-assembly-plugin-2.5.4-source-release.zip.md5 
Mon Apr 27 17:10:52 2015
@@ -0,0 +1 @@
+2ec09f1787225412b81f3c469a8c056f
\ No newline at end of file

svn commit: r8724 - in /release/maven/plugins: maven-assembly-plugin-2.5.3-source-release.zip maven-assembly-plugin-2.5.3-source-release.zip.asc maven-assembly-plugin-2.5.3-source-release.zip.md5

[krosenvold]

Author: krosenvold
Date: Mon Apr 27 17:10:32 2015
New Revision: 8724

Log:
assembly 2.5.4

Removed:
release/maven/plugins/maven-assembly-plugin-2.5.3-source-release.zip
release/maven/plugins/maven-assembly-plugin-2.5.3-source-release.zip.asc
release/maven/plugins/maven-assembly-plugin-2.5.3-source-release.zip.md5

svn commit: r949369 - /websites/production/maven/components/plugins/maven-assembly-plugin/

[krosenvold]

Author: krosenvold
Date: Mon Apr 27 17:15:09 2015
New Revision: 949369

Log:
Remove old site.

Removed:
websites/production/maven/components/plugins/maven-assembly-plugin/

svn commit: r949372 - /websites/production/maven/components/plugins-archives/maven-asembly-plugin-2.5.4/

[krosenvold]

Author: krosenvold
Date: Mon Apr 27 17:16:57 2015
New Revision: 949372

Log:
Removed mistyped site

Removed:

websites/production/maven/components/plugins-archives/maven-asembly-plugin-2.5.4/

svn commit: r949370 - /websites/production/maven/components/plugins-archives/maven-assembly-plugin-2.5.4/

[krosenvold]

Author: krosenvold
Date: Mon Apr 27 17:16:20 2015
New Revision: 949370

Log:
Archive versioned site.

Added:

websites/production/maven/components/plugins-archives/maven-assembly-plugin-2.5.4/
  - copied from r949369, 
websites/production/maven/components/plugins-archives/maven-assembly-plugin-LATEST/

svn commit: r949371 - /websites/production/maven/components/plugins/maven-assembly-plugin/

[krosenvold]

Author: krosenvold
Date: Mon Apr 27 17:16:29 2015
New Revision: 949371

Log:
Publish new site.

Added:
websites/production/maven/components/plugins/maven-assembly-plugin/
  - copied from r949370, 
websites/production/maven/components/plugins-archives/maven-assembly-plugin-2.5.4/

svn commit: r949384 - /websites/production/maven/content/

[krosenvold]

Author: krosenvold
Date: Mon Apr 27 18:30:38 2015
New Revision: 949384

Log:
Publishing svnmucc operation to maven site by krosenvold

Added:
websites/production/maven/content/
  - copied from r949383, websites/staging/maven/trunk/content/

svn commit: r1676358 - /maven/site/trunk/content/apt/plugins/index.apt

[krosenvold]

Author: krosenvold
Date: Mon Apr 27 18:28:53 2015
New Revision: 1676358

URL: http://svn.apache.org/r1676358
Log:
assembly 2.5.4

Modified:
maven/site/trunk/content/apt/plugins/index.apt

Modified: maven/site/trunk/content/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1676358r1=1676357r2=1676358view=diff
==
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Mon Apr 27 18:28:53 2015
@@ -135,7 +135,7 @@ Available Plugins
 
*--++--++--+++
 | {{{/archetype/maven-archetype-plugin/} archetype}} | B  | 
2.3  | 2015-03-13 | Generate a skeleton project structure from an 
archetype. | 
{{{http://svn.apache.org/repos/asf/maven/archetype/trunk/archetype-plugin}SVN}} 
| {{{https://issues.apache.org/jira/browse/ARCHETYPE}JIRA}}
 
*--++--++--+++
-| {{{/plugins/maven-assembly-plugin/} assembly}} | B  | 
2.5.3| 2014-12-17 | Build an assembly (distribution) of sources and/or 
binaries. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MASSEMBLY}JIRA}}
+| {{{/plugins/maven-assembly-plugin/} assembly}} | B  | 
2.5.4| 2015-04-27 | Build an assembly (distribution) of sources and/or 
binaries. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-assembly-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MASSEMBLY}JIRA}}
 
*--++--++--+++
 | {{{/plugins/maven-dependency-plugin/} dependency}} | B+R| 
2.10 | 2015-01-27 | Dependency manipulation (copy, unpack) and 
analysis. | 
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin}SVN}}
 | {{{https://issues.apache.org/jira/browse/MDEP}JIRA}}
 
*--++--++--+++