Author: davsclaus
Date: Thu Oct 18 14:48:24 2012
New Revision: 1399682
URL: http://svn.apache.org/viewvc?rev=1399682&view=rev
Log:
added resources plugin to the archetypes to avoid eclipse m2e errors when
importing the archetype genearted project
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/parent/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1399664
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Thu Oct 18 14:48:24 2012
@@ -133,6 +133,7 @@
<leveldbjni-version>1.3</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>
<lucene-version>3.6.0</lucene-version>
+ <maven-resources-plugin-version>2.4.3</maven-resources-plugin-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.7</mina2-version>
<mockito-version>1.9.0</mockito-version>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -108,6 +108,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- allows the route to be ran via 'mvn camel:run' -->
<plugin>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -88,6 +88,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- to generate the MANIFEST-FILE of the bundle -->
<plugin>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -97,6 +97,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- the Maven Scala plugin will compile Scala source files -->
<plugin>
<groupId>net.alchim31.maven</groupId>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -80,6 +80,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -80,6 +80,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -77,6 +77,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- allows the route to be ran via 'mvn camel:run' -->
<plugin>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -94,6 +94,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- the Maven Scala plugin will compile Scala source files -->
<plugin>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -83,6 +83,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- allows the route to be ran via 'mvn camel:run' -->
<plugin>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -84,6 +84,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- allows the route to be ran via 'mvn camel:run' -->
<plugin>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -99,6 +99,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- plugin so you can run mvn jetty:run -->
<plugin>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml?rev=1399682&r1=1399681&r2=1399682&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
Thu Oct 18 14:48:24 2012
@@ -112,6 +112,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin-version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
<!-- plugin to run using mvn jetty:run -->
<plugin>
