servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject [7/7] servicemix git commit: SM-2402: Use correct cxf.codegen-plugin version
Date Sat, 08 Nov 2014 00:12:27 GMT
SM-2402: Use correct cxf.codegen-plugin version


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/7566ca8e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/7566ca8e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/7566ca8e

Branch: refs/heads/servicemix-5.3.x
Commit: 7566ca8e22d1c0e6a6dc3a8ecba14d950793211e
Parents: 3f63add
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Sat Nov 8 00:59:04 2014 +0100
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Sat Nov 8 01:03:10 2014 +0100

----------------------------------------------------------------------
 parent/pom.xml | 21 +++++++++++++++++++++
 pom.xml        | 44 --------------------------------------------
 2 files changed, 21 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/7566ca8e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e0430f6..10002d6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,6 +41,7 @@
     <activiti.version>5.15.1</activiti.version>
     <camel.version>2.13.3</camel.version>
     <cxf.version>2.7.13</cxf.version>
+    <cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
 
     <felix.bundlerepository.version>2.0.2</felix.bundlerepository.version>
     <karaf.version>2.4.0</karaf.version>
@@ -410,4 +411,24 @@
 
     </dependencies>
   </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.cxf</groupId>
+          <artifactId>cxf-codegen-plugin</artifactId>
+          <version>${cxf.codegen-plugin.version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>xerces</groupId>
+              <artifactId>xercesImpl</artifactId>
+              <version>${xerces.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/7566ca8e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a7f3b1b..dc10c1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,6 @@
     </prerequisites>
 
     <properties>
-        <!-- CXF -->
-        <cxf.codegen-plugin.version>2.4.4</cxf.codegen-plugin.version>
 
         <!-- Geronimo -->
         <geronimo-connector.version>2.1.3</geronimo-connector.version>
@@ -246,18 +244,6 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-codegen-plugin</artifactId>
-                    <version>${cxf.codegen-plugin.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>xerces</groupId>
-                            <artifactId>xercesImpl</artifactId>
-                            <version>${xerces.version}</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
                     <version>${maven-release-plugin.version}</version>
@@ -651,36 +637,6 @@
                 </plugins>
             </build>
         </profile>
-        
-        <profile>
-            <id>ibmjdk</id>
-            <activation>
-                <property>
-                    <name>java.vendor</name>
-                    <value>IBM Corporation</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <!-- Need to add a xerces dependency to cxf-codegen-plugin when using

-                        the ibm jdk to work around error: org.apache.xerces.impl.dv.DVFactoryException:

-                        DTD factory class org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl
does not 
-                        extend from DTDDVFactory. Can remove this when we upgrade to a cxf.version

-                        which includes this in the cxf-codegen-plugin pom. -->
-                    <plugin>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-codegen-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>xerces</groupId>
-                                <artifactId>xercesImpl</artifactId>
-                                <version>${xerces.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
 </project>


Mime
View raw message