This is an automated email from the ASF dual-hosted git repository.

henrib pushed a commit to tag 2.1
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git

commit 40d62a0f227e85386f100580cbcc1024e72853e0
Author: Sebastian Bazley <s...@apache.org>
AuthorDate: Thu Dec 8 01:35:37 2011 +0000

    Remove temporary work-rounds
    
    git-svn-id: 
https://svn-us.apache.org/repos/asf/commons/proper/jexl/branches/2.0@1211730 
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 91d5c87..9fb4a76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,39 +130,14 @@
         <commons.release.2.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>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
-            <!-- workaround MRELEASE-424 when publishing -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <mavenExecutorId>forked-path</mavenExecutorId>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

Reply via email to