Author: chirino
Date: Wed Jun 18 07:04:35 2008
New Revision: 669171
URL: http://svn.apache.org/viewvc?rev=669171&view=rev
Log:
Updating poms.
Removed:
servicemix/components/common/trunk/servicemix-components/
Modified:
servicemix/components/common/trunk/pom.xml
servicemix/components/common/trunk/servicemix-beanflow/pom.xml
servicemix/components/common/trunk/servicemix-common/pom.xml
servicemix/components/common/trunk/servicemix-soap/pom.xml
servicemix/components/common/trunk/servicemix-soap2/pom.xml
Modified: servicemix/components/common/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/common/trunk/pom.xml?rev=669171&r1=669170&r2=669171&view=diff
==============================================================================
--- servicemix/components/common/trunk/pom.xml (original)
+++ servicemix/components/common/trunk/pom.xml Wed Jun 18 07:04:35 2008
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,55 +17,54 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
- <version>3.3-SNAPSHOT</version>
- </parent>
-
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>common</artifactId>
- <version>3.3-SNAPSHOT</version>
- <name>ServiceMix :: Common</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>servicemix-common</module>
- <module>servicemix-components</module>
- <module>servicemix-soap</module>
- <module>servicemix-soap2</module>
- <module>servicemix-beanflow</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>build</artifactId>
- <version>${servicemix-version}</version>
- <executions>
- <execution>
- <goals>
- <goal>copy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>build</artifactId>
- <version>3.3-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
+ <artifactId>components-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>common-pom</artifactId>
+ <version>4.0-SNAPSHOT</version>
+
+ <name>ServiceMix :: Common POM</name>
+ <packaging>pom</packaging>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/components/common/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/components/common/trunk</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/servicemix/components/common/trunk</url>
+ </scm>
+
+ <properties>
+ <!-- Can't use smx 3.2.1 cause
servicemix-common/src/test/java/org/apache/servicemix/common/NewTransactionsTest.java
+ is using JBIContainer.setUseNewTransactionModel(boolean) which is not
in 3.2.1 -->
+ <servicemix-version>3.3-SNAPSHOT</servicemix-version>
+ <activemq-version>5.1.0</activemq-version>
+ </properties>
+
+ <modules>
+ <module>servicemix-common</module>
+ <module>servicemix-soap</module>
+ <module>servicemix-soap2</module>
+ <module>servicemix-beanflow</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-build</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: servicemix/components/common/trunk/servicemix-beanflow/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/common/trunk/servicemix-beanflow/pom.xml?rev=669171&r1=669170&r2=669171&view=diff
==============================================================================
--- servicemix/components/common/trunk/servicemix-beanflow/pom.xml (original)
+++ servicemix/components/common/trunk/servicemix-beanflow/pom.xml Wed Jun 18
07:04:35 2008
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,40 +17,37 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>common</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <artifactId>common-pom</artifactId>
+ <version>4.0-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-beanflow</artifactId>
-
+ <version>4.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
<name>ServiceMix :: BeanFlow</name>
<description>
A library for orchestrating beans and asynchronous events using
regular POJOs rather than XML
</description>
-
+
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
- <!--
- <scope>optional</scope>
- -->
+ <scope>compile</scope>
+ <optional>true</optional>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -69,15 +65,6 @@
</excludes>
</configuration>
</plugin>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
-
</project>
Modified: servicemix/components/common/trunk/servicemix-common/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/common/trunk/servicemix-common/pom.xml?rev=669171&r1=669170&r2=669171&view=diff
==============================================================================
--- servicemix/components/common/trunk/servicemix-common/pom.xml (original)
+++ servicemix/components/common/trunk/servicemix-common/pom.xml Wed Jun 18
07:04:35 2008
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,17 +17,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>common</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <artifactId>common-pom</artifactId>
+ <version>4.0-SNAPSHOT</version>
</parent>
-
+
+ <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
+ <version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>
+
<name>ServiceMix :: Common</name>
<description>Common library for binding component and service
engines</description>
@@ -36,40 +36,45 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jbi</artifactId>
+ <version>${servicemix-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
+ <version>${servicemix-version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
+ <version>${activemq-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -79,15 +84,15 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
<optional>true</optional>
- </dependency>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -101,7 +106,6 @@
<excludes>
<!-- exclude abstract test cases -->
<exclude>**/Abstract*.*</exclude>
-
<exclude>**/TransactionsTest.*</exclude>
</excludes>
</configuration>
@@ -135,6 +139,7 @@
</execution>
</executions>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -145,7 +150,7 @@
</archive>
</configuration>
</plugin>
+ -->
</plugins>
</build>
-
</project>
Modified: servicemix/components/common/trunk/servicemix-soap/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/common/trunk/servicemix-soap/pom.xml?rev=669171&r1=669170&r2=669171&view=diff
==============================================================================
--- servicemix/components/common/trunk/servicemix-soap/pom.xml (original)
+++ servicemix/components/common/trunk/servicemix-soap/pom.xml Wed Jun 18
07:04:35 2008
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,72 +17,70 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>common</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <artifactId>common-pom</artifactId>
+ <version>4.0-SNAPSHOT</version>
</parent>
-
+
+ <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-soap</artifactId>
+ <version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>
+
<name>ServiceMix :: SOAP</name>
<description>SOAP Stack</description>
-
+
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
+ <version>${servicemix-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>${servicemix-version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activation</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
+ <version>2.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId>
+ <version>136</version>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>xml-security</groupId>
<artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>build</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>spring.schemas</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
<executions>
@@ -114,5 +111,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: servicemix/components/common/trunk/servicemix-soap2/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/common/trunk/servicemix-soap2/pom.xml?rev=669171&r1=669170&r2=669171&view=diff
==============================================================================
--- servicemix/components/common/trunk/servicemix-soap2/pom.xml (original)
+++ servicemix/components/common/trunk/servicemix-soap2/pom.xml Wed Jun 18
07:04:35 2008
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,17 +17,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>common</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <artifactId>common-pom</artifactId>
+ <version>4.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-soap2</artifactId>
+ <version>4.0-SNAPSHOT</version>
<packaging>jar</packaging>
+
<name>ServiceMix :: SOAP2</name>
<description>SOAP Stack v2</description>
@@ -36,84 +36,70 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
+ <version>${servicemix-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>${servicemix-version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activation</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
+ <version>2.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId>
+ <version>136</version>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>xml-security</groupId>
<artifactId>xmlsec</artifactId>
+ <version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden</artifactId>
+ <version>1.0.0M6</version>
<exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>XmlSchema</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- </exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
-
+
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.xbean</groupId>
- <artifactId>maven-xbean-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <namespace>http://servicemix.apache.org/soap/2.0</namespace>
- </configuration>
- <goals>
- <goal>mapping</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -123,12 +109,11 @@
<include>**/*Test.*</include>
</includes>
<excludes>
- <!-- exclude abstract test cases -->
+<!-- exclude abstract test cases -->
<exclude>**/Abstract*.*</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
-
</project>
