Author: alessio.soldano(a)jboss.com
Date: 2010-07-02 12:20:05 -0400 (Fri, 02 Jul 2010)
New Revision: 12567
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3006] Update cxf stack dependencies and enforce some exclusions through maven
enforcer plugin
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2010-07-02 10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/modules/client/pom.xml 2010-07-02 16:20:05 UTC (rev 12567)
@@ -46,20 +46,10 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-corba</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
<dependency>
@@ -265,6 +255,49 @@
</plugins>
</build>
-
+ <profiles>
+ <!--
+ Name: enforce
+ Descr: Enforce artifact dependencies
+ -->
+ <profile>
+ <id>enforce</id>
+ <activation>
+ <property>
+ <name>!skip-enforce</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ban-bad-dependencies</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <searchTransitive>true</searchTransitive>
+ <excludes>
+
<exclude>org.apache.cxf:cxf-rt-bindings-corba</exclude>
+ <exclude>org.apache.cxf:cxf-rt-javascript</exclude>
+ <exclude>org.apache.geronimo.specs</exclude>
+ <exclude>org.codehaus.jra:jra</exclude>
+ <exclude>org.slf4j:slf4j-jdk14</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
---
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-07-02
10:04:15 UTC (rev 12566)
+++
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-07-02
16:20:05 UTC (rev 12567)
@@ -33,10 +33,6 @@
<extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"
interface="org.apache.cxf.endpoint.EndpointResolverRegistry" />
<extension class="org.apache.cxf.headers.HeaderManagerImpl"
interface="org.apache.cxf.headers.HeaderManager" />
<extension class="org.apache.cxf.catalog.OASISCatalogManager"
interface="org.apache.cxf.catalog.OASISCatalogManager" />
- <extension class="org.apache.cxf.binding.corba.CorbaBindingFactory"
deferred="true">
- <
namespace>http://cxf.apache.org/bindings/corba</namespace>
- <
namespace>http://schemas.apache.org/yoko/bindings/corba</namespace>
- </extension>
<extension class="org.apache.cxf.binding.soap.SoapBindingFactory"
interface="org.apache.cxf.binding.BindingFactory" deferred="true">
<
namespace>http://schemas.xmlsoap.org/soap/</namespace>
<
namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2010-07-02
10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2010-07-02
16:20:05 UTC (rev 12567)
@@ -20,11 +20,6 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
- <entry
key="org.apache.cxf.binding.corba-1">javax.wsdl.Binding=org.apache.cxf.binding.corba.wsdl.BindingType</entry>
- <entry
key="org.apache.cxf.binding.corba-2">javax.wsdl.BindingOperation=org.apache.cxf.binding.corba.wsdl.OperationType</entry>
- <entry
key="org.apache.cxf.binding.corba-3">javax.wsdl.Definition=org.apache.cxf.binding.corba.wsdl.TypeMappingType</entry>
- <entry
key="org.apache.cxf.binding.corba-4">javax.wsdl.Port=org.apache.cxf.binding.corba.wsdl.AddressType</entry>
- <entry
key="org.apache.cxf.binding.corba-5">javax.wsdl.Port=org.apache.cxf.binding.corba.wsdl.PolicyType</entry>
<entry
key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
<entry
key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
<entry
key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-07-02 10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-07-02 16:20:05 UTC (rev 12567)
@@ -26,6 +26,10 @@
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
<!-- jbossws dependencies -->
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -59,10 +63,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-corba</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
<dependency>
@@ -333,5 +333,50 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <!--
+ Name: enforce
+ Descr: Enforce artifact dependencies
+ -->
+ <profile>
+ <id>enforce</id>
+ <activation>
+ <property>
+ <name>!skip-enforce</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ban-bad-dependencies</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <searchTransitive>true</searchTransitive>
+ <excludes>
+
<exclude>org.apache.cxf:cxf-rt-bindings-corba</exclude>
+ <exclude>org.apache.cxf:cxf-rt-javascript</exclude>
+ <exclude>org.apache.geronimo.specs</exclude>
+ <exclude>org.codehaus.jra:jra</exclude>
+ <exclude>org.slf4j:slf4j-jdk14</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2010-07-02 10:04:15 UTC (rev 12566)
+++ stack/cxf/trunk/pom.xml 2010-07-02 16:20:05 UTC (rev 12567)
@@ -226,8 +226,8 @@
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <groupId>org.codehaus.jra</groupId>
+ <artifactId>jra</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -289,57 +289,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-corba</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
<exclusions>
@@ -442,6 +391,10 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
@@ -538,9 +491,17 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
@@ -635,6 +596,10 @@
<artifactId>saaj-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-javascript</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
@@ -1068,6 +1033,11 @@
<artifactId>jsr181-api</artifactId>
<version>${jsr181.api.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
<!-- jboss provided -->
<dependency>
@@ -1375,6 +1345,7 @@
<module>modules/testsuite</module>
</modules>
</profile>
+
</profiles>
</project>