Author: cmueller
Date: Wed Oct 3 12:27:37 2012
New Revision: 1393453
URL: http://svn.apache.org/viewvc?rev=1393453&view=rev
Log:
CAMEL-5578: Polish our pom's to be as DRY as possible - work in progress
Modified:
camel/trunk/components/camel-couchdb/pom.xml
camel/trunk/components/camel-cxf-transport/pom.xml
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-ejb/pom.xml
camel/trunk/components/camel-elasticsearch/pom.xml
camel/trunk/components/camel-eventadmin/pom.xml
camel/trunk/components/camel-exec/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-couchdb/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-couchdb/pom.xml?rev=1393453&r1=1393452&r2=1393453&view=diff
==============================================================================
--- camel/trunk/components/camel-couchdb/pom.xml (original)
+++ camel/trunk/components/camel-couchdb/pom.xml Wed Oct 3 12:27:37 2012
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+ 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 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">
<modelVersion>4.0.0</modelVersion>
@@ -63,10 +69,5 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: camel/trunk/components/camel-cxf-transport/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/pom.xml?rev=1393453&r1=1393452&r2=1393453&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/pom.xml (original)
+++ camel/trunk/components/camel-cxf-transport/pom.xml Wed Oct 3 12:27:37 2012
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
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.
@@ -15,8 +14,8 @@
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 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">
+-->
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -65,7 +64,6 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-core</artifactId>
- <version>${cxf-version}</version>
</dependency>
<dependency>
@@ -74,11 +72,6 @@
<version>${cxf-version}</version>
</dependency>
- <!-- dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency -->
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
Modified: camel/trunk/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1393453&r1=1393452&r2=1393453&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Wed Oct 3 12:27:37 2012
@@ -284,7 +284,6 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf-version}</version>
<executions>
<execution>
<id>generate-test-sources</id>
Modified: camel/trunk/components/camel-ejb/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ejb/pom.xml?rev=1393453&r1=1393452&r2=1393453&view=diff
==============================================================================
--- camel/trunk/components/camel-ejb/pom.xml (original)
+++ camel/trunk/components/camel-ejb/pom.xml Wed Oct 3 12:27:37 2012
@@ -36,27 +36,21 @@
<dependencies>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>5.0-3</version>
- <scope>provided</scope>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
</dependency>
<!-- testing -->
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>3.1.4</version>
- <scope>test</scope>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -64,9 +58,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: camel/trunk/components/camel-elasticsearch/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-elasticsearch/pom.xml?rev=1393453&r1=1393452&r2=1393453&view=diff
==============================================================================
--- camel/trunk/components/camel-elasticsearch/pom.xml (original)
+++ camel/trunk/components/camel-elasticsearch/pom.xml Wed Oct 3 12:27:37 2012
@@ -57,11 +57,6 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
@@ -72,11 +67,6 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-eventadmin/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-eventadmin/pom.xml?rev=1393453&r1=1393452&r2=1393453&view=diff
==============================================================================
--- camel/trunk/components/camel-eventadmin/pom.xml (original)
+++ camel/trunk/components/camel-eventadmin/pom.xml Wed Oct 3 12:27:37 2012
@@ -46,10 +46,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-exec/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-exec/pom.xml?rev=1393453&r1=1393452&r2=1393453&view=diff
==============================================================================
--- camel/trunk/components/camel-exec/pom.xml (original)
+++ camel/trunk/components/camel-exec/pom.xml Wed Oct 3 12:27:37 2012
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- 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.
- -->
+<!--
+ 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 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">
<modelVersion>4.0.0</modelVersion>
@@ -45,7 +46,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>${commons-io-version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1393453&r1=1393452&r2=1393453&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Oct 3 12:27:37 2012
@@ -225,6 +225,7 @@
<!-- should be in-sync with deltaspike -->
<openwebbeans-version>1.1.5</openwebbeans-version>
<ognl-version>3.0.5_1</ognl-version>
+ <openejb-version>3.1.4</openejb-version>
<opensaml-version>2.5.1_2</opensaml-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>