cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Remove some unused deps, update to require Maven 3, update to Java6 only
Date Thu, 22 May 2014 14:44:51 GMT
Repository: cxf-xjc-utils
Updated Branches:
  refs/heads/master e9086ca03 -> f7db26be4


Remove some unused deps, update to require Maven 3, update to Java6 only


Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/f7db26be
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/f7db26be
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/f7db26be

Branch: refs/heads/master
Commit: f7db26be435285fa1bc6dcbb6fadaf8337e84b3c
Parents: e9086ca
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu May 22 10:44:26 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu May 22 10:44:26 2014 -0400

----------------------------------------------------------------------
 cxf-xjc-plugin/pom.xml | 13 +++----------
 pom.xml                | 18 ++++++------------
 2 files changed, 9 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/f7db26be/cxf-xjc-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml
index 213a831..2b665d9 100644
--- a/cxf-xjc-plugin/pom.xml
+++ b/cxf-xjc-plugin/pom.xml
@@ -30,6 +30,9 @@
         <version>2.7.1-SNAPSHOT</version>
     </parent>
 
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
 
     <dependencies>
         <dependency>
@@ -48,11 +51,6 @@
             <version>2.0.5</version>
         </dependency>
         <dependency>
-           <groupId>org.apache.maven.shared</groupId>
-           <artifactId>maven-downloader</artifactId>
-           <version>1.1</version>
-         </dependency>
-        <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
             <scope>provided</scope>
@@ -73,11 +71,6 @@
             <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.maven.shared</groupId>
-            <artifactId>maven-common-artifact-filters</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
             <version>3.2</version>

http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/f7db26be/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ad4b065..2f5d897 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,9 @@
         <system>jira</system>
         <url>https://issues.apache.org/jira/browse/CXF</url>
     </issueManagement>
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
 
     <properties>
         <jdk.version>1.6</jdk.version>
@@ -230,7 +233,7 @@
                         <source>1.5</source>
                         <quiet>true</quiet>
                         <bottom>Apache CXF</bottom>
-                        <javadocVersion>1.5</javadocVersion>
+                        <javadocVersion>1.6</javadocVersion>
                         <encoding>UTF-8</encoding>
                         <!--subpackages>org.apache.cxf</subpackages-->
                     </configuration>
@@ -249,8 +252,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.1</version>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                         <maxmem>256M</maxmem>
                     </configuration>
                 </plugin>
@@ -440,15 +443,6 @@
 
     <profiles>
         <profile>
-            <id>jdk15</id>
-            <activation>
-                <jdk>1.5</jdk>
-            </activation>
-            <properties>
-                <jdk.version>1.5</jdk.version>
-            </properties>
-        </profile>
-        <profile>
             <id>fastinstall</id>
             <properties>
                 <maven.test.skip>true</maven.test.skip>


Mime
View raw message