Author: bvahdat
Date: Sat Apr 27 00:24:00 2013
New Revision: 1476456
URL: http://svn.apache.org/r1476456
Log:
Merged revisions 1476428 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1476428 | bvahdat | 2013-04-27 00:41:47 +0200 (Sa, 27 Apr 2013) | 1 line
For cross-referencing the current Spring version inside the generated Javadoc
better make use of ${spring-version} instead of some hard-coded values which we
may forget to update regularly by each Spring dependency upgrade.
........
Modified:
camel/branches/camel-2.11.x/ (props changed)
camel/branches/camel-2.11.x/components/camel-blueprint/pom.xml
camel/branches/camel-2.11.x/components/camel-http/ (props changed)
camel/branches/camel-2.11.x/components/camel-jms/ (props changed)
camel/branches/camel-2.11.x/components/camel-spring/pom.xml
camel/branches/camel-2.11.x/parent/pom.xml
camel/branches/camel-2.11.x/tooling/maven/pom.xml
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1476428
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Apr 27 00:24:00 2013
@@ -1 +1 @@
-/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330,1471407-1471408,1471543,1475657,1475677,1475742,1475786,1476113,1476442
+/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330,1471407-1471408,1471543,1475657,1475677,1475742,1475786,1476113,1476428,1476442
Modified: camel/branches/camel-2.11.x/components/camel-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/components/camel-blueprint/pom.xml?rev=1476456&r1=1476455&r2=1476456&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/components/camel-blueprint/pom.xml (original)
+++ camel/branches/camel-2.11.x/components/camel-blueprint/pom.xml Sat Apr 27
00:24:00 2013
@@ -349,7 +349,7 @@
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>
-
<link>http://static.springsource.org/spring/docs/${spring-version}/api/</link>
+
<link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
Propchange: camel/branches/camel-2.11.x/components/camel-http/
------------------------------------------------------------------------------
Merged /camel/trunk/components/camel-http:r1476428
Propchange: camel/branches/camel-2.11.x/components/camel-jms/
------------------------------------------------------------------------------
Merged /camel/trunk/components/camel-jms:r1476428
Modified: camel/branches/camel-2.11.x/components/camel-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/components/camel-spring/pom.xml?rev=1476456&r1=1476455&r2=1476456&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/components/camel-spring/pom.xml (original)
+++ camel/branches/camel-2.11.x/components/camel-spring/pom.xml Sat Apr 27
00:24:00 2013
@@ -397,7 +397,7 @@
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>
-
<link>http://static.springsource.org/spring/docs/3.0.5.RELEASE/api/</link>
+
<link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
@@ -418,8 +418,8 @@
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>
-
<link>http://static.springsource.org/spring/docs/3.0.5.RELEASE/api/</link>
- <link>http://camel.apache.org/maven/camel-core/apidocs/</link>
+
<link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link>
+
<link>http://camel.apache.org/maven/current/camel-core/apidocs/</link>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
Modified: camel/branches/camel-2.11.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/parent/pom.xml?rev=1476456&r1=1476455&r2=1476456&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/parent/pom.xml (original)
+++ camel/branches/camel-2.11.x/parent/pom.xml Sat Apr 27 00:24:00 2013
@@ -2505,7 +2505,7 @@
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>
-
<link>http://static.springsource.org/spring/docs/3.1.3.RELEASE/javadoc-api/</link>
+
<link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
Modified: camel/branches/camel-2.11.x/tooling/maven/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/tooling/maven/pom.xml?rev=1476456&r1=1476455&r2=1476456&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/tooling/maven/pom.xml (original)
+++ camel/branches/camel-2.11.x/tooling/maven/pom.xml Sat Apr 27 00:24:00 2013
@@ -62,7 +62,7 @@
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>
-
<link>http://static.springsource.org/spring/docs/${spring-version}/api/</link>
+
<link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link>
</links>
<stylesheetfile>${basedir}/../../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>