maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1488556 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin: ./ .settings/ src/main/java/org/apache/maven/dist/tools/
Date Sat, 01 Jun 2013 18:43:53 GMT
Author: hboutemy
Date: Sat Jun  1 18:43:53 2013
New Revision: 1488556

URL: http://svn.apache.org/r1488556
Log:
code formatting

Added:
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/.classpath   (with props)
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/.project   (with props)
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.core.resources.prefs
  (with props)
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.jdt.core.prefs 
 (with props)
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.m2e.core.prefs 
 (with props)
Modified:
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenMetadata.java

Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.classpath
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/.classpath?rev=1488556&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/.classpath (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/.classpath Sat Jun  1 18:43:53 2013
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.classpath
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.classpath
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.classpath
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.project
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/.project?rev=1488556&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/.project (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/.project Sat Jun  1 18:43:53 2013
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dist-tool-plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.project
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.project
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.project
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.core.resources.prefs
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.core.resources.prefs?rev=1488556&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.core.resources.prefs
(added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.core.resources.prefs
Sat Jun  1 18:43:53 2013
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/<project>=UTF-8

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.core.resources.prefs
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.jdt.core.prefs?rev=1488556&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.jdt.core.prefs (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.jdt.core.prefs Sat
Jun  1 18:43:53 2013
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.m2e.core.prefs
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.m2e.core.prefs?rev=1488556&view=auto
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.m2e.core.prefs (added)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.m2e.core.prefs Sat
Jun  1 18:43:53 2013
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

Propchange: maven/sandbox/trunk/dist-tools/dist-tool-plugin/.settings/org.eclipse.m2e.core.prefs
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml?rev=1488556&r1=1488555&r2=1488556&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Sat Jun  1 18:43:53 2013
@@ -19,21 +19,25 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>dist-tool-plugin</artifactId>
     <groupId>org.apache.maven.dist.tools</groupId>
+    <artifactId>dist-tool-plugin</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
+
     <description>Dist tool plugin. 
         Not to be released.</description>  
+
     <prerequisites>
         <maven>3.0.4</maven>
     </prerequisites>
+
     <licenses>
         <license> 
             <name>The Apache Software License, Version 2.0</name>
             <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -58,7 +62,6 @@
             <artifactId>maven-core</artifactId>
             <version>${mvnversion}</version>
             <type>jar</type>
-            
         </dependency>
         <dependency>
             <groupId>org.apache.maven.reporting</groupId>
@@ -85,14 +88,12 @@
             <groupId>org.eclipse.aether</groupId>
             <artifactId>aether-util</artifactId>
             <version>0.9.0.M2</version>
-           
         </dependency>
         
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-aether-provider</artifactId>
             <version>${mvnversion}</version>
-           
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -100,6 +101,7 @@
             <version>2.2.0</version>
         </dependency>
     </dependencies>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -177,11 +179,13 @@
             </plugin>
         </plugins>
     </build>
+
     <properties>
         <netbeans.checkstyle.format>true</netbeans.checkstyle.format> 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <mvnversion>3.1-SNAPSHOT</mvnversion>
     </properties>
+
     <reporting>
         <plugins>
       
@@ -205,7 +209,6 @@
                         </reports>
                     </reportSet>
                 </reportSets>
-                
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java?rev=1488556&r1=1488555&r2=1488556&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java
(original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractCheckResult.java
Sat Jun  1 18:43:53 2013
@@ -1,4 +1,5 @@
 package org.apache.maven.dist.tools;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java?rev=1488556&r1=1488555&r2=1488556&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
(original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
Sat Jun  1 18:43:53 2013
@@ -1,4 +1,5 @@
 package org.apache.maven.dist.tools;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -37,21 +38,25 @@ import org.apache.maven.reporting.Abstra
  */
 public abstract class AbstractDistCheckMojo extends AbstractMavenReport
 {
+    private static final String MAVEN_DB = "db/mavendb.csv";
 
-    @Parameter( property = "repositoryUrl", defaultValue = "http://repo1.maven.org/maven2/"
)
+    @Parameter( property = "repositoryUrl", defaultValue = "http://repo.maven.apache.org/maven2/"
)
     protected String repoBaseUrl;
+
     @Parameter( property = "configurationLines", defaultValue = "" )
     private List<String> configurationLines;
 
-    abstract void checkArtifact( ConfigurationLineInfo request, String repoBase ) throws
MojoExecutionException;
-    private static final String MAVEN_DB = "db/mavendb.csv";
     @Component
     protected Renderer siteRenderer;
+
     @Parameter( property = "project.reporting.outputDirectory", required = true )
     protected File outputDirectory;
+
     @Component
     protected MavenProject project;
 
+    abstract void checkArtifact( ConfigurationLineInfo request, String repoBase ) throws
MojoExecutionException;
+
     @Override
     protected String getOutputDirectory()
     {
@@ -75,10 +80,10 @@ public abstract class AbstractDistCheckM
     {
         if ( configurationLines.isEmpty() )
         {
-            try (BufferedReader input = new BufferedReader( new InputStreamReader( Thread.currentThread().getContextClassLoader().getResource(
MAVEN_DB ).openStream() ) ))
+            try ( BufferedReader input = new BufferedReader( new InputStreamReader( Thread.currentThread().getContextClassLoader().getResource(
MAVEN_DB ).openStream() ) ) )
             {
                 String text;
-                while ( (text = input.readLine()) != null )
+                while ( ( text = input.readLine() ) != null )
                 {
                     configurationLines.add( text );
                 }

Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java?rev=1488556&r1=1488555&r2=1488556&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
(original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
Sat Jun  1 18:43:53 2013
@@ -1,7 +1,5 @@
 package org.apache.maven.dist.tools;
 
-import org.apache.maven.doxia.sink.Sink;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java?rev=1488556&r1=1488555&r2=1488556&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
(original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
Sat Jun  1 18:43:53 2013
@@ -1,4 +1,5 @@
 package org.apache.maven.dist.tools;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -62,8 +63,10 @@ public class DistCheckSiteMojo extends A
 
     @Parameter( property = "localRepository", required = true, readonly = true )
     protected ArtifactRepository localRepository;
+
     @Component
     private ArtifactFactory artifactFactory;
+
     @Component
     private MavenProjectBuilder mavenProjectBuilder;
 

Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java?rev=1488556&r1=1488555&r2=1488556&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
(original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
Sat Jun  1 18:43:53 2013
@@ -1,4 +1,5 @@
 package org.apache.maven.dist.tools;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -205,7 +206,7 @@ public class DistCheckSourceReleaseMojo 
     @Override
     void checkArtifact( ConfigurationLineInfo r, String repoBaseUrl ) throws MojoExecutionException
     {
-        try (BufferedReader input = new BufferedReader( new InputStreamReader( new URL( r.getMetadataFileURL(
repoBaseUrl ) ).openStream() ) ))
+        try ( BufferedReader input = new BufferedReader( new InputStreamReader( new URL(
r.getMetadataFileURL( repoBaseUrl ) ).openStream() ) ) )
         {
             JAXBContext context = JAXBContext.newInstance( MavenMetadata.class );
             Unmarshaller unmarshaller = context.createUnmarshaller();

Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenMetadata.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenMetadata.java?rev=1488556&r1=1488555&r2=1488556&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenMetadata.java
(original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/MavenMetadata.java
Sat Jun  1 18:43:53 2013
@@ -1,4 +1,5 @@
 package org.apache.maven.dist.tools;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file



Mime
View raw message