Author: bayard
Date: Sun Mar 28 23:07:55 2010
New Revision: 928515
URL: http://svn.apache.org/viewvc?rev=928515&view=rev
Log:
Removing M1 build, M2 build seems fine
Removed:
commons/proper/el/trunk/maven.xml
commons/proper/el/trunk/project.properties
commons/proper/el/trunk/project.xml
Modified:
commons/proper/el/trunk/pom.xml
commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java
Modified: commons/proper/el/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/el/trunk/pom.xml?rev=928515&r1=928514&r2=928515&view=diff
==============================================================================
--- commons/proper/el/trunk/pom.xml (original)
+++ commons/proper/el/trunk/pom.xml Sun Mar 28 23:07:55 2010
@@ -129,4 +129,63 @@
</plugin>
</plugins>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ <!-- Requires setting 'export MAVEN_OPTS="-Xmx512m" ' -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <excludeFilterFile>findbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.2</version>
+ <configuration>
+ <comparisonVersion>1.0</comparisonVersion>
+ <minSeverity>info</minSeverity>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <targetJdk>${maven.compile.target}</targetJdk>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>pmd</report>
+ <report>cpd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javancss-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
</project>
Modified:
commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java
URL:
http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java?rev=928515&r1=928514&r2=928515&view=diff
==============================================================================
--- commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java
(original)
+++ commons/proper/el/trunk/src/java/org/apache/commons/el/AndOperator.java Sun
Mar 28 23:07:55 2010
@@ -62,8 +62,7 @@ public class AndOperator
*
* Applies the operator to the given value
**/
- public Object apply (Object pLeft,
- Object pRight)
+ public Object apply (Object pLeft, Object pRight)
throws ELException
{
// Coerce the values to booleans
Modified:
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java
URL:
http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java?rev=928515&r1=928514&r2=928515&view=diff
==============================================================================
---
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java
(original)
+++
commons/proper/el/trunk/src/java/org/apache/commons/el/ArithmeticOperator.java
Sun Mar 28 23:07:55 2010
@@ -37,8 +37,7 @@ public abstract class ArithmeticOperator
*
* Applies the operator to the given value
**/
- public Object apply (Object pLeft,
- Object pRight)
+ public Object apply (Object pLeft, Object pRight)
throws ELException
{
return Coercions.applyArithmeticOperator (pLeft, pRight, this);
