commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r1766113 - in /commons/sandbox/flatfile/trunk: checkstyle.xml pom.xml
Date Fri, 21 Oct 2016 19:43:06 GMT
Author: mbenson
Date: Fri Oct 21 19:43:06 2016
New Revision: 1766113

URL: http://svn.apache.org/viewvc?rev=1766113&view=rev
Log:
upgrade parent pom; organize

Modified:
    commons/sandbox/flatfile/trunk/checkstyle.xml
    commons/sandbox/flatfile/trunk/pom.xml

Modified: commons/sandbox/flatfile/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/checkstyle.xml?rev=1766113&r1=1766112&r2=1766113&view=diff
==============================================================================
--- commons/sandbox/flatfile/trunk/checkstyle.xml (original)
+++ commons/sandbox/flatfile/trunk/checkstyle.xml Fri Oct 21 19:43:06 2016
@@ -23,16 +23,13 @@ limitations under the License.
 <!-- commons functor customization of default Checkstyle behavior, copied from Lang -->
 <module name="Checker">
   <property name="localeLanguage" value="en"/>
-  <module name="PackageHtml"/>
+  <module name="FileTabCharacter"/>
   <module name="TreeWalker">
-    <module name="TabCharacter"/>
+    <module name="PackageAnnotation"/>
     <module name="AvoidStarImport"/>
     <module name="RedundantImport"/>
     <module name="UnusedImports"/>
     <module name="NeedBraces"/>
-    <module name="RedundantThrows">
-      <property name="allowUnchecked" value="true"/>
-    </module>
     <module name="LineLength">
       <property name="max" value="120"/>
     </module>
@@ -50,10 +47,9 @@ limitations under the License.
 
     <module name="NoWhitespaceBefore"/>
     <module name="OperatorWrap"/>
-    <module name="TabCharacter"/>
     <module name="WhitespaceAfter"/>
 
-    <module name="GenericIllegalRegexp">
+    <module name="RegexpSinglelineJava">
       <property name="format" value="\s+$"/>
       <property name="message" value="Line has trailing spaces."/>
     </module>

Modified: commons/sandbox/flatfile/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/pom.xml?rev=1766113&r1=1766112&r2=1766113&view=diff
==============================================================================
--- commons/sandbox/flatfile/trunk/pom.xml (original)
+++ commons/sandbox/flatfile/trunk/pom.xml Fri Oct 21 19:43:06 2016
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-sandbox-parent</artifactId>
-    <version>9</version>
+    <version>10</version>
   </parent>
   <artifactId>commons-flatfile</artifactId>
   <version>1.0-SNAPSHOT</version>
@@ -36,17 +36,44 @@
     &quot;flat file&quot; structures in Java.
   </description>
 
+  <properties>
+    <maven.compile.source>1.5</maven.compile.source>
+    <maven.compile.target>1.5</maven.compile.target>
+    <commons.componentid>flatfile</commons.componentid>
+    <commons.jira.componentid>12312476</commons.jira.componentid>
+    <commons.rat.version>0.12</commons.rat.version>
+  </properties>
+
+  <developers>
+    <developer>
+      <id>mbenson</id>
+      <name>Matt Benson</name>
+      <email>mbenson AT apache DOT org</email>
+      <organization>Apache</organization>
+    </developer>
+  </developers>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/sandbox/flatfile/trunk/</connection>
+
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/sandbox/flatfile/trunk/</developerConnection>
+
+    <url>http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/</url>
+  </scm>
+
+  <distributionManagement>
+    <site>
+      <id>website</id>
+      <name>Apache Website</name>
+      <url>scp://people.apache.org/www/commons.apache.org/sandbox/flatfile/</url>
+    </site>
+  </distributionManagement>
+
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -106,23 +133,13 @@
       <version>2.7.7</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-  <developers>
-    <developer>
-      <id>mbenson</id>
-      <name>Matt Benson</name>
-      <email>mbenson AT apache DOT org</email>
-      <organization>Apache</organization>
-    </developer>
-  </developers>
-  <scm>
-
-  <connection>scm:svn:http://svn.apache.org/repos/asf/commons/sandbox/flatfile/trunk/</connection>
-
-  <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/sandbox/flatfile/trunk/</developerConnection>
-
-  <url>http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/</url>
-  </scm>
   <build>
     <testResources>
       <testResource>
@@ -133,6 +150,20 @@
         </excludes>
       </testResource>
     </testResources>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+	  <version>3.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>antlr-maven-plugin</artifactId>
+	  <version>2.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -154,35 +185,12 @@
       </plugin>
     </plugins>
   </build>
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <name>Apache Website</name>
-      <url>scp://people.apache.org/www/commons.apache.org/sandbox/flatfile/</url>
-    </site>
-  </distributionManagement>
 
-  <!-- Compiler source and target JVM (see parent pom) -->
-  <properties>
-    <maven.compile.source>1.5</maven.compile.source>
-    <maven.compile.target>1.5</maven.compile.target>
-    <commons.componentid>flatfile</commons.componentid>
-    <commons.jira.componentid>12312476</commons.jira.componentid>
-  </properties>
   <reporting>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <targetJdk>${maven.compile.target}</targetJdk>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
             <!-- the following is a suggested directory name for generated sources under
@@ -195,29 +203,12 @@
       </plugin>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.16</version>
         <configuration>
-          <configLocation>${basedir}/checkstyle.xml</configLocation>
+          <configLocation>${project.basedir}/checkstyle.xml</configLocation>
         </configuration>
       </plugin>
     </plugins>
   </reporting>
 
-  <profiles>
-    <profile>
-      <id>ci</id>
-      <distributionManagement>
-        <repository>
-          <id>apache.snapshots.https</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>https://repository.apache.org/content/repositories/snapshots</url>
-        </repository>
-        <snapshotRepository>
-          <id>apache.snapshots.https</id>
-          <name>Apache Development Snapshot Repository</name>
-          <url>https://repository.apache.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-  </profiles>
 </project>



Mime
View raw message