Author: sebb
Date: Wed Dec 9 15:37:56 2015
New Revision: 1718888
URL: http://svn.apache.org/viewvc?rev=1718888&view=rev
Log:
Update versions; general tidyup
Modified:
commons/proper/jexl/branches/2.0/pom.xml
Modified: commons/proper/jexl/branches/2.0/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/pom.xml?rev=1718888&r1=1718887&r2=1718888&view=diff
==============================================================================
--- commons/proper/jexl/branches/2.0/pom.xml (original)
+++ commons/proper/jexl/branches/2.0/pom.xml Wed Dec 9 15:37:56 2015
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>30</version>
+ <version>39</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.commons</groupId>
@@ -44,7 +44,7 @@
<distributionManagement>
<site>
<id>people.apache.org</id>
- <name>Apache Commons Jexl</name>
+ <name>Apache Commons JEXL</name>
<url>scp://people.apache.org/www/commons.apache.org/jexl</url>
</site>
</distributionManagement>
@@ -54,7 +54,7 @@
<name>dIon Gillard</name>
<id>dion</id>
<email>dion AT apache DOT org</email>
- <organization>Apache Software Foundation</organization>
+ <organization>The Apache Software Foundation</organization>
</developer>
<developer>
<name>Geir Magnusson Jr.</name>
@@ -72,7 +72,7 @@
<name>Peter Royal</name>
<id>proyal</id>
<email>proyal AT apache DOT org</email>
- <organization>Apache Software Foundation</organization>
+ <organization>The Apache Software Foundation</organization>
</developer>
<developer>
<name>James Strachan</name>
@@ -84,7 +84,7 @@
<name>Rahul Akolkar</name>
<id>rahul</id>
<email>rahul AT apache DOT org</email>
- <organization>Apache Software Foundation</organization>
+ <organization>The Apache Software Foundation</organization>
</developer>
<developer>
<name>Sebastian Bazley</name>
@@ -102,12 +102,12 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<!-- For JSR-223 API -->
@@ -124,8 +124,8 @@
<toolchains.jdk.version>1.5</toolchains.jdk.version>
<toolchains.jdk.vendor>sun</toolchains.jdk.vendor>
-->
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
<commons.componentid>jexl</commons.componentid>
<commons.release.version>2.1.2</commons.release.version>
<!-- The RC version used in the staging repository URL. -->
@@ -134,6 +134,8 @@
<commons.release.2.binary.suffix />
<commons.jira.id>JEXL</commons.jira.id>
<commons.jira.pid>12310479</commons.jira.pid>
+ <checkstyle.plugin.version>2.16</checkstyle.plugin.version>
+ <checksyle.version>6.13</checksyle.version>
</properties>
<build>
@@ -182,6 +184,7 @@
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
+ <finalName>commons-jexl-${project.version}</finalName>
</configuration>
</plugin>
<plugin>
@@ -214,33 +217,51 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
+ <!-- Allow use from command-line. Must agree with reporting
section below -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>${commons.changes.version}</version>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.plugin.version}</version>
+ <configuration>
+
<configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
+ <excludes>org/apache/commons/jexl2/parser/*.java</excludes>
+
<headerLocation>${basedir}/src/main/config/header.txt</headerLocation>
+ <enableRulesSummary>true</enableRulesSummary>
+ </configuration>
+ <!-- Update embedded checkstyle to latest -->
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>${checksyle.version}</version>
+ <exclusions><!-- MCHECKSTYLE-156 -->
+ <exclusion>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <!-- Allow RAT to be run from command-line. Must agree with config
in report section. -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
<configuration>
- <xmlPath>${basedir}/src/site/xdoc/changes.xml</xmlPath>
- <issueLinkTemplatePerSystem>
- <default>%URL%/%ISSUE%</default>
- </issueLinkTemplatePerSystem>
+ <excludes>
+ <exclude>.travis.yml</exclude>
+ </excludes>
</configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
</plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.7</version>
+ <version>2.16</version>
<configuration>
<configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
<excludes>org/apache/commons/jexl2/parser/*.java</excludes>
@@ -268,7 +289,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
+ <version>3.0.2</version>
<configuration>
<excludeFilterFile>${basedir}/src/main/config/findbugs-exclude-filter.xml</excludeFilterFile>
<xmlOutput>true</xmlOutput>
@@ -279,9 +300,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.5</version>
<configuration>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
<excludes>
<excludes>**/generated-sources/**/*</excludes>
</excludes>
