Author: hboutemy Date: Fri Nov 28 21:46:39 2014 New Revision: 1642368 URL: http://svn.apache.org/r1642368 Log: updated parent pom and fixed errors reported by Checkstyle
Removed: maven/plugins/trunk/maven-rar-plugin/maven-archiver/ Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1642368&r1=1642367&r2=1642368&view=diff ============================================================================== --- maven/plugins/trunk/maven-rar-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-rar-plugin/pom.xml Fri Nov 28 21:46:39 2014 @@ -25,7 +25,7 @@ under the License. <parent> <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> - <version>25</version> + <version>27</version> <relativePath>../maven-plugins/pom.xml</relativePath> </parent> @@ -68,7 +68,6 @@ under the License. <properties> <mavenVersion>2.2.1</mavenVersion> - <mavenPluginVersion>3.2</mavenPluginVersion> </properties> <dependencies> @@ -90,7 +89,6 @@ under the License. <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> - <version>${mavenPluginVersion}</version> <scope>provided</scope> </dependency> <dependency> @@ -141,18 +139,10 @@ under the License. <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>${mavenPluginVersion}</version> - <configuration> - <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> - </configuration> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <!-- The manifest specification does not describe any method for writing comments into the manifest. --> @@ -162,21 +152,6 @@ under the License. </plugin> </plugins> </pluginManagement> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <id>generate-descriptor</id> - <goals> - <goal>descriptor</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> <profiles> @@ -189,16 +164,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> <configuration> - <debug>true</debug> - <projectsDirectory>src/it</projectsDirectory> - <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> - <preBuildHookScript>setup</preBuildHookScript> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> <goals> <goal>clean</goal> <goal>package</goal> Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=1642368&r1=1642367&r2=1642368&view=diff ============================================================================== --- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original) +++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Fri Nov 28 21:46:39 2014 @@ -313,7 +313,7 @@ public class RarMojo // Check if jar file is there and if requested, copy it try { - if (includeJar) + if ( includeJar ) { File generatedJarFile = new File( outputDirectory, finalName + ".jar" ); if ( generatedJarFile.exists() ) @@ -331,16 +331,18 @@ public class RarMojo // Copy dependencies try { - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) Set<Artifact> artifacts = project.getArtifacts(); - for (Artifact artifact : artifacts) { + for ( Artifact artifact : artifacts ) + { - ScopeArtifactFilter filter = new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME); - if (!artifact.isOptional() && filter.include(artifact) - && artifact.getArtifactHandler().isAddedToClasspath()) { - getLog().info("Copying artifact[" + artifact.getGroupId() + ", " + artifact.getId() + ", " - + artifact.getScope() + "]"); - FileUtils.copyFileToDirectory(artifact.getFile(), getBuildDir()); + ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME ); + if ( !artifact.isOptional() && filter.include( artifact ) + && artifact.getArtifactHandler().isAddedToClasspath() ) + { + getLog().info( "Copying artifact[" + artifact.getGroupId() + ", " + artifact.getId() + ", " + + artifact.getScope() + "]" ); + FileUtils.copyFileToDirectory( artifact.getFile(), getBuildDir() ); } } } @@ -433,7 +435,7 @@ public class RarMojo getLog().warn( "Connector deployment descriptor: " + ddFile.getAbsolutePath() + " does not exist." ); } - File rarFile = getRarFile(outputDirectory, finalName, classifier); + File rarFile = getRarFile( outputDirectory, finalName, classifier ); try { MavenArchiver archiver = new MavenArchiver();