You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/06/08 23:53:56 UTC
svn commit: r782808 - in /camel/trunk: ./
tests/camel-partial-classpath-test/ tooling/archetypes/
tooling/archetypes/camel-archetype-war/ tooling/camel-manual/
tooling/maven/ tooling/maven/camel-maven-plugin/
tooling/maven/guice-maven-plugin/ tooling/m...
Author: hadrian
Date: Mon Jun 8 21:53:56 2009
New Revision: 782808
URL: http://svn.apache.org/viewvc?rev=782808&view=rev
Log:
More pom fixes needed by the new maven release plugin.
Modified:
camel/trunk/pom.xml
camel/trunk/tests/camel-partial-classpath-test/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml
camel/trunk/tooling/archetypes/pom.xml
camel/trunk/tooling/camel-manual/pom.xml
camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
camel/trunk/tooling/maven/guice-maven-plugin/pom.xml
camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml
camel/trunk/tooling/maven/pom.xml
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Mon Jun 8 21:53:56 2009
@@ -17,7 +17,7 @@
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">
+<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>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
Modified: camel/trunk/tests/camel-partial-classpath-test/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-partial-classpath-test/pom.xml?rev=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/tests/camel-partial-classpath-test/pom.xml (original)
+++ camel/trunk/tests/camel-partial-classpath-test/pom.xml Mon Jun 8 21:53:56 2009
@@ -17,8 +17,7 @@
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">
+<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/tooling/archetypes/camel-archetype-war/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml?rev=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml Mon Jun 8 21:53:56 2009
@@ -17,8 +17,7 @@
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>
@@ -46,26 +45,10 @@
</goals>
<configuration>
<tasks>
- <replace
- file="${project.build.directory}/classes/archetype-resources/pom.xml"
- token="$CAMEL_VERSION_REPLACEME$"
- value="${project.version}" casesensitive="true">
- </replace>
- <replace
- file="${project.build.directory}/classes/archetype-resources/pom.xml"
- token="$ACTIVEMQ_VERSION_REPLACEME$"
- value="${activemq-version}" casesensitive="true">
- </replace>
- <replace
- file="${project.build.directory}/classes/archetype-resources/pom.xml"
- token="$JETTY_VERSION_REPLACEME$"
- value="${jetty-version}" casesensitive="true">
- </replace>
- <replace
- file="${project.build.directory}/classes/archetype-resources/pom.xml"
- token="$XBEAN_VERSION_REPLACEME$"
- value="${xbean-spring-version}" casesensitive="true">
- </replace>
+ <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="$CAMEL_VERSION_REPLACEME$" value="${project.version}" casesensitive="true" />
+ <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="$ACTIVEMQ_VERSION_REPLACEME$" value="${activemq-version}" casesensitive="true" />
+ <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="$JETTY_VERSION_REPLACEME$" value="${jetty-version}" casesensitive="true" />
+ <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="$XBEAN_VERSION_REPLACEME$" value="${xbean-spring-version}" casesensitive="true" />
</tasks>
</configuration>
</execution>
Modified: camel/trunk/tooling/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/pom.xml?rev=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/pom.xml (original)
+++ camel/trunk/tooling/archetypes/pom.xml Mon Jun 8 21:53:56 2009
@@ -15,8 +15,7 @@
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>
Modified: camel/trunk/tooling/camel-manual/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/camel-manual/pom.xml?rev=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/tooling/camel-manual/pom.xml (original)
+++ camel/trunk/tooling/camel-manual/pom.xml Mon Jun 8 21:53:56 2009
@@ -17,8 +17,8 @@
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>
@@ -50,7 +50,7 @@
<configuration>
<page>http://cwiki.apache.org/confluence/display/CAMEL/Book+In+One+Page</page>
<head><![CDATA[
- <link href="file:${basedir}/src/styles/print.css" rel="stylesheet" type="text/css"/>
+ <link href="file:${basedir}/src/styles/print.css" rel="stylesheet" type="text/css" />
<style type="text/css">
@page :left {
@top-left {
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=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Mon Jun 8 21:53:56 2009
@@ -1,3 +1,4 @@
+<?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
@@ -14,8 +15,7 @@
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>
Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Mon Jun 8 21:53:56 2009
@@ -1,3 +1,4 @@
+<?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
@@ -14,8 +15,7 @@
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>
Modified: camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml?rev=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml (original)
+++ camel/trunk/tooling/maven/maven-html-to-pdf/pom.xml Mon Jun 8 21:53:56 2009
@@ -1,3 +1,4 @@
+<?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
@@ -14,8 +15,7 @@
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>
Modified: camel/trunk/tooling/maven/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=782808&r1=782807&r2=782808&view=diff
==============================================================================
--- camel/trunk/tooling/maven/pom.xml (original)
+++ camel/trunk/tooling/maven/pom.xml Mon Jun 8 21:53:56 2009
@@ -15,8 +15,7 @@
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>