Is there a reason this commit is done directly on the 2.8 branch? And not first on trunk and then merged to the branch?
On Wed, Aug 17, 2011 at 4:43 PM, <dk...@apache.org> wrote: > Author: dkulp > Date: Wed Aug 17 14:43:22 2011 > New Revision: 1158749 > > URL: http://svn.apache.org/viewvc?rev=1158749&view=rev > Log: > java.net repo is now synced to central. Remove the references. > > Modified: > camel/branches/camel-2.8.x/components/camel-mail/pom.xml > camel/branches/camel-2.8.x/components/camel-rss/pom.xml > camel/branches/camel-2.8.x/components/camel-web/pom.xml > > camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml > camel/branches/camel-2.8.x/examples/camel-example-reportincident/pom.xml > > camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml > > Modified: camel/branches/camel-2.8.x/components/camel-mail/pom.xml > URL: > http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-mail/pom.xml?rev=1158749&r1=1158748&r2=1158749&view=diff > ============================================================================== > --- camel/branches/camel-2.8.x/components/camel-mail/pom.xml (original) > +++ camel/branches/camel-2.8.x/components/camel-mail/pom.xml Wed Aug 17 > 14:43:22 2011 > @@ -35,18 +35,7 @@ > > <camel.osgi.export.pkg>org.apache.camel.component.mail.*</camel.osgi.export.pkg> > </properties> > > - <repositories> > - <!-- for javax mail and jvnet mock-mail --> > - <repository> > - <id>java.net.m2</id> > - <name>Java.net Repository for Maven</name> > - <url>http://download.java.net/maven/2/</url> > - <layout>default</layout> > - </repository> > - </repositories> > - > <dependencies> > - > <dependency> > <groupId>org.apache.camel</groupId> > <artifactId>camel-core</artifactId> > > Modified: camel/branches/camel-2.8.x/components/camel-rss/pom.xml > URL: > http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-rss/pom.xml?rev=1158749&r1=1158748&r2=1158749&view=diff > ============================================================================== > --- camel/branches/camel-2.8.x/components/camel-rss/pom.xml (original) > +++ camel/branches/camel-2.8.x/components/camel-rss/pom.xml Wed Aug 17 > 14:43:22 2011 > @@ -35,14 +35,6 @@ > > <camel.osgi.export.pkg>org.apache.camel.component.rss.*;org.apache.camel.dataformat.rss.*</camel.osgi.export.pkg> > </properties> > > - <repositories> > - <repository> > - <id>java.net.m2</id> > - <name>java.net Maven 2 Repo</name> > - <url>http://download.java.net/maven/2</url> > - </repository> > - </repositories> > - > <dependencies> > <!-- runtime --> > <dependency> > > Modified: camel/branches/camel-2.8.x/components/camel-web/pom.xml > URL: > http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-web/pom.xml?rev=1158749&r1=1158748&r2=1158749&view=diff > ============================================================================== > --- camel/branches/camel-2.8.x/components/camel-web/pom.xml (original) > +++ camel/branches/camel-2.8.x/components/camel-web/pom.xml Wed Aug 17 > 14:43:22 2011 > @@ -47,12 +47,6 @@ > </snapshots> > </repository> > <repository> > - <id>java.net.m2</id> > - <name>Java.net Repository for Maven</name> > - <url>http://download.java.net/maven/2/</url> > - <layout>default</layout> > - </repository> > - <repository> > <id>guiceyfruit.release</id> > <name>GuiceyFruit Release Repository</name> > <url>http://guiceyfruit.googlecode.com/svn/repo/releases/</url> > @@ -66,15 +60,6 @@ > > </repositories> > > - <pluginRepositories> > - <pluginRepository> > - <id>java.net.m2</id> > - <name>Java.net Repository for Maven</name> > - <url>http://download.java.net/maven/2/</url> > - <layout>default</layout> > - </pluginRepository> > - </pluginRepositories> > - > <dependencies> > <dependency> > <groupId>org.apache.camel</groupId> > > Modified: > camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml > URL: > http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml?rev=1158749&r1=1158748&r2=1158749&view=diff > ============================================================================== > --- > camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml > (original) > +++ > camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml > Wed Aug 17 14:43:22 2011 > @@ -33,16 +33,6 @@ > </description> > <packaging>bundle</packaging> > > - <repositories> > - <!-- for javax mail and jvnet mock-mail --> > - <repository> > - <id>java.net.m2</id> > - <name>Java.net Repository for Maven</name> > - <url>http://download.java.net/maven/2/</url> > - <layout>default</layout> > - </repository> > - </repositories> > - > <dependencies> > <dependency> > <groupId>org.apache.camel</groupId> > > Modified: > camel/branches/camel-2.8.x/examples/camel-example-reportincident/pom.xml > URL: > http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident/pom.xml?rev=1158749&r1=1158748&r2=1158749&view=diff > ============================================================================== > --- camel/branches/camel-2.8.x/examples/camel-example-reportincident/pom.xml > (original) > +++ camel/branches/camel-2.8.x/examples/camel-example-reportincident/pom.xml > Wed Aug 17 14:43:22 2011 > @@ -33,16 +33,6 @@ > </description> > <packaging>war</packaging> > > - <repositories> > - <!-- for javax mail and jvnet mock-mail --> > - <repository> > - <id>java.net.m2</id> > - <name>Java.net Repository for Maven</name> > - <url>http://download.java.net/maven/2/</url> > - <layout>default</layout> > - </repository> > - </repositories> > - > <dependencies> > <dependency> > <groupId>org.apache.camel</groupId> > > Modified: > camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml > URL: > http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1158749&r1=1158748&r2=1158749&view=diff > ============================================================================== > --- > camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml > (original) > +++ > camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml > Wed Aug 17 14:43:22 2011 > @@ -71,7 +71,7 @@ > <bundle > dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> > <bundle > dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle> > > <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle> > - <bundle > dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle> > + <bundle > dependency="true">mvn:javax.mail/mail/${javax-mail-version}</bundle> > <bundle > dependency="true">mvn:org.apache.neethi/neethi/${neethi-bundle-version}</bundle> > <bundle > dependency="true">mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle> > <bundle > dependency="true">mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle> > @@ -186,7 +186,7 @@ > </feature> --> > <feature name='camel-atom' version='${pom.version}' resolver='(obr)' > start-level='50'> > <feature version='${pom.version}'>camel-core</feature> > - <bundle > dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle> > + <bundle > dependency="true">mvn:javax.mail/mail/${javax-mail-version}</bundle> > <bundle > dependency="true">mvn:org.apache.ws.commons.axiom/axiom-impl/${axiom-version}</bundle> > <bundle > dependency="true">mvn:org.apache.ws.commons.axiom/axiom-api/${axiom-version}</bundle> > <bundle > dependency="true">mvn:org.apache.abdera/abdera-core/${abdera-version}</bundle> > @@ -322,7 +322,7 @@ > <bundle > dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-${jaxws.api.version}/${servicemix-specs-version}</bundle> > <bundle > dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle> > <bundle > dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> > - <bundle > dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle> > + <bundle > dependency="true">mvn:javax.mail/mail/${javax-mail-version}</bundle> > <bundle > dependency="true">mvn:commons-codec/commons-codec/${commons-codec}</bundle> > <bundle > dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle> > <bundle > dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> > @@ -470,7 +470,7 @@ > <feature name='camel-mail' version='${pom.version}' resolver='(obr)' > start-level='50'> > <bundle > dependency="true">mvn:org.springframework/spring-context/${spring-version}</bundle> > <bundle > dependency="true">mvn:org.springframework/spring-context-support/${spring-version}</bundle> > - <bundle > dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle> > + <bundle > dependency="true">mvn:javax.mail/mail/${javax-mail-version}</bundle> > <feature version='${pom.version}'>camel-core</feature> > <bundle>mvn:org.apache.camel/camel-mail/${pom.version}</bundle> > </feature> > @@ -626,7 +626,7 @@ > </feature> > <feature name='camel-spring-ws' version='${pom.version}' resolver='(obr)' > start-level='50'> > <feature version='${pom.version}'>camel-spring</feature> > - <bundle > dependency="true">mvn:http://download.java.net/maven/2!javax.mail/mail/${javax-mail-version}</bundle> > + <bundle > dependency="true">mvn:javax.mail/mail/${javax-mail-version}</bundle> > <bundle > dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> > <bundle > dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack-bundle-version}</bundle> > <bundle > dependency="true">mvn:org.springframework/spring-jms/${spring-version}</bundle> > > > -- Claus Ibsen ----------------- FuseSource Email: cib...@fusesource.com Web: http://fusesource.com Twitter: davsclaus, fusenews Blog: http://davsclaus.blogspot.com/ Author of Camel in Action: http://www.manning.com/ibsen/
