You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2008/11/28 16:37:09 UTC

svn commit: r721521 - in /activemq/camel/trunk: components/camel-spring-integration/pom.xml pom.xml

Author: jstrachan
Date: Fri Nov 28 07:37:08 2008
New Revision: 721521

URL: http://svn.apache.org/viewvc?rev=721521&view=rev
Log:
added spring repos to parent as we're gonna have a few modules referring to them

Modified:
    activemq/camel/trunk/components/camel-spring-integration/pom.xml
    activemq/camel/trunk/pom.xml

Modified: activemq/camel/trunk/components/camel-spring-integration/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/pom.xml?rev=721521&r1=721520&r2=721521&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring-integration/pom.xml Fri Nov 28 07:37:08 2008
@@ -32,32 +32,10 @@
   <packaging>bundle</packaging>
 
   <properties>
-	<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
+    <camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
     <spring-integration-version>1.0.0.RC1</spring-integration-version>
   </properties>
 
-  <version>2.0-SNAPSHOT</version>
-
-  <repositories>
-    <repository>
-      <id>spring.maven.milestone</id>
-      <name>Spring Milestone Maven Repo</name>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-
-    <repository>
-      <id>spring.maven.realse</id>
-      <name>Spring Release Maven Repo</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </repository>
-
-    <repository>
-      <id>com.springsource.repository.bundles.external</id>
-      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-  </repositories>
-
   <build>
     <defaultGoal>install</defaultGoal>
     <resources>

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=721521&r1=721520&r2=721521&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Nov 28 07:37:08 2008
@@ -52,6 +52,7 @@
     <slf4j-version>1.5.6</slf4j-version>
     <openjpa-version>1.2.0</openjpa-version>
     <spring-version>2.5.6</spring-version>
+    <spring-javaconfig-version>1.0.0.M4</spring-javaconfig-version>
     <spring-osgi-version>1.1.2</spring-osgi-version>
     <mina-version>1.1.7</mina-version>
     <uface-version>1.0-m1</uface-version>
@@ -150,6 +151,27 @@
     </site>
   </distributionManagement>
 
+  <repositories>
+    <repository>
+      <id>spring.maven.milestone</id>
+      <name>Spring Milestone Maven Repo</name>
+      <url>http://repository.springsource.com/maven/bundles/milestone</url>
+    </repository>
+
+    <repository>
+      <id>spring.maven.release</id>
+      <name>Spring Release Maven Repo</name>
+      <url>http://repository.springsource.com/maven/bundles/release</url>
+    </repository>
+
+    <repository>
+      <id>com.springsource.repository.bundles.external</id>
+      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+      <url>http://repository.springsource.com/maven/bundles/external</url>
+    </repository>
+  </repositories>
+
+
   <modules>
     <module>buildingtools</module>
     <module>camel-core</module>
