Author: cmueller
Date: Wed Oct 3 11:41:32 2012
New Revision: 1393438
URL: http://svn.apache.org/viewvc?rev=1393438&view=rev
Log:
CAMEL-5578: Polish our pom's to be as DRY as possible - work in progress
Modified:
camel/trunk/components/camel-apns/pom.xml
camel/trunk/components/camel-atom/pom.xml
camel/trunk/components/camel-avro/pom.xml
camel/trunk/components/camel-aws/pom.xml
camel/trunk/components/camel-bam/pom.xml
camel/trunk/components/camel-bean-validator/pom.xml
camel/trunk/components/camel-beanio/pom.xml
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-cache/pom.xml
camel/trunk/components/camel-cmis/pom.xml
camel/trunk/components/camel-cmis/src/test/java/org/apache/camel/componenet/cmis/CMISTestSupport.java
Modified: camel/trunk/components/camel-apns/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-apns/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-apns/pom.xml (original)
+++ camel/trunk/components/camel-apns/pom.xml Wed Oct 3 11:41:32 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,7 +14,6 @@
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>
Modified: camel/trunk/components/camel-atom/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/pom.xml (original)
+++ camel/trunk/components/camel-atom/pom.xml Wed Oct 3 11:41:32 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,7 +14,6 @@
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>
Modified: camel/trunk/components/camel-avro/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-avro/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-avro/pom.xml (original)
+++ camel/trunk/components/camel-avro/pom.xml Wed Oct 3 11:41:32 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,7 +14,6 @@
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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
Modified: camel/trunk/components/camel-aws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/pom.xml (original)
+++ camel/trunk/components/camel-aws/pom.xml Wed Oct 3 11:41:32 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,7 +14,6 @@
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>
Modified: camel/trunk/components/camel-bam/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/pom.xml (original)
+++ camel/trunk/components/camel-bam/pom.xml Wed Oct 3 11:41:32 2012
@@ -180,12 +180,10 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${spring-version}</version>
</dependency>
</dependencies>
</plugin>
Modified: camel/trunk/components/camel-bean-validator/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bean-validator/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-bean-validator/pom.xml (original)
+++ camel/trunk/components/camel-bean-validator/pom.xml Wed Oct 3 11:41:32 2012
@@ -1,19 +1,19 @@
<?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>
@@ -29,7 +29,7 @@
<packaging>bundle</packaging>
<properties>
- <hibernate-validator.version>4.1.0.Final</hibernate-validator.version>
+ <hibernate-validator-version>4.1.0.Final</hibernate-validator-version>
<camel.osgi.export.pkg>org.apache.camel.component.bean.validator.*</camel.osgi.export.pkg>
</properties>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>${hibernate-validator.version}</version>
+ <version>${hibernate-validator-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: camel/trunk/components/camel-beanio/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-beanio/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-beanio/pom.xml (original)
+++ camel/trunk/components/camel-beanio/pom.xml Wed Oct 3 11:41:32 2012
@@ -59,21 +59,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Wed Oct 3 11:41:32 2012
@@ -341,7 +341,7 @@
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>
-
<link>http://static.springsource.org/spring/docs/3.0.5.RELEASE/api/</link>
+
<link>http://static.springsource.org/spring/docs/${spring-version}/api/</link>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
Modified: camel/trunk/components/camel-cache/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-cache/pom.xml (original)
+++ camel/trunk/components/camel-cache/pom.xml Wed Oct 3 11:41:32 2012
@@ -59,7 +59,6 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>${xerces-version}</version>
</dependency>
<!-- testing -->
Modified: camel/trunk/components/camel-cmis/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cmis/pom.xml?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
--- camel/trunk/components/camel-cmis/pom.xml (original)
+++ camel/trunk/components/camel-cmis/pom.xml Wed Oct 3 11:41:32 2012
@@ -71,27 +71,20 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.24</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified:
camel/trunk/components/camel-cmis/src/test/java/org/apache/camel/componenet/cmis/CMISTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cmis/src/test/java/org/apache/camel/componenet/cmis/CMISTestSupport.java?rev=1393438&r1=1393437&r2=1393438&view=diff
==============================================================================
---
camel/trunk/components/camel-cmis/src/test/java/org/apache/camel/componenet/cmis/CMISTestSupport.java
(original)
+++
camel/trunk/components/camel-cmis/src/test/java/org/apache/camel/componenet/cmis/CMISTestSupport.java
Wed Oct 3 11:41:32 2012
@@ -42,11 +42,11 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.enums.BindingType;
import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
public class CMISTestSupport extends CamelTestSupport {
protected static final String CMIS_ENDPOINT_TEST_SERVER
@@ -144,9 +144,7 @@ public class CMISTestSupport extends Cam
@BeforeClass
public static void startServer() throws Exception {
cmisServer = new Server(9090);
- WebAppContext openCmisServerApi = new
WebAppContext(OPEN_CMIS_SERVER_WAR_PATH,
- "/chemistry-opencmis-server-inmemory");
- cmisServer.addHandler(openCmisServerApi);
+ cmisServer.setHandler(new WebAppContext(OPEN_CMIS_SERVER_WAR_PATH,
"/chemistry-opencmis-server-inmemory"));
cmisServer.start();
}
