Author: jbonofre
Date: Wed Aug 11 07:35:17 2010
New Revision: 984315
URL: http://svn.apache.org/viewvc?rev=984315&view=rev
Log:
Fix properties in itests but as maven-embedder is not available in 2.2.1,
itests should be refactored.
Modified:
servicemix/archetypes/trunk/pom.xml
servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml
servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml
servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
Modified: servicemix/archetypes/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/pom.xml?rev=984315&r1=984314&r2=984315&view=diff
==============================================================================
--- servicemix/archetypes/trunk/pom.xml (original)
+++ servicemix/archetypes/trunk/pom.xml Wed Aug 11 07:35:17 2010
@@ -44,6 +44,8 @@
<jbi-maven-plugin.version>4.3</jbi-maven-plugin.version>
<maven-bundle-plugin.version>2.0.1</maven-bundle-plugin.version>
<junit.version>4.7</junit.version>
+ <xbean.version>3.4.1</xbean.version>
+ <geronimo-jta.specs.version>1.1.1</geronimo-jta.specs.version>
<servicemix.version>3.3.2</servicemix.version>
<commons-logging.version>1.1.1</commons-logging.version>
<camel.version>2.2.0</camel.version>
@@ -221,9 +223,11 @@
<module>servicemix-project-root</module>
- <!-- Commented for now
- <module>servicemix-archetypes-itests</module>
- -->
+ <!--
+ Disabled for now as maven-embedder is not provided for maven
2.2.1
+ and jbi-maven-plugin 4.3 needs at least maven 2.2.1.
+ -->
+ <!-- <module>servicemix-archetypes-itests</module> -->
</modules>
<build>
@@ -257,8 +261,8 @@
<jbi-maven-plugin.version>${jbi-maven-plugin.version}</jbi-maven-plugin.version>
<maven-bundle-plugin.version>${maven-bundle-plugin.version}</maven-bundle-plugin.version>
<servicemix.version>${servicemix.version}</servicemix.version>
-
<servicemix-specs.version>${servicemix-specs.version}</servicemix-specs.version>
-
<geronimo-specs.version>${geronimo-specs.version}</geronimo-specs.version>
+
<servicemix.specs.version>${servicemix.specs.version}</servicemix.specs.version>
+
<geronimo-jta.specs.version>${geronimo-jta.specs.version}</geronimo-jta.specs.version>
<xbean.version>${xbean.version}</xbean.version>
<camel.version>${camel.version}</camel.version>
<cxf.version>${cxf.version}</cxf.version>
Modified: servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml?rev=984315&r1=984314&r2=984315&view=diff
==============================================================================
--- servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml (original)
+++ servicemix/archetypes/trunk/servicemix-archetypes-itests/pom.xml Wed Aug 11
07:35:17 2010
@@ -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/xsd/maven-4.0.0.xsd";>
+<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/xsd/maven-4.0.0.xsd";>
<!--
@@ -303,8 +302,8 @@
<artifactId>servicemix-project-root</artifactId>
<version>${pom.version}</version>
</dependency>
-
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -330,4 +329,5 @@
</plugin>
</plugins>
</build>
-</project>
+
+</project>
\ No newline at end of file
Modified:
servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml?rev=984315&r1=984314&r2=984315&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml
(original)
+++
servicemix/archetypes/trunk/servicemix-archetypes-itests/src/test/resources/archetype-pom.xml
Wed Aug 11 07:35:17 2010
@@ -1,26 +1,22 @@
<?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/xsd/maven-4.0.0.xsd";>
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/POM/4.0.0";>
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or
more
+ contributor license agreements. See the NOTICE file distributed
with
+ this work for additional information regarding copyright
ownership.
+ The ASF licenses this file to You under the Apache License,
Version
+ 2.0 (the "License"); you may not use this file except in
compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed
under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR
+ CONDITIONS OF ANY KIND, either express or implied. See the
License for
+ the specific language governing permissions and limitations
under the
+ License.
+ -->
<modelVersion>4.0.0</modelVersion>
@@ -29,5 +25,5 @@
<name>Archetype Manager</name>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
-</project>
+
+</project>
\ No newline at end of file
Modified:
servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml?rev=984315&r1=984314&r2=984315&view=diff
==============================================================================
---
servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
(original)
+++
servicemix/archetypes/trunk/servicemix-binding-component/src/main/resources/archetype-resources/pom.xml
Wed Aug 11 07:35:17 2010
@@ -66,13 +66,13 @@
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
- <version>@{servicemix-specs.version}</version>
+ <version>@{servicemix.specs.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>@{geronimo-specs.version}</version>
+ <version>@{geronimo-jta.specs.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
