Author: hboutemy
Date: Thu Oct 30 06:35:51 2014
New Revision: 1635403
URL: http://svn.apache.org/r1635403
Log:
upgraded parent pom
Modified:
maven/shared/trunk/maven-project-utils/pom.xml
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
Modified: maven/shared/trunk/maven-project-utils/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/pom.xml?rev=1635403&r1=1635402&r2=1635403&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/pom.xml (original)
+++ maven/shared/trunk/maven-project-utils/pom.xml Thu Oct 30 06:35:51 2014
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
Modified:
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java?rev=1635403&r1=1635402&r2=1635403&view=diff
==============================================================================
---
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java
(original)
+++
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java
Thu Oct 30 06:35:51 2014
@@ -1,12 +1,5 @@
package org.apache.maven.shared.project.runtime;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.IOUtil;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,6 +19,16 @@ import org.codehaus.plexus.util.IOUtil;
* under the License.
*/
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.IOUtil;
+
+/**
+ *
+ */
public final class MavenUtils
{
@@ -41,7 +44,8 @@ public final class MavenUtils
// if this ever changes, we will have to revisit this code.
final Properties properties = new Properties();
final InputStream in =
- MavenProject.class.getClassLoader().getResourceAsStream(
"META-INF/maven/org.apache.maven/maven-core/pom.properties" );
+ MavenProject.class.getClassLoader().getResourceAsStream(
"META-INF/maven/org.apache.maven/maven-core/"
+ +
"pom.properties" );
try
{
properties.load( in );
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=1635403&r1=1635402&r2=1635403&view=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
Thu Oct 30 06:35:51 2014
@@ -1,21 +1,5 @@
package org.apache.maven.shared.project.utils;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Profile;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,6 +19,25 @@ import org.codehaus.plexus.util.xml.pull
* under the License.
*/
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+/**
+ *
+ */
public final class ProjectUtils
{
// This instance is often used, including in recursive methods, so
initiate it for general usage
@@ -184,8 +187,9 @@ public final class ProjectUtils
/**
- * Returns all modules of a project, including does specified in profiles,
both active and inactive.
- * The key of the returned Map is the name of the module, the value refers
to the source of the module (the project or a specific profile).
+ * Returns all modules of a project, including does specified in profiles,
both active and inactive. The key of the
+ * returned Map is the name of the module, the value refers to the source
of the module (the project or a specific
+ * profile).
*
* @param project the project
* @return all modules, never {@code null}
@@ -225,7 +229,7 @@ public final class ProjectUtils
*/
public static File getJoinedFolder( MavenProject project )
{
- if( project == null )
+ if ( project == null )
{
return null;
}
@@ -248,11 +252,12 @@ public final class ProjectUtils
return null; //@todo fix exception handling
}
- private static final File getJoinedFolder( File baseDirectory, Model model
) throws IOException, XmlPullParserException
+ private static File getJoinedFolder( File baseDirectory, Model model )
+ throws IOException, XmlPullParserException
{
File joinedFolder = baseDirectory;
- for( String module : getAllModules( model ).keySet() )
+ for ( String module : getAllModules( model ).keySet() )
{
File moduleFile = getModuleFile( baseDirectory, module );
@@ -268,7 +273,7 @@ public final class ProjectUtils
// Don't make this method public, it has nothing to do with a MavenProject.
// If required on more places, create a separate Utils-class
- protected static final File getJoinedFolder( File lhs, File rhs )
+ protected static File getJoinedFolder( File lhs, File rhs )
{
File joinedFolder = null;
@@ -294,7 +299,7 @@ public final class ProjectUtils
{
File nextFile = lhsStack.pop();
- if( nextFile.isDirectory() && nextFile.equals( rhsStack.pop() ) )
+ if ( nextFile.isDirectory() && nextFile.equals( rhsStack.pop() ) )
{
joinedFolder = nextFile;
}
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=1635403&r1=1635402&r2=1635403&view=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
Thu Oct 30 06:35:51 2014
@@ -1,11 +1,5 @@
package org.apache.maven.shared.project.utils;
-import java.io.File;
-import java.util.Map;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.project.MavenProject;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,6 +19,15 @@ import org.apache.maven.project.MavenPro
* 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()
Modified:
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/SiteUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/SiteUtils.java?rev=1635403&r1=1635402&r2=1635403&view=diff
==============================================================================
---
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/SiteUtils.java
(original)
+++
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/SiteUtils.java
Thu Oct 30 06:35:51 2014
@@ -1,11 +1,5 @@
package org.apache.maven.shared.project.utils;
-import java.io.File;
-import java.util.Map;
-
-import org.apache.maven.model.Model;
-import org.apache.maven.project.MavenProject;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,6 +19,15 @@ import org.apache.maven.project.MavenPro
* 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 SiteUtils
{
@@ -53,13 +56,13 @@ public final class SiteUtils
siteUrl = String.valueOf( getDistributionManagementSiteUrl(
project ) );
if ( !ProjectUtils.isRootProject( project ) )
{
- if( useModuleName )
+ if ( useModuleName )
{
Map<String, String> modules = ProjectUtils.getAllModules(
project.getParent() );
- for( String module : modules.keySet() )
+ for ( String module : modules.keySet() )
{
- if( new File( project.getParent().getBasedir(), module
).equals( project.getFile() ) )
+ if ( new File( project.getParent().getBasedir(),
module ).equals( project.getFile() ) )
{
return siteUrl + '/' + module;
}
@@ -81,7 +84,7 @@ public final class SiteUtils
* @param model
* @return return the url if available, otherwise {@code null}
*/
- protected static final String getDistributionManagementSiteUrl( Model
model )
+ protected static String getDistributionManagementSiteUrl( Model model )
{
if ( model.getDistributionManagement() == null ||
model.getDistributionManagement().getSite() == null )
{
@@ -90,7 +93,7 @@ public final class SiteUtils
return model.getDistributionManagement().getSite().getUrl();
}
- protected static final String getDistributionManagementSiteUrl(
MavenProject project )
+ protected static String getDistributionManagementSiteUrl( MavenProject
project )
{
if ( project.getDistributionManagement() == null ||
project.getDistributionManagement().getSite() == null )
{
