Author: sebb
Date: Fri Jul 31 00:29:11 2009
New Revision: 799475
URL: http://svn.apache.org/viewvc?rev=799475&view=rev
Log:
Commons-logging => 1.1.1; JUnit => 3.8.2
Depend on bsf-api for JSR-223 code
Temp fixes (until parent POM updated):
Add UTF-8 encoding for file copies
Add back src/main/resources default
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=799475&r1=799474&r2=799475&view=diff
==============================================================================
--- commons/proper/jexl/branches/2.0/pom.xml (original)
+++ commons/proper/jexl/branches/2.0/pom.xml Fri Jul 31 00:29:11 2009
@@ -95,14 +95,21 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<optional>true</optional>
</dependency>
+ <!-- For JSR-223 API -->
+ <dependency>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-api</artifactId>
+ <version>3.0-beta3</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<properties>
@@ -113,9 +120,27 @@
<commons.binary.suffix></commons.binary.suffix>
<commons.jira.id>JEXL</commons.jira.id>
<commons.jira.pid>12310479</commons.jira.pid>
+ <!-- Temp fix until parent POM is updated -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<build>
+ <!-- temporarily override the parent POM (v 11) until that is updated -->
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ <!-- This is the default, but is currently missing from the parent POM
(v11) -->
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
<plugins>
