Author: hadrian
Date: Sat Feb 5 02:36:34 2011
New Revision: 1067381
URL: http://svn.apache.org/viewvc?rev=1067381&view=rev
Log:
CAMEL-3603. Drop support for jdk 1.5
Modified:
camel/trunk/camel-core/pom.xml
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-ftp/pom.xml
camel/trunk/components/camel-jasypt/pom.xml
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
camel/trunk/components/camel-spring-security/pom.xml
camel/trunk/components/camel-spring-ws/pom.xml
camel/trunk/components/camel-spring/pom.xml
camel/trunk/examples/camel-example-cxf-proxy/pom.xml
camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
camel/trunk/examples/camel-example-reportincident/pom.xml
camel/trunk/pom.xml
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServiceV1Impl.java
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/maven/pom.xml
Modified: camel/trunk/camel-core/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/camel-core/pom.xml (original)
+++ camel/trunk/camel-core/pom.xml Sat Feb 5 02:36:34 2011
@@ -175,14 +175,14 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
-
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+ <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>
</links>
<stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>256m</maxmemory>
- <source>1.5</source>
+ <source>1.6</source>
<groups>
<group>
@@ -233,39 +233,6 @@
<profiles>
- <!--profile>
- <id>jdk1.5-maven-2.2.x</id>
- <activation>
- <jdk>[1.5,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile-->
- <profile>
- <id>jdk1.5-maven-2.0.x</id>
- <activation>
- <!-- for maven 2.0.x syntax -->
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>release</id>
<build>
@@ -284,14 +251,14 @@
</executions>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
-
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+ <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>
</links>
<stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>256m</maxmemory>
- <source>1.5</source>
+ <source>1.6</source>
<groups>
<group>
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
Sat Feb 5 02:36:34 2011
@@ -32,8 +32,8 @@ public class BindyComplexCsvUnmarshallTe
private String record =
"01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
"02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n"
+
"03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
"04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n"
- +
"05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" +
"06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
- +
"07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
"08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ +
"05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" + "06,A5,Andr"
+ "\uc3a9" + ",Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
+ + "07,A6,Myl" + "\uc3a8" +
"ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
"08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" +
",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" + ",,,D,ISIN,LU123456789,,,,,\r\n"
+
"10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" +
"10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
Sat Feb 5 02:36:34 2011
@@ -34,8 +34,8 @@ public class BindySimpleCsvSkipFirstLine
private String record = "order nr,client ref,first name, last
name,instrument code,instrument name,order type, instrument type,
quantity,currency,date\r\n"
+
"1,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
"2,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n"
+
"03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
"04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n"
- +
"05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" +
"06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
- +
"07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
"08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ +
"05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" + "06,A5,Andr"
+ "\uc3a9" + ",Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
+ + "07,A6,Myl" + "\uc3a8" +
"ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
"08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" +
",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" + ",,,D,ISIN,LU123456789,,,,,\r\n"
+
"10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" +
"10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java
Sat Feb 5 02:36:34 2011
@@ -31,7 +31,7 @@ public class BindySimpleCsvUnmarshallDsl
String message =
"01,,Albert,Einstein,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
"02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n"
+
"03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
"04,A3,Michel,Platini,,,BUY,,2500,USD,08-01-2009\r\n"
+
"05,A4,Jacques,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" +
"06,A5,Jacques,Brel,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
- +
"07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
"08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ + "07,A6,Myl" + "\uc3a8" +
"ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
"08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" +
",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" + ",,,D,ISIN,LU123456789,,,,,\r\n"
+
"10,A8,Pauline,Lafont,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" +
"10,A9,Louis,Pasteur,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
Sat Feb 5 02:36:34 2011
@@ -57,8 +57,8 @@ public class BindySimpleCsvUnmarshallTes
expected =
"01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
"02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n"
+
"03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
"04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n"
- +
"05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" +
"06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
- +
"07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
"08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ +
"05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" + "06,A5,Andr"
+ "\uc3a9" + ",Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
+ + "07,A6,Myl" + "\uc3a8" +
"ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
"08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" +
",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" + ",,,D,ISIN,LU123456789,,,,,\r\n"
+
"10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" +
"10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Sat Feb 5 02:36:34 2011
@@ -251,12 +251,12 @@
</executions>
<configuration>
<links>
-
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-
<link>http://java.sun.com/javaee/5/docs/api/</link>
+
<link>http://download.oracle.com/javase/6/docs/api/</link>
+
<link>http://download.oracle.com/javaee/6/api/</link>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
- <source>1.5</source>
+ <source>1.6</source>
</configuration>
</plugin>
</plugins>
@@ -390,14 +390,14 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
-
<link>http://camel.apache.org/maven/camel-core/apidocs/</link>
+
<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>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>256m</maxmemory>
- <source>1.5</source>
+ <source>1.6</source>
<groups>
<group>
Modified: camel/trunk/components/camel-ftp/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/pom.xml (original)
+++ camel/trunk/components/camel-ftp/pom.xml Sat Feb 5 02:36:34 2011
@@ -126,7 +126,6 @@
</dependency>
<!-- to allow Spring annotations (jmx) to be tested -->
- <!-- The scope should be test, and set this scope to fix the camel-ftp
build with JDK1.5 -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Modified: camel/trunk/components/camel-jasypt/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jasypt/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/components/camel-jasypt/pom.xml (original)
+++ camel/trunk/components/camel-jasypt/pom.xml Sat Feb 5 02:36:34 2011
@@ -93,22 +93,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk1.5-maven-2.0.x</id>
- <activation>
- <!-- for maven 2.0.x syntax -->
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>${icu4j-version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<build>
<plugins>
Modified:
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
(original)
+++
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
Sat Feb 5 02:36:34 2011
@@ -39,12 +39,12 @@ public class LuceneIndexAndQueryProducer
private static final transient Logger LOG =
LoggerFactory.getLogger(LuceneIndexAndQueryProducerTest.class);
private String[] humorousQuotes = {
"I think, therefore I am. I think - George Carlin",
- "I have as much authority as the Pope. I just donÕt have as many
people who believe it. - George Carlin",
+ "I have as much authority as the Pope. I just don't have as many
people who believe it. - George Carlin",
"There`s no present. There`s only the immediate future and the recent
past - George Carlin",
"Politics doesn't make strange bedfellows - marriage does. - Groucho
Marx",
"I refuse to join any club that would have me as a member. - Groucho
Marx",
"I tell ya when I was a kid, all I knew was rejection. My yo-yo, it
never came back. - Rodney Dangerfield",
- "I worked in a pet store and people kept asking how big IÕd get. -
Rodney Dangerfield"
+ "I worked in a pet store and people kept asking how big I'd get. -
Rodney Dangerfield"
};
@Override
Modified:
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
(original)
+++
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
Sat Feb 5 02:36:34 2011
@@ -44,14 +44,14 @@ public class SoapRoundtripTest extends C
public void testRoundTrip() throws IOException, InterruptedException {
resultEndpoint.expectedMessageCount(1);
GetCustomersByName request = new GetCustomersByName();
- request.setName("Müller");
+ request.setName("Mueller");
producer.sendBody(request);
resultEndpoint.assertIsSatisfied();
Exchange exchange = resultEndpoint.getExchanges().get(0);
GetCustomersByName received = exchange.getIn().getBody(
GetCustomersByName.class);
Assert.assertNotNull(received);
- Assert.assertEquals("Müller", received.getName());
+ Assert.assertEquals("Mueller", received.getName());
}
@Override
Modified:
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
(original)
+++
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
Sat Feb 5 02:36:34 2011
@@ -49,13 +49,13 @@ public class SoapSpringRoundtripTest {
public void testRoundTrip() throws IOException, InterruptedException {
resultEndpoint.expectedMessageCount(1);
GetCustomersByName request = new GetCustomersByName();
- request.setName("Müller");
+ request.setName("Mueller");
producer.sendBody(request);
resultEndpoint.assertIsSatisfied();
Exchange exchange = resultEndpoint.getExchanges().get(0);
GetCustomersByName received = exchange.getIn().getBody(
GetCustomersByName.class);
Assert.assertNotNull(received);
- Assert.assertEquals("Müller", received.getName());
+ Assert.assertEquals("Mueller", received.getName());
}
}
Modified: camel/trunk/components/camel-spring-security/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/pom.xml (original)
+++ camel/trunk/components/camel-spring-security/pom.xml Sat Feb 5 02:36:34
2011
@@ -72,13 +72,6 @@
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: camel/trunk/components/camel-spring-ws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/pom.xml (original)
+++ camel/trunk/components/camel-spring-ws/pom.xml Sat Feb 5 02:36:34 2011
@@ -71,34 +71,6 @@
<scope>provided</scope>
</dependency>
- <!-- these is needed by JDK 1.5 -->
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>1.3</version>
- <exclusions>
- <exclusion>
- <!-- exclude dependency on javax.activation due to sun
binary license
- restrictions geronimo-activation dependency directly
below provides a workaround -->
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <!-- workaround for saaj dependency on javax.activation -->
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3.2</version>
- <scope>provided</scope>
- </dependency>
-
<!-- testing -->
<dependency>
<groupId>org.springframework</groupId>
Modified: camel/trunk/components/camel-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Sat Feb 5 02:36:34 2011
@@ -354,13 +354,13 @@
</executions>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
-
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+ <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>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
- <source>1.5</source>
+ <source>1.6</source>
</configuration>
</plugin>
</plugins>
@@ -498,15 +498,15 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
-
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+ <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>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>256m</maxmemory>
- <source>1.5</source>
+ <source>1.6</source>
<groups>
<group>
Modified: camel/trunk/examples/camel-example-cxf-proxy/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-proxy/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-proxy/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-proxy/pom.xml Sat Feb 5 02:36:34
2011
@@ -111,17 +111,6 @@
<build>
<plugins>
-
- <!-- to compile with 1.5 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
<!-- CXF wsdl2java generator, will plugin to the compile goal -->
<plugin>
<groupId>org.apache.cxf</groupId>
Modified:
camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
(original)
+++ camel/trunk/examples/camel-example-reportincident-ws-security-osgi/pom.xml
Sat Feb 5 02:36:34 2011
@@ -157,17 +157,6 @@
<build>
<plugins>
-
- <!-- to compile with 1.5 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
<!-- CXF wsdl2java generator, will plugin to the compile goal -->
<plugin>
<groupId>org.apache.cxf</groupId>
Modified: camel/trunk/examples/camel-example-reportincident/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/pom.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/pom.xml Sat Feb 5
02:36:34 2011
@@ -118,17 +118,6 @@
<build>
<plugins>
-
- <!-- to compile with 1.5 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
<!-- CXF wsdl2java generator, will plugin to the compile goal -->
<plugin>
<groupId>org.apache.cxf</groupId>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Sat Feb 5 02:36:34 2011
@@ -44,6 +44,7 @@
<site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
<felix-version>2.0.1</felix-version>
<jdk.version>1.6</jdk.version>
+ <compiler.fork>1.6</compiler.fork>
<!-- eclipse plugin need the jaxb in this pom.xml file -->
<jaxb-version>2.1.13</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
@@ -147,8 +148,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
<maxmem>256M</maxmem>
<fork>${compiler.fork}</fork>
</configuration>
@@ -187,10 +188,10 @@
<version>2.7</version>
<configuration>
<attach>true</attach>
- <source>1.5</source>
+ <source>1.6</source>
<quiet>true</quiet>
<bottom>Apache CAMEL</bottom>
- <javadocVersion>1.5</javadocVersion>
+ <!--javadocVersion>1.5</javadocVersion-->
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -511,14 +512,14 @@
<version>2.7</version>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
-
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+ <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>
</links>
<stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>500m</maxmemory>
- <source>1.5</source>
+ <source>1.6</source>
<!-- TODO we can't aggregate as it won't find the CSS file :( -->
<!--<aggregate>true</aggregate>-->
@@ -534,18 +535,6 @@
<profiles>
<profile>
- <!-- really just used for the eclipse setup as eclipse will stick JSE-15
as the compliance
- level if we don't reconfigure the compiler plugin with 1.6. When it
does that, things
- like JAXB and other built in JDK things won't be found -->
- <id>jdk15</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <properties>
- <jdk.version>1.5</jdk.version>
- </properties>
- </profile>
- <profile>
<id>setup.eclipse</id>
<!--
set up the eclipse workspace and generate the .classpath and .project
files for modules
@@ -563,6 +552,8 @@
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
+ <maxmem>512M</maxmem>
+ <fork>${compiler.fork}</fork>
</configuration>
</plugin>
</plugins>
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServiceV1Impl.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServiceV1Impl.java?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServiceV1Impl.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServiceV1Impl.java
Sat Feb 5 02:36:34 2011
@@ -23,7 +23,7 @@ public class CustomerServiceV1Impl imple
if ("12345".equals(customerNumber)) {
Person maxMueller = new Person();
maxMueller.setFirstname("Max");
- maxMueller.setLastname("Müller");
+ maxMueller.setLastname("Mueller");
maxMueller.setGender(Gender.MALE);
Address maxMuellerAddress = new Address();
maxMuellerAddress.setLine1("Mussterstr. 10");
Modified:
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
Sat Feb 5 02:36:34 2011
@@ -91,8 +91,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
@@ -106,25 +106,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk1.5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl-version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
Sat Feb 5 02:36:34 2011
@@ -64,11 +64,10 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
-
</plugins>
</build>
</project>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
Sat Feb 5 02:36:34 2011
@@ -63,8 +63,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
@@ -76,24 +76,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk1.5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl-version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
Sat Feb 5 02:36:34 2011
@@ -63,8 +63,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
@@ -77,24 +77,4 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk1.5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl-version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
Sat Feb 5 02:36:34 2011
@@ -82,8 +82,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
Modified: camel/trunk/tooling/maven/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/pom.xml?rev=1067381&r1=1067380&r2=1067381&view=diff
==============================================================================
--- camel/trunk/tooling/maven/pom.xml (original)
+++ camel/trunk/tooling/maven/pom.xml Sat Feb 5 02:36:34 2011
@@ -69,14 +69,14 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
-
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+ <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>
</links>
<stylesheetfile>${basedir}/../../../etc/css/stylesheet.css</stylesheetfile>
<linksource>true</linksource>
<maxmemory>900m</maxmemory>
- <source>1.5</source>
+ <source>1.6</source>
<!-- TODO we can't aggregate as it won't find the CSS file :( -->
<!--<aggregate>true</aggregate>-->
