You are viewing a plain text version of this content. The canonical link for it is here.
Posted to droids-commits@incubator.apache.org by ry...@apache.org on 2008/11/15 17:59:01 UTC

svn commit: r717898 - in /incubator/droids/trunk: droids-core/pom.xml pom.xml

Author: ryan
Date: Sat Nov 15 09:59:00 2008
New Revision: 717898

URL: http://svn.apache.org/viewvc?rev=717898&view=rev
Log:
DROIDS-37 move to java 1.6

Modified:
    incubator/droids/trunk/droids-core/pom.xml
    incubator/droids/trunk/pom.xml

Modified: incubator/droids/trunk/droids-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/pom.xml?rev=717898&r1=717897&r2=717898&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/pom.xml (original)
+++ incubator/droids/trunk/droids-core/pom.xml Sat Nov 15 09:59:00 2008
@@ -50,16 +50,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
+    </dependency>    
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -68,6 +59,8 @@
       <groupId>nekohtml</groupId>
       <artifactId>nekohtml</artifactId>
     </dependency>
+    
+    <!-- TEST -->
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>

Modified: incubator/droids/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/pom.xml?rev=717898&r1=717897&r2=717898&view=diff
==============================================================================
--- incubator/droids/trunk/pom.xml (original)
+++ incubator/droids/trunk/pom.xml Sat Nov 15 09:59:00 2008
@@ -46,14 +46,12 @@
   </scm>
 
   <properties>
-    <maven.compile.source>1.5</maven.compile.source>
-    <maven.compile.target>1.5</maven.compile.target>
+    <maven.compile.source>1.6</maven.compile.source>
+    <maven.compile.target>1.6</maven.compile.target>
     <maven.compile.optimize>true</maven.compile.optimize>
     <maven.compile.deprecation>true</maven.compile.deprecation>
     <commons-logging.version>1.1.1</commons-logging.version>
     <commons-io.version>1.4</commons-io.version>
-    <stax-api.version>1.0.1</stax-api.version>
-    <wstx-asl.version>3.2.7</wstx-asl.version>
     <httpclient.version>4.0-beta1</httpclient.version>
     <nekohtml.version>1.9.6.2</nekohtml.version>
     <log4j.version>1.2.14</log4j.version>
@@ -74,22 +72,6 @@
         <version>${commons-io.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        <version>${stax-api.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>wstx-asl</artifactId>
-        <version>${wstx-asl.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-         </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
         <version>${httpclient.version}</version>