Author: gertv
Date: Tue Feb 17 14:53:12 2009
New Revision: 745109
URL: http://svn.apache.org/viewvc?rev=745109&view=rev
Log:
Merged revisions 745105 via svnmerge from
https://svn.eu.apache.org/repos/asf/camel/trunk
........
r745105 | gertv | 2009-02-17 15:42:56 +0100 (Tue, 17 Feb 2009) | 1 line
No need for the separate Scala repos, these artifacts are now in central repo
as well
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-scala/pom.xml
camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 14:53:12 2009
@@ -1 +1 @@
-/camel/trunk:739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123
+/camel/trunk:739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-scala/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-scala/pom.xml?rev=745109&r1=745108&r2=745109&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-scala/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-scala/pom.xml Tue Feb 17 14:53:12
2009
@@ -15,21 +15,6 @@
<camel.osgi.export.pkg>org.apache.camel.scala.*</camel.osgi.export.pkg>
</properties>
- <repositories>
- <repository>
- <id>scala-tools.org</id>
- <name>Scala-tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>scala-tools.org</id>
- <name>Scala-tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
Modified:
camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=745109&r1=745108&r2=745109&view=diff
==============================================================================
---
camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-1.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Tue Feb 17 14:53:12 2009
@@ -36,21 +36,6 @@
<scala-plugin-version>$SCALA_PLUGIN_VERSION_REPLACEME$</scala-plugin-version>
</properties>
- <repositories>
- <repository>
- <id>scala-tools.org</id>
- <name>Scala-tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>scala-tools.org</id>
- <name>Scala-tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
