Author: janstey
Date: Mon Oct 19 17:46:31 2009
New Revision: 826731
URL: http://svn.apache.org/viewvc?rev=826731&view=rev
Log:
remove camel-blueprint from the build (for now) and do some other cleanup
Modified:
camel/trunk/components/camel-web/pom.xml
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
Modified: camel/trunk/components/camel-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=826731&r1=826730&r2=826731&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Mon Oct 19 17:46:31 2009
@@ -225,7 +225,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<forkMode>once</forkMode>
<!-- these settings are mandatory to avoid SureFire giving a bogus
system property to the web container -->
Modified: camel/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=826731&r1=826730&r2=826731&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Mon Oct 19 17:46:31 2009
@@ -34,7 +34,8 @@
<module>camel-atom</module>
<module>camel-bam</module>
<module>camel-bindy</module>
- <module>camel-blueprint</module>
+ <!-- component still under active development
+ <module>camel-blueprint</module> -->
<module>camel-cometd</module>
<module>camel-cache</module>
<module>camel-castor</module>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=826731&r1=826730&r2=826731&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Oct 19 17:46:31 2009
@@ -1,12 +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";>
<parent>
@@ -604,13 +612,6 @@
<version>${commons-logging-version}</version>
</dependency>
- <!-- TODO not needed as parent dependency -->
- <!--
- <dependency> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons-collections-version}</version>
- </dependency> <dependency> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <version>${commons-pool-version}</version>
- </dependency> <dependency> <groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId> <version>${commons-dbcp-version}</version>
- </dependency> <dependency> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <version>${commons-io-version}</version>
</dependency>
- -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -1146,22 +1147,16 @@
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
<java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
-
<!--java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String-->
</buildcommands>
<projectnatures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-
<!--nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature-->
</projectnatures>
<additionalConfig>
<file>
<name>.checkstyle</name>
<location>/camel-eclipse-checkstyle</location>
</file>
- <!--
- file> <name>.pmd</name> <location>/cxf-eclipse-pmd</location>
</file> <file> <name>.ruleset</name> <location>/cxf-pmd-ruleset.xml</location
- -->
-
</additionalConfig>
</configuration>
</plugin>
Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=826731&r1=826730&r2=826731&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Mon Oct 19 17:46:31
2009
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
