svn commit: r1722391 - /maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Author: hboutemy
Date: Wed Dec 30 18:23:06 2015
New Revision: 1722391
URL: http://svn.apache.org/viewvc?rev=1722391=rev
Log:
updated Jira urls from Codehaus to Apache
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL:
http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1722391=1722390=1722391=diff
==
---
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
(original)
+++
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Wed Dec 30 18:23:06 2015
@@ -1185,8 +1185,8 @@
#set ( $foot = $item.toString().trim() )
#set ( $documentHeader = '' )
#set ( $foot = $StringUtils.replace( $foot.toString(),
$documentHeader, "" ) )
-## Workaround for http://jira.codehaus.org/browse/MSITE-135
-## Use StringUtils untill
http://jira.codehaus.org/browse/DOXIASITETOOLS-67 is fixed
+## Workaround for https://issues.apache.org/jira/browse/MSITE-135
+## Use StringUtils until
https://issues.apache.org/jira/browse/DOXIASITETOOLS-67 is fixed
## #eval macro not supported yet, that is a silly turnaround to
allow ASF projects adopt fluido
$StringUtils.replace( $foot, '@project.name@', ${project.name} )
#end
svn commit: r1722396 - in /maven/plugins/trunk/maven-site-plugin/src/it: interpolation/ pom-interpolation/ pom-interpolation/parent/ pom-interpolation/src/site/
Author: hboutemy
Date: Wed Dec 30 19:07:34 2015
New Revision: 1722396
URL: http://svn.apache.org/viewvc?rev=1722396=rev
Log:
renamed and simplified IT
Added:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/
- copied from r1722375,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy
- copied, changed from r1722375,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.bsh
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties?rev=1722396=1722375=1722396=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/invoker.properties
Wed Dec 30 19:07:34 2015
@@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.goals.1 = clean
-invoker.goals.2 = site-deploy
+invoker.goals = clean site-deploy
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml?rev=1722396=1722375=1722396=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/parent/pom.xml
Wed Dec 30 19:07:34 2015
@@ -32,7 +32,7 @@ under the License.
site-interpolation IT - parent
-interpolation
+pom-interpolation
site-deploy
file://@project.build.directory@/it/${interpolated}/target/site-deployed/parent/
Modified: maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml?rev=1722396=1722375=1722396=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/pom.xml Wed
Dec 30 19:07:34 2015
@@ -31,7 +31,7 @@ under the License.
parent/
- interpolation
+ pom-interpolation
pom
site-interpolation IT
@@ -46,24 +46,10 @@ under the License.
maven-site-plugin
@project.version@
+
+ false
+
-
-
-
-
-org.apache.maven.plugins
-maven-project-info-reports-plugin
-2.4
-
-
-
- index
-
-
-
-
-
-
Copied:
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy
(from r1722375,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy?p2=maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy=maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh=1722375=1722396=1722396=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/pom-interpolation/verify.groovy
Wed Dec 30 19:07:34 2015
@@ -18,41 +18,4 @@
* under the License.
*/
-import java.io.*;
-import org.codehaus.plexus.util.*;
-
-boolean result = true;
-
-try
-{
-File target = new File( basedir, "target" );
-if ( !target.exists() || !target.isDirectory() )
-{
-System.err.println( "target file is missing or not a directory." );
-System.err.println( target.getAbsolutePath() );
-result = false;
-}
-
-File siteDirectory = new File( target, "site-deployed/interpolation" );
-if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
-{
-System.err.println( "site file is missing or not a directory." );
-System.err.println( siteDirectory.getAbsolutePath() );
-result = false;
-}
-
-File index = new File( siteDirectory,
svn commit: r1722372 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugins/dependency/ main/java/org/apache/maven/plugins/dependency/fromConfiguration/ main/java/or
Author: rfscholte
Date: Wed Dec 30 16:23:55 2015
New Revision: 1722372
URL: http://svn.apache.org/viewvc?rev=1722372=rev
Log:
Refactor code based on restructure of maven-artifact-transfer
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/utils/translators/ClassifierTypeTranslator.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java?rev=1722372=1722371=1722372=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java
Wed Dec 30 16:23:55 2015
@@ -195,6 +195,12 @@ public abstract class AbstractDependency
protected void unpack( Artifact artifact, File location, String includes,
String excludes )
throws MojoExecutionException
{
+unpack( artifact, artifact.getType(), location, includes, excludes );
+}
+
+protected void unpack( Artifact artifact, String type, File location,
String includes, String excludes )
+throws MojoExecutionException
+{
File file = artifact.getFile();
try
{
@@ -213,7 +219,7 @@ public abstract class AbstractDependency
try
{
-unArchiver = archiverManager.getUnArchiver( artifact.getType()
);
+unArchiver = archiverManager.getUnArchiver( type );
getLog().debug( "Found unArchiver by type: " + unArchiver );
}
catch ( NoSuchArchiverException e )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java?rev=1722372=1722371=1722372=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
Wed Dec 30 16:23:55 2015
@@ -39,9 +39,10 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
import
svn commit: r1722317 - in /maven/shared/trunk/maven-project-utils: ./ src/main/java/org/apache/maven/shared/project/utils/ src/test/java/org/apache/maven/shared/project/utils/
Author: khmarbaise
Date: Wed Dec 30 11:46:21 2015
New Revision: 1722317
URL: http://svn.apache.org/viewvc?rev=1722317=rev
Log:
Upgraded to Maven 3 and reformatted code.
Modified:
maven/shared/trunk/maven-project-utils/pom.xml
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
Modified: maven/shared/trunk/maven-project-utils/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/pom.xml?rev=1722317=1722316=1722317=diff
==
--- maven/shared/trunk/maven-project-utils/pom.xml (original)
+++ maven/shared/trunk/maven-project-utils/pom.xml Wed Dec 30 11:46:21 2015
@@ -26,7 +26,7 @@ under the License.
org.apache.maven.shared
maven-shared-components
-21
+22
../../pom/maven/maven-shared-components/pom.xml
@@ -55,7 +55,7 @@ under the License.
-2.2.1
+3.0
@@ -65,11 +65,6 @@ under the License.
${mavenVersion}
- org.apache.maven
- maven-project
- ${mavenVersion}
-
-
org.apache.maven
maven-model
${mavenVersion}
Modified:
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java?rev=1722317=1722316=1722317=diff
==
---
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
(original)
+++
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/ProjectUtils.java
Wed Dec 30 11:46:21 2015
@@ -42,7 +42,7 @@ public final class ProjectUtils
{
// This instance is often used, including in recursive methods, so
initiate it for general usage
private static final MavenXpp3Reader POM_READER = new MavenXpp3Reader();
-
+
private ProjectUtils()
{
}
@@ -91,7 +91,7 @@ public final class ProjectUtils
{
return null;
}
-
+
MavenProject current = project;
while ( !isRootProject( current ) )
@@ -104,15 +104,14 @@ public final class ProjectUtils
/**
* Return {@code true} if this project has modules, but is
never the parent of one of them.
- *
* Return {@code false} if this project has no modules, or if 1 or more
modules have this project as its parent.
*
* @param project
- * @return {@code true} if project is an aggregator, {@code false} if
project is standalone or hybrid
+ * @return {@code true} if project is an aggregator, {@code false} if
project is standalone or hybrid
*/
public static boolean isAggregator( MavenProject project )
{
- // (not) being an aggregator must never depend on reactor projects or
active profiles
+// (not) being an aggregator must never depend on reactor projects or
active profiles
Set modules = getAllModules( project ).keySet();
if ( modules.isEmpty() )
@@ -149,23 +148,24 @@ public final class ProjectUtils
return true;
}
-private static Model readModel( File moduleFile ) throws IOException,
XmlPullParserException
+private static Model readModel( File moduleFile )
+throws IOException, XmlPullParserException
{
FileReader moduleReader = null;
-
+
Model model = null;
-
+
try
{
moduleReader = new FileReader( moduleFile );
-
+
model = POM_READER.read( moduleReader );
}
finally
{
IOUtil.close( moduleReader );
}
-
+
return model;
}
@@ -173,11 +173,11 @@ public final class ProjectUtils
{
return getModuleFile( project.getBasedir(), module );
}
-
+
private static File getModuleFile( File basedir, String module )
{
File moduleFile = new File( basedir, module );
-
+
if ( moduleFile.isDirectory() )
{
moduleFile = new File( moduleFile, "pom.xml" );
@@ -185,7 +185,6 @@ public final class ProjectUtils
return moduleFile;
}
-
/**
* Returns all modules of a project, including does specified in profiles,
both active and inactive. The key of the
svn commit: r1722332 - /maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Author: andham
Date: Wed Dec 30 14:17:31 2015
New Revision: 1722332
URL: http://svn.apache.org/viewvc?rev=1722332=rev
Log:
Clean up of some unit tests after commit 1717974
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=1722332=1722331=1722332=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Wed Dec 30 14:17:31 2015
@@ -33,8 +33,6 @@ import org.apache.maven.shared.test.plug
import org.apache.maven.shared.test.plugin.RepositoryTool;
import org.apache.maven.shared.test.plugin.TestToolsException;
import org.codehaus.plexus.PlexusTestCase;
-import org.junit.Assume;
-
import java.io.File;
import java.util.Arrays;
import java.util.Collections;
@@ -125,7 +123,8 @@ public class DefaultProjectDependencyAna
{
return;
}
-// Only visible through constant pool analysis
+
+// Only visible through constant pool analysis (supported for JDK8+)
compileProject( "java8methodRefs/pom.xml" );
MavenProject project = getProject( "java8methodRefs/pom.xml" );
@@ -143,7 +142,7 @@ public class DefaultProjectDependencyAna
}
-public void testInlinedStaticReferece()
+public void testInlinedStaticReference()
throws TestToolsException, ProjectDependencyAnalyzerException
{
if ( !SystemUtils.isJavaVersionAtLeast( 180 ) )
@@ -151,7 +150,7 @@ public class DefaultProjectDependencyAna
return;
}
-// Only visible through constant pool analysis
+// Only visible through constant pool analysis (supported for JDK8+)
compileProject( "inlinedStaticReference/pom.xml" );
MavenProject project = getProject( "inlinedStaticReference/pom.xml" );
@@ -174,9 +173,7 @@ public class DefaultProjectDependencyAna
MavenProject project2 = getProject(
"jarWithCompileDependency/project2/pom.xml" );
-if ( project2.getBuild()
- .getOutputDirectory()
- .contains( "${" ) )
+if ( project2.getBuild().getOutputDirectory().contains( "${" ) )
{
// if Maven version used as dependency is upgraded to >= 2.2.0
throw new TestToolsException( "output directory was not
interpolated: " + project2.getBuild()
@@ -194,77 +191,43 @@ public class DefaultProjectDependencyAna
assertEquals( expectedAnalysis, actualAnalysis );
}
-public void testJarWithTestDependency()
+public void testForceDeclaredDependenciesUsage()
throws TestToolsException, ProjectDependencyAnalyzerException
{
-if ( SystemUtils.isJavaVersionAtLeast( 180 ) )
-{
-return;
-}
-
-Assume.assumeTrue( !SystemUtils.isJavaVersionAtLeast( 180 ) );
-
compileProject( "jarWithTestDependency/pom.xml" );
MavenProject project2 = getProject(
"jarWithTestDependency/project2/pom.xml" );
-ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project2
);
-
-Artifact project1 =
-createArtifact(
"org.apache.maven.shared.dependency-analyzer.tests", "jarWithTestDependency1",
"jar", "1.0",
-"test" );
-Set usedDeclaredArtifacts = Collections.singleton( project1
);
-
-Artifact junit = createArtifact( "junit", "junit", "jar", "3.8.1",
"test" );
-Set unusedDeclaredArtifacts = Collections.singleton( junit );
-
-ProjectDependencyAnalysis expectedAnalysis =
-new ProjectDependencyAnalysis( usedDeclaredArtifacts, null,
unusedDeclaredArtifacts );
-
-assertEquals( expectedAnalysis, actualAnalysis );
-
-// MSHARED-253: force used dependency (which is actually used but not
detected)
-ProjectDependencyAnalysis forcedAnalysis =
-actualAnalysis.forceDeclaredDependenciesUsage( new String[]{
"junit:junit" } );
-
-usedDeclaredArtifacts = new HashSet( Arrays.asList(
project1, junit ) );
-expectedAnalysis = new ProjectDependencyAnalysis(
usedDeclaredArtifacts, null, null );
-
-assertEquals( expectedAnalysis, forcedAnalysis );
+ProjectDependencyAnalysis analysis = analyzer.analyze( project2 );
try
{
-
