You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/26 19:57:05 UTC
svn commit: r1517623 [2/4] - in /maven/plugins/trunk:
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/
maven-assembly-plugin/src/it/projects/basic-features/ExecutionRoot/child...
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/child-level2-project1/pom.xml Mon Aug 26 17:57:00 2013
@@ -5,8 +5,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/child-level1-project2/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,8 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project1/pom.xml Mon Aug 26 17:57:00 2013
@@ -5,8 +5,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child-level1-project1</artifactId>
+ <artifactId>child-level1-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/pom.xml Mon Aug 26 17:57:00 2013
@@ -5,8 +5,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,8 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml Mon Aug 26 17:57:00 2013
@@ -5,8 +5,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child-level1-project1</artifactId>
+ <artifactId>child-level1-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml Mon Aug 26 17:57:00 2013
@@ -5,8 +5,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child-level2-project1</artifactId>
+ <artifactId>child-level2-project1</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,8 +6,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>child-level1-project2</artifactId>
+ <artifactId>child-level1-project2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/basic-repository/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,9 +6,8 @@
<artifactId>it-project-parent</artifactId>
<version>1</version>
</parent>
-
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>repository-assembly</artifactId>
+
+ <artifactId>repository-assembly</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Maven Quick Start Archetype</name>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,9 +6,8 @@
<artifactId>it-project-parent</artifactId>
<version>1</version>
</parent>
-
- <groupId>org.apache.maven.plugin.assembly.test</groupId>
- <artifactId>repo-with-snapshot-parents</artifactId>
+
+ <artifactId>repo-with-snapshot-parents</artifactId>
<packaging>pom</packaging>
<version>1-SNAPSHOT</version>
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=1517623&r1=1517622&r2=1517623&view=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 Mon Aug 26 17:57:00 2013
@@ -233,7 +233,7 @@ public class DefaultAssemblyArchiver
final List<ContainerDescriptorHandler> handlers = new ArrayList<ContainerDescriptorHandler>();
final List<String> hints = new ArrayList<String>();
- if ( ( requestedContainerDescriptorHandlers != null ) && !requestedContainerDescriptorHandlers.isEmpty() )
+ if (!requestedContainerDescriptorHandlers.isEmpty())
{
for (final ContainerDescriptorHandlerConfig config : requestedContainerDescriptorHandlers) {
final String hint = config.getHandlerName();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java Mon Aug 26 17:57:00 2013
@@ -81,7 +81,7 @@ public final class FilterUtils
}
for (final PatternIncludesArtifactFilter f : allFilters) {
- if (f instanceof StatisticsReportingArtifactFilter) {
+ if (f != null) {
f.reportMissedCriteria(logger);
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/ProjectUtils.java Mon Aug 26 17:57:00 2013
@@ -157,10 +157,7 @@ public final class ProjectUtils
if ( moduleBasedir == null )
{
- if ( moduleFile != null )
- {
- moduleBasedir = moduleFile.getParentFile();
- }
+ moduleBasedir = moduleFile.getParentFile();
if ( moduleBasedir == null )
{
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java Mon Aug 26 17:57:00 2013
@@ -574,7 +574,7 @@ public class ChangeLogReport
}
private void writeChangelogXml( List<ChangeLogSet> changelogList )
- throws FileNotFoundException, UnsupportedEncodingException, IOException
+ throws IOException
{
StringBuilder changelogXml = new StringBuilder();
@@ -1373,21 +1373,15 @@ public class ChangeLogReport
}
finally
{
- if ( br != null )
+ try
{
- try
- {
- br.close();
- }
- catch ( IOException e )
- {
- getLog().warn( "Unable to close a reader." );
- }
+ br.close();
}
- if ( sr != null )
+ catch ( IOException e )
{
- sr.close();
+ getLog().warn( "Unable to close a reader." );
}
+ sr.close();
}
sink.tableCell_();
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module1/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module1/pom.xml Mon Aug 26 17:57:00 2013
@@ -27,8 +27,7 @@
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin-test1</artifactId>
+ <artifactId>maven-changes-plugin-test1</artifactId>
<version>99.0</version>
<name>Module1</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module2/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module2/pom.xml Mon Aug 26 17:57:00 2013
@@ -27,8 +27,7 @@
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin-test2</artifactId>
+ <artifactId>maven-changes-plugin-test2</artifactId>
<version>99.0</version>
<name>Module2</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module3/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module3/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/it/report-aggregated-changes-generation/module3/pom.xml Mon Aug 26 17:57:00 2013
@@ -27,8 +27,7 @@
<artifactId>maven-changes-plugin-test</artifactId>
<version>99.0</version>
</parent>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin-test3</artifactId>
+ <artifactId>maven-changes-plugin-test3</artifactId>
<version>99.0</version>
<name>Module3</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java Mon Aug 26 17:57:00 2013
@@ -463,7 +463,7 @@ public class AnnouncementMojo
{
ChangesXML changesXML = new ChangesXML( getXmlPath(), getLog() );
List<Release> changesReleases = releaseUtils.convertReleaseList( changesXML.getReleaseList() );
- releases = releaseUtils.mergeReleases( releases, changesReleases );
+ releases = releaseUtils.mergeReleases( null, changesReleases );
getLog().info( "Including issues from file " + getXmlPath() + " in announcement..." );
}
else
@@ -626,7 +626,7 @@ public class AnnouncementMojo
* @throws ResourceNotFoundException, VelocityException, IOException
*/
public void processTemplate( Context context, File outputDirectory, String template, String announcementFile )
- throws ResourceNotFoundException, VelocityException, MojoExecutionException
+ throws VelocityException, MojoExecutionException
{
File f;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java Mon Aug 26 17:57:00 2013
@@ -329,7 +329,6 @@ public final class ClassicJiraDownloader
private void determineProxy( String jiraUrl, HttpClient client )
{
// see whether there is any proxy defined in maven
- Proxy proxy = null;
getProxyInfo( jiraUrl );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java Mon Aug 26 17:57:00 2013
@@ -160,7 +160,7 @@ public class JiraHelper
String tHost = targetHost;
if ( tHost == null )
{
- tHost = new String();
+ tHost = "";
}
if ( proxy == null )
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java Mon Aug 26 17:57:00 2013
@@ -69,8 +69,6 @@ public class ProjectResourceLoader
paths.add( path );
- int sz = paths.size();
-
for (String path1 : paths) {
rsvc.getLog().info("ProjectResourceLoader : adding path '" + path1 + "'");
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java Mon Aug 26 17:57:00 2013
@@ -123,7 +123,7 @@ public class TracDownloader
qstr = query;
}
- Object[] params = new Object[] { new String( qstr ) };
+ Object[] params = new Object[] {qstr};
Object[] queryResult;
ArrayList<Issue> issueList = new ArrayList<Issue>();
try
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java Mon Aug 26 17:57:00 2013
@@ -70,7 +70,7 @@ public class IssueUtilsTestCase
try
{
- filteredIssues = IssueUtils.filterIssuesWithVersionPrefix( issueList, "yourPrefix-" );
+ IssueUtils.filterIssuesWithVersionPrefix( issueList, "yourPrefix-" );
fail("No issues should be found.");
}
catch ( MojoExecutionException e )
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-131/module/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-131/module/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-131/module/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-131/module/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<groupId>com.mycompany</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>com.mycompany</groupId>
- <artifactId>module</artifactId>
+ <artifactId>module</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Example Module</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-a/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-a/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-a/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<groupId>org.apache.maven.plugins.checkstyle.its</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.checkstyle.its</groupId>
- <artifactId>multi-modules-child</artifactId>
+ <artifactId>multi-modules-child</artifactId>
<version>1.0-SNAPSHOT</version>
<name>multi-modules-child</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-b/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-b/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules-aggregate/child-b/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<groupId>org.apache.maven.plugins.checkstyle.its</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.checkstyle.its</groupId>
- <artifactId>multi-modules-child-nosource</artifactId>
+ <artifactId>multi-modules-child-nosource</artifactId>
<version>1.0-SNAPSHOT</version>
<name>multi-modules-child-nosource</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child-nosource/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child-nosource/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child-nosource/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child-nosource/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<groupId>org.apache.maven.plugins.checkstyle.its</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.checkstyle.its</groupId>
- <artifactId>multi-modules-child-nosource</artifactId>
+ <artifactId>multi-modules-child-nosource</artifactId>
<version>1.0-SNAPSHOT</version>
<name>multi-modules-child-nosource</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/multi-modules/multi-modules-child/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<groupId>org.apache.maven.plugins.checkstyle.its</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.checkstyle.its</groupId>
- <artifactId>multi-modules-child</artifactId>
+ <artifactId>multi-modules-child</artifactId>
<version>1.0-SNAPSHOT</version>
<name>multi-modules-child</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java Mon Aug 26 17:57:00 2013
@@ -180,7 +180,7 @@ public class CheckstyleReportTest
assertTrue( "Test cache file exists", new File( cacheFile ).exists() );
}
- MavenReport reportMojo = (MavenReport) mojo;
+ MavenReport reportMojo = mojo;
File outputDir = reportMojo.getReportOutputDirectory();
Boolean rss = (Boolean) getVariableValueFromObject( mojo, "enableRSS" );
Modified: maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml Mon Aug 26 17:57:00 2013
@@ -30,8 +30,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>test</groupId>
- <artifactId>child-a</artifactId>
+ <artifactId>child-a</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Child A</name>
Modified: maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml Mon Aug 26 17:57:00 2013
@@ -30,8 +30,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>test</groupId>
- <artifactId>child-a</artifactId>
+ <artifactId>child-a</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Child A</name>
Modified: maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/pom.xml (original)
+++ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/pom.xml Mon Aug 26 17:57:00 2013
@@ -30,8 +30,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>test</groupId>
- <artifactId>child-b</artifactId>
+ <artifactId>child-b</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Child B</name>
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-1/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<artifactId>mcompiler-170</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.compiler.it</groupId>
- <artifactId>mcompiler-170-1</artifactId>
+ <artifactId>mcompiler-170-1</artifactId>
<version>1.0-SNAPSHOT</version>
<name>mcompiler-170-1</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-2/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<artifactId>mcompiler-170</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.compiler.it</groupId>
- <artifactId>mcompiler-170-2</artifactId>
+ <artifactId>mcompiler-170-2</artifactId>
<version>1.0-SNAPSHOT</version>
<name>mcompiler-170-1</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-3/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<artifactId>mcompiler-170</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.compiler.it</groupId>
- <artifactId>mcompiler-170-3</artifactId>
+ <artifactId>mcompiler-170-3</artifactId>
<version>1.0-SNAPSHOT</version>
<name>mcompiler-170-1</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-170/mcompiler-170-4/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<artifactId>mcompiler-170</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.maven.plugins.compiler.it</groupId>
- <artifactId>mcompiler-170-4</artifactId>
+ <artifactId>mcompiler-170-4</artifactId>
<version>1.0-SNAPSHOT</version>
<name>mcompiler-170-1</name>
<url>http://maven.apache.org</url>
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java Mon Aug 26 17:57:00 2013
@@ -480,13 +480,11 @@ public abstract class AbstractCompilerMo
if ( debug && StringUtils.isNotEmpty( debuglevel ) )
{
String[] split = StringUtils.split( debuglevel, "," );
- for ( int i = 0; i < split.length; i++ )
- {
- if ( !( split[i].equalsIgnoreCase( "none" ) || split[i].equalsIgnoreCase( "lines" )
- || split[i].equalsIgnoreCase( "vars" ) || split[i].equalsIgnoreCase( "source" ) ) )
- {
- throw new IllegalArgumentException( "The specified debug level: '" + split[i] + "' is unsupported. "
- + "Legal values are 'none', 'lines', 'vars', and 'source'." );
+ for (String aSplit : split) {
+ if (!(aSplit.equalsIgnoreCase("none") || aSplit.equalsIgnoreCase("lines")
+ || aSplit.equalsIgnoreCase("vars") || aSplit.equalsIgnoreCase("source"))) {
+ throw new IllegalArgumentException("The specified debug level: '" + aSplit + "' is unsupported. "
+ + "Legal values are 'none', 'lines', 'vars', and 'source'.");
}
}
compilerConfiguration.setDebugLevel( debuglevel );
@@ -606,12 +604,7 @@ public abstract class AbstractCompilerMo
{
if ( !skipMultiThreadWarning )
{
- StringBuilder sb = new StringBuilder(
- "You are in a multi-thread build and compilerReuseStrategy is set to reuseSame. This can cause issues in some environments (os/jdk)! Consider using reuseCreated strategy." );
- sb.append( System.getProperty( "line.separator" ) );
- sb.append(
- "If your env is fine with reuseSame, you can skip this warning with the configuration field skipMultiThreadWarning or -Dmaven.compiler.skipMultiThreadWarning=true" );
- getLog().warn( sb.toString() );
+ getLog().warn("You are in a multi-thread build and compilerReuseStrategy is set to reuseSame. This can cause issues in some environments (os/jdk)! Consider using reuseCreated strategy." + System.getProperty("line.separator") + "If your env is fine with reuseSame, you can skip this warning with the configuration field skipMultiThreadWarning or -Dmaven.compiler.skipMultiThreadWarning=true");
}
}
compilerConfiguration.setCompilerReuseStrategy( CompilerConfiguration.CompilerReuseStrategy.ReuseSame );
@@ -630,7 +623,7 @@ public abstract class AbstractCompilerMo
IncrementalBuildHelper incrementalBuildHelper = new IncrementalBuildHelper( mojoExecution, mavenSession );
- Set<File> sources = null;
+ Set<File> sources;
IncrementalBuildHelperRequest incrementalBuildHelperRequest = null;
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java Mon Aug 26 17:57:00 2013
@@ -136,7 +136,7 @@ public class CompilerMojo
protected SourceInclusionScanner getSourceInclusionScanner( int staleMillis )
{
- SourceInclusionScanner scanner = null;
+ SourceInclusionScanner scanner;
if ( includes.isEmpty() && excludes.isEmpty() )
{
@@ -156,7 +156,7 @@ public class CompilerMojo
protected SourceInclusionScanner getSourceInclusionScanner( String inputFileEnding )
{
- SourceInclusionScanner scanner = null;
+ SourceInclusionScanner scanner;
// it's not defined if we get the ending with or without the dot '.'
String defaultIncludePattern = "**/*" + ( inputFileEnding.startsWith( "." ) ? "" : "." ) + inputFileEnding;
Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java Mon Aug 26 17:57:00 2013
@@ -170,7 +170,7 @@ public class TestCompilerMojo
protected SourceInclusionScanner getSourceInclusionScanner( int staleMillis )
{
- SourceInclusionScanner scanner = null;
+ SourceInclusionScanner scanner;
if ( testIncludes.isEmpty() && testExcludes.isEmpty() )
{
@@ -190,7 +190,7 @@ public class TestCompilerMojo
protected SourceInclusionScanner getSourceInclusionScanner( String inputFileEnding )
{
- SourceInclusionScanner scanner = null;
+ SourceInclusionScanner scanner;
// it's not defined if we get the ending with or without the dot '.'
String defaultIncludePattern = "**/*" + ( inputFileEnding.startsWith( "." ) ? "" : "." ) + inputFileEnding;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java Mon Aug 26 17:57:00 2013
@@ -417,7 +417,7 @@ public class PurgeLocalRepositoryMojo
String[] pathComponents = gav.split( ":" );
- StringBuffer path = new StringBuffer( pathComponents[0].replace( '.', '/' ) );
+ StringBuilder path = new StringBuilder( pathComponents[0].replace( '.', '/' ) );
for ( int i = 1; i < pathComponents.length; ++i )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java Mon Aug 26 17:57:00 2013
@@ -329,7 +329,7 @@ public class BuildClasspathMojo
try
{
String oldCp = readClasspathFile();
- return ( cpString == oldCp || ( cpString != null && cpString.equals( oldCp ) ) );
+ return (cpString.equals(oldCp) || ( cpString != null && cpString.equals( oldCp ) ) );
}
catch ( Exception ex )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java Mon Aug 26 17:57:00 2013
@@ -171,7 +171,7 @@ public class TestGetMojo
try
{
- repo = mojo.parseRepository( "::::http://repo1.maven.apache.org/maven2", policy );
+ mojo.parseRepository( "::::http://repo1.maven.apache.org/maven2", policy );
fail( "Exception expected" );
}
catch ( MojoFailureException e )
@@ -181,7 +181,7 @@ public class TestGetMojo
try
{
- repo = mojo.parseRepository( "central::http://repo1.maven.apache.org/maven2", policy );
+ mojo.parseRepository( "central::http://repo1.maven.apache.org/maven2", policy );
fail( "Exception expected" );
}
catch ( MojoFailureException e )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromDependencies/TestBuildClasspathMojo.java Mon Aug 26 17:57:00 2013
@@ -68,7 +68,7 @@ public class TestBuildClasspathMojo
String file;
try
{
- file = mojo.readClasspathFile();
+ mojo.readClasspathFile();
fail( "Expected an illegal Argument Exception" );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestSilentLog.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestSilentLog.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestSilentLog.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestSilentLog.java Mon Aug 26 17:57:00 2013
@@ -31,7 +31,7 @@ public class TestSilentLog
public void testLog()
{
Log log = new DependencySilentLog();
- String text = new String( "Text" );
+ String text = "Text";
Throwable e = new RuntimeException();
log.debug( text );
log.debug( text, e );
@@ -54,7 +54,7 @@ public class TestSilentLog
public void testLogger()
{
Logger log = new DependencySilentLog();
- String text = new String( "Text" );
+ String text = "Text";
Throwable e = new RuntimeException();
log.debug( text );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/translators/TestClassifierTypeTranslator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/translators/TestClassifierTypeTranslator.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/translators/TestClassifierTypeTranslator.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/translators/TestClassifierTypeTranslator.java Mon Aug 26 17:57:00 2013
@@ -83,12 +83,12 @@ public class TestClassifierTypeTranslato
{
Iterator<Artifact> resultIter = results.iterator();
boolean found = false;
- while ( !found && resultIter.hasNext() )
+ while (resultIter.hasNext())
{
Artifact translatedArtifact = resultIter.next();
- if ( artifact.getArtifactId() == translatedArtifact.getArtifactId()
- && artifact.getGroupId() == translatedArtifact.getGroupId()
- && artifact.getScope() == translatedArtifact.getScope() )
+ if (artifact.getArtifactId().equals(translatedArtifact.getArtifactId())
+ && artifact.getGroupId().equals(translatedArtifact.getGroupId())
+ && artifact.getScope().equals(translatedArtifact.getScope()))
{
// classifier is null, should be the same as the artifact
assertEquals( artifact.getClassifier(), translatedArtifact.getClassifier() );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.pom?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.pom (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.pom Mon Aug 26 17:57:00 2013
@@ -5,8 +5,7 @@
<version>8</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Dependency Plugin</name>
<version>test</version>
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java Mon Aug 26 17:57:00 2013
@@ -316,7 +316,7 @@ public abstract class AbstractEarModule
{
if ( bundleDir == null )
{
- return bundleDir;
+ return null;
}
// Using slashes
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Mon Aug 26 17:57:00 2013
@@ -480,7 +480,7 @@ public class EarMojo
excludeList.add( "**/" + META_INF + "/application.xml" );
}
- return excludeList.toArray( EMPTY_STRING_ARRAY );
+ return excludeList.toArray(new String[excludeList.size()]);
}
/**
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java Mon Aug 26 17:57:00 2013
@@ -172,7 +172,6 @@ public class GenerateApplicationXmlMojo
if ( getJbossConfiguration() == null )
{
getLog().debug( "Generation of jboss-app.xml is disabled" );
- return;
}
else
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java Mon Aug 26 17:57:00 2013
@@ -225,8 +225,8 @@ public class EclipseToMavenMojo
int i = 1;
for (Object o : plugins.keySet()) {
getLog().info(Messages.getString("EclipseToMavenMojo.processingplugin",
- new Object[]{Integer.valueOf(i++),
- Integer.valueOf(plugins.keySet().size())})); //$NON-NLS-1$
+ new Object[]{i++,
+ plugins.keySet().size()})); //$NON-NLS-1$
String key = (String) o;
EclipseOsgiPlugin plugin = (EclipseOsgiPlugin) plugins.get(key);
Model model = (Model) models.get(key);
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java Mon Aug 26 17:57:00 2013
@@ -146,14 +146,6 @@ public class MyEclipsePlugin
}
if ( getHibernate() != null )
{
- // Only Spring configuration file is currently supported
- String hbmCfgFile = (String) getHibernate().get( "config-file" );
-
- if ( "".equals( hbmCfgFile ) )
- {
- hbmCfgFile = MYECLIPSE_DEFAULT_HIBERNATE_CFG_XML;
- }
-
new MyEclipseHibernateWriter( getHibernate() ).init( getLog(), config ).write();
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java Mon Aug 26 17:57:00 2013
@@ -98,9 +98,9 @@ public class ReadWorkspaceLocations
/**
* Detect WTP Default Server. Do nothing if tehre are no defined servers in the settings.
*
- * @param workspaceConfiguration
- * @param wtpDefaultServer
- * @param log
+ * @param workspaceConfiguration the workspace configuration
+ * @param wtpDefaultServer Default server
+ * @param log the log
*/
private void detectWTPDefaultServer( WorkspaceConfiguration workspaceConfiguration, String wtpDefaultServer, Log log )
{
@@ -193,7 +193,7 @@ public class ReadWorkspaceLocations
/**
* Search the default JREContainer from eclipse for the current MavenProject
*
- * @param workspaceLocation the location of the workspace.
+ * @param workspaceConfiguration the location of the workspace.
* @param project the maven project the get the configuration
* @param logger the logger for errors
*/
@@ -326,7 +326,7 @@ public class ReadWorkspaceLocations
* @throws IOException
*/
private IdeDependency readArtefact( File projectLocation, Log logger )
- throws FileNotFoundException, XmlPullParserException, IOException
+ throws XmlPullParserException, IOException
{
File projectFile = new File( projectLocation, ".project" );
String eclipseProjectName = projectLocation.getName();
@@ -361,9 +361,9 @@ public class ReadWorkspaceLocations
}
}
- /* package */HashMap readDefinedServers( WorkspaceConfiguration workspaceConfiguration, Log logger )
+ /* package */HashMap<String,String> readDefinedServers( WorkspaceConfiguration workspaceConfiguration, Log logger )
{
- HashMap detectedRuntimes = new HashMap();
+ HashMap<String,String> detectedRuntimes = new HashMap<String,String>();
if ( workspaceConfiguration.getWorkspaceDirectory() != null )
{
Xpp3Dom runtimesElement = null;
@@ -417,7 +417,7 @@ public class ReadWorkspaceLocations
* @param logger the logger to error messages
* @return the map with found jre's
*/
- private HashMap readAvailableJREs( File workspaceLocation, Log logger )
+ private HashMap<String,String> readAvailableJREs( File workspaceLocation, Log logger )
{
Xpp3Dom vms;
try
@@ -441,7 +441,7 @@ public class ReadWorkspaceLocations
return null;
}
- HashMap jreMap = new HashMap();
+ HashMap<String,String> jreMap = new HashMap<String,String>();
jreMap.put( "1.2", CLASSPATHENTRY_STANDARD + "J2SE-1.2" );
jreMap.put( "1.3", CLASSPATHENTRY_STANDARD + "J2SE-1.3" );
jreMap.put( "1.4", CLASSPATHENTRY_STANDARD + "J2SE-1.4" );
@@ -496,12 +496,12 @@ public class ReadWorkspaceLocations
/**
* Scan the eclipse workspace and create a array with {@link IdeDependency} for all found artifacts.
*
- * @param workspaceLocation the location of the eclipse workspace.
+ * @param workspaceConfiguration the location of the eclipse workspace.
* @param logger the logger to report errors and debug info.
*/
private void readWorkspace( WorkspaceConfiguration workspaceConfiguration, Log logger )
{
- ArrayList dependencies = new ArrayList();
+ ArrayList<IdeDependency> dependencies = new ArrayList<IdeDependency>();
if ( workspaceConfiguration.getWorkspaceDirectory() != null )
{
File workspace =
@@ -536,6 +536,6 @@ public class ReadWorkspaceLocations
}
}
logger.debug( dependencies.size() + " from workspace " + workspaceConfiguration.getWorkspaceDirectory() );
- workspaceConfiguration.setWorkspaceArtefacts( (IdeDependency[]) dependencies.toArray( new IdeDependency[dependencies.size()] ) );
+ workspaceConfiguration.setWorkspaceArtefacts(dependencies.toArray( new IdeDependency[dependencies.size()] ));
}
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java Mon Aug 26 17:57:00 2013
@@ -171,11 +171,11 @@ public class EclipseProjectWriter
}
for (Object o1 : config.getBuildCommands()) {
- buildCommands.add((BuildCommand) o1);
+ buildCommands.add(o1);
}
for (Object o : config.getLinkedResources()) {
- linkedResources.add((LinkedResource) o);
+ linkedResources.add(o);
}
Writer w;
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/TempEclipseWorkspace.java Mon Aug 26 17:57:00 2013
@@ -111,13 +111,13 @@ public class TempEclipseWorkspace
* Given the relative path from the workspace to the project to link use the basename as the project name and link
* this project to the fully qualified path anchored at workspaceLocation.
*
- * @param projectToLink
+ * @param projectToLink The project to link
* @throws MalformedURLException
* @throws FileNotFoundException
* @throws IOException
*/
private void writeLocationFile( String projectToLink )
- throws MalformedURLException, FileNotFoundException, IOException
+ throws IOException
{
File projectToLinkAsRelativeFile = new File( projectToLink );
@@ -139,8 +139,7 @@ public class TempEclipseWorkspace
}
private static void preparePropertyFile( File jdkLocation, File propertyfile )
- throws IOException, FileNotFoundException
- {
+ throws IOException {
Properties properties = new Properties();
properties.load( new FileInputStream( propertyfile ) );
properties.setProperty(
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A1/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,8 +6,7 @@
<artifactId>project-A</artifactId>
<version>1</version>
</parent>
- <groupId>eclipse</groupId>
- <artifactId>module-A1</artifactId>
+ <artifactId>module-A1</artifactId>
<version>1</version>
<name>Module A1</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-A/module-A2/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,8 +6,7 @@
<artifactId>project-A</artifactId>
<version>1</version>
</parent>
- <groupId>eclipse</groupId>
- <artifactId>module-A2</artifactId>
+ <artifactId>module-A2</artifactId>
<version>1</version>
<name>Module A2</name>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-1</artifactId>
+ <artifactId>multymodule-1</artifactId>
<version>1.0</version>
<name>multymodule-1</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>war</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>module-2</artifactId>
+ <artifactId>module-2</artifactId>
<version>1.0</version>
<name>module-2</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-4</artifactId>
+ <artifactId>multymodule-4</artifactId>
<version>1.0</version>
<name>multymodule-4</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>war</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-war</artifactId>
+ <artifactId>multymodule-war</artifactId>
<version>1.0</version>
<name>multymodule-war</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>eclipse.project28</groupId>
- <artifactId>war-test</artifactId>
+ <artifactId>war-test</artifactId>
<version>28</version>
<packaging>war</packaging>
<name>War Project</name>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-1</artifactId>
+ <artifactId>multymodule-1</artifactId>
<version>1.0</version>
<name>multymodule-1</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>war</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-2</artifactId>
+ <artifactId>multymodule-2</artifactId>
<version>1.0</version>
<name>multymodule-2</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>ear</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-3</artifactId>
+ <artifactId>multymodule-3</artifactId>
<version>1.0</version>
<name>multymodule-3</name>
<build>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-4</artifactId>
+ <artifactId>multymodule-4</artifactId>
<version>1.0</version>
<name>multymodule-4</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-1</artifactId>
+ <artifactId>multymodule-1</artifactId>
<version>1.0</version>
<name>multymodule-1</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>war</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-2</artifactId>
+ <artifactId>multymodule-2</artifactId>
<version>1.0</version>
<name>multymodule-2</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>ear</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-3</artifactId>
+ <artifactId>multymodule-3</artifactId>
<version>1.0</version>
<name>multymodule-3</name>
<build>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>1.0</version>
</parent>
<packaging>jar</packaging>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-4</artifactId>
+ <artifactId>multymodule-4</artifactId>
<version>1.0</version>
<name>multymodule-4</name>
<dependencies>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,9 +6,8 @@
<groupId>eclipse</groupId>
<artifactId>maven-eclipse-plugin-test-project-52</artifactId>
<version>52</version>
- </parent>
- <groupId>eclipse</groupId>
- <artifactId>module-1</artifactId>
+ </parent>
+ <artifactId>module-1</artifactId>
<version>52</version>
<packaging>jar</packaging>
<build>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,9 +6,8 @@
<groupId>eclipse</groupId>
<artifactId>maven-eclipse-plugin-test-project-52</artifactId>
<version>52</version>
- </parent>
- <groupId>eclipse</groupId>
- <artifactId>module-2</artifactId>
+ </parent>
+ <artifactId>module-2</artifactId>
<version>52</version>
<packaging>jar</packaging>
</project>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml Mon Aug 26 17:57:00 2013
@@ -6,9 +6,8 @@
<groupId>eclipse</groupId>
<artifactId>maven-eclipse-plugin-test-project-52</artifactId>
<version>52</version>
- </parent>
- <groupId>eclipse</groupId>
- <artifactId>module-3</artifactId>
+ </parent>
+ <artifactId>module-3</artifactId>
<version>52</version>
<packaging>jar</packaging>
<build>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-65-MECLIPSE-642/module-1/pom.xml Mon Aug 26 17:57:00 2013
@@ -5,8 +5,7 @@
<artifactId>parent</artifactId>
<version>1.0</version>
</parent>
- <groupId>eclipse.project65</groupId>
- <artifactId>module-1</artifactId>
+ <artifactId>module-1</artifactId>
<version>1</version>
<packaging>war</packaging>
<name>War Project</name>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
<version>1.0</version>
</parent>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-1</artifactId>
+ <artifactId>multymodule-1</artifactId>
<version>99.0</version>
<packaging>jar</packaging>
<name>multymodule-1</name>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml Mon Aug 26 17:57:00 2013
@@ -7,8 +7,7 @@
<artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
<version>1.0</version>
</parent>
- <groupId>eclipsetest</groupId>
- <artifactId>multymodule-2</artifactId>
+ <artifactId>multymodule-2</artifactId>
<version>99.0</version>
<packaging>jar</packaging>
<name>multymodule-2</name>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-1/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<artifactId>project-rad-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5_1</artifactId>
+ <artifactId>project-rad-5_1</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>ear</packaging>
<build>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml Mon Aug 26 17:57:00 2013
@@ -8,8 +8,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<packaging>war</packaging>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5_2</artifactId>
+ <artifactId>project-rad-5_2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-3/pom.xml Mon Aug 26 17:57:00 2013
@@ -9,8 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<packaging>ejb</packaging>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5_3</artifactId>
+ <artifactId>project-rad-5_3</artifactId>
<version>0.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml?rev=1517623&r1=1517622&r2=1517623&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml Mon Aug 26 17:57:00 2013
@@ -9,7 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5_4</artifactId>
+ <artifactId>project-rad-5_4</artifactId>
<version>0.0.1-SNAPSHOT</version>
</project>
\ No newline at end of file