@@ -707,6 +729,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.springframework.javaconfig</groupId>
+        <artifactId>org.springframework.config.java</artifactId>
+        <version>${spring-javaconfig-version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-core</artifactId>
         <version>${spring-osgi-version}</version>
@@ -1058,7 +1086,7 @@
       		</execution>
       	</executions>
       </plugin>
-
+      
       </plugins>
     </pluginManagement>
 



Re: svn commit: r721521 - in /activemq/camel/trunk: components/camel-spring-integration/pom.xml pom.xml

Posted by Willem Jiang <wi...@gmail.com>.
Hi James,

Could you tell me what other modules will use the Spring source maven
repository?
I think putting the Spring source maven repository into the Spring
Integration module is because we don't want maven spends lots of time on
trying to download artifacts from Spring source maven repository in the
other modules.

Willem

On Fri, Nov 28, 2008 at 11:37 PM, <js...@apache.org> wrote:

> Author: jstrachan
> Date: Fri Nov 28 07:37:08 2008
> New Revision: 721521
>
> URL: http://svn.apache.org/viewvc?rev=721521&view=rev
> Log:
> added spring repos to parent as we're gonna have a few modules referring to
> them
>
> Modified:
>    activemq/camel/trunk/components/camel-spring-integration/pom.xml
>    activemq/camel/trunk/pom.xml
>
> Modified: activemq/camel/trunk/components/camel-spring-integration/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/pom.xml?rev=721521&r1=721520&r2=721521&view=diff
>
> ==============================================================================
> --- activemq/camel/trunk/components/camel-spring-integration/pom.xml
> (original)
> +++ activemq/camel/trunk/components/camel-spring-integration/pom.xml Fri
> Nov 28 07:37:08 2008
> @@ -32,32 +32,10 @@
>   <packaging>bundle</packaging>
>
>   <properties>
> -
> <camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
> +
>  <camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
>     <spring-integration-version>1.0.0.RC1</spring-integration-version>
>   </properties>
>
> -  <version>2.0-SNAPSHOT</version>
> -
> -  <repositories>
> -    <repository>
> -      <id>spring.maven.milestone</id>
> -      <name>Spring Milestone Maven Repo</name>
> -      <url>http://repository.springsource.com/maven/bundles/milestone
> </url>
> -    </repository>
> -
> -    <repository>
> -      <id>spring.maven.realse</id>
> -      <name>Spring Release Maven Repo</name>
> -      <url>http://repository.springsource.com/maven/bundles/release</url>
> -    </repository>
> -
> -    <repository>
> -      <id>com.springsource.repository.bundles.external</id>
> -      <name>SpringSource Enterprise Bundle Repository - External Bundle
> Releases</name>
> -      <url>http://repository.springsource.com/maven/bundles/external
> </url>
> -    </repository>
> -  </repositories>
> -
>   <build>
>     <defaultGoal>install</defaultGoal>
>     <resources>
>
> Modified: activemq/camel/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=721521&r1=721520&r2=721521&view=diff
>
> ==============================================================================
> --- activemq/camel/trunk/pom.xml (original)
> +++ activemq/camel/trunk/pom.xml Fri Nov 28 07:37:08 2008
> @@ -52,6 +52,7 @@
>     <slf4j-version>1.5.6</slf4j-version>
>     <openjpa-version>1.2.0</openjpa-version>
>     <spring-version>2.5.6</spring-version>
> +    <spring-javaconfig-version>1.0.0.M4</spring-javaconfig-version>
>     <spring-osgi-version>1.1.2</spring-osgi-version>
>     <mina-version>1.1.7</mina-version>
>     <uface-version>1.0-m1</uface-version>
> @@ -150,6 +151,27 @@
>     </site>
>   </distributionManagement>
>
> +  <repositories>
> +    <repository>
> +      <id>spring.maven.milestone</id>
> +      <name>Spring Milestone Maven Repo</name>
> +      <url>http://repository.springsource.com/maven/bundles/milestone
> </url>
> +    </repository>
> +
> +    <repository>
> +      <id>spring.maven.release</id>
> +      <name>Spring Release Maven Repo</name>
> +      <url>http://repository.springsource.com/maven/bundles/release</url>
> +    </repository>
> +
> +    <repository>
> +      <id>com.springsource.repository.bundles.external</id>
> +      <name>SpringSource Enterprise Bundle Repository - External Bundle
> Releases</name>
> +      <url>http://repository.springsource.com/maven/bundles/external
> </url>
> +    </repository>
> +  </repositories>
> +
> +
>   <modules>
>     <module>buildingtools</module>
>     <module>camel-core</module>
> @@ -707,6 +729,12 @@
>       </dependency>
>
>       <dependency>
> +        <groupId>org.springframework.javaconfig</groupId>
> +        <artifactId>org.springframework.config.java</artifactId>
> +        <version>${spring-javaconfig-version}</version>
> +      </dependency>
> +
> +      <dependency>
>         <groupId>org.springframework.osgi</groupId>
>         <artifactId>spring-osgi-core</artifactId>
>         <version>${spring-osgi-version}</version>
> @@ -1058,7 +1086,7 @@
>                </execution>
>        </executions>
>       </plugin>
> -
> +
>       </plugins>
>     </pluginManagement>
>
>
>
>