You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/06/19 23:09:27 UTC

[1/4] git commit: upgrade maven release plugin from 2.2.1 to 2.4.1 and switched to our new GIT repo

Updated Branches:
  refs/heads/camel-2.10.x 93d0f250f -> 8b0a568e1


upgrade maven release plugin from 2.2.1 to 2.4.1 and switched to our new GIT repo


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02633e5f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02633e5f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02633e5f

Branch: refs/heads/camel-2.10.x
Commit: 02633e5fa1af0e5d6eda41e72fbd367363550012
Parents: 93d0f25
Author: cmueller <cm...@apache.org>
Authored: Wed Jun 19 22:38:38 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Wed Jun 19 22:38:38 2013 +0200

----------------------------------------------------------------------
 pom.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/02633e5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f4369a0..4d14c4b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -123,9 +123,9 @@
   </modules>
 
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x</developerConnection>
-    <url>http://svn.apache.org/viewvc/camel/branches/camel-2.10.x</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/camel.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/camel.git</developerConnection>
+    <url>https://fisheye6.atlassian.com/browse/~br=camel-2.10.x/camel-git</url>
   </scm>
 
   <build>
@@ -207,9 +207,10 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.2.1</version>
+          <version>2.4.1</version>
           <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/camel/tags</tagBase>
+	        <localCheckout>true</localCheckout>
+            <pushChanges>false</pushChanges>
             <useReleaseProfile>false</useReleaseProfile>
             <preparationGoals>clean install</preparationGoals>
             <goals>deploy</goals>


[4/4] git commit: fixed CS error

Posted by cm...@apache.org.
fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b0a568e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b0a568e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b0a568e

Branch: refs/heads/camel-2.10.x
Commit: 8b0a568e176c5bf4ffc64ebebdefac059b88e946
Parents: 064268c
Author: cmueller <cm...@apache.org>
Authored: Wed Jun 19 23:09:08 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Wed Jun 19 23:09:08 2013 +0200

----------------------------------------------------------------------
 .../apache/camel/component/jms/JmsInOutTransferExchangeTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8b0a568e/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
index a67e390..e737922 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
@@ -78,7 +78,7 @@ public class JmsInOutTransferExchangeTest extends CamelTestSupport {
         assertNotNull(transferMessage.getBody(SerializableRequestDto.class));
         assertNotNull(transferMessage.getHeader("requestObject", SerializableRequestDto.class));
         assertEquals(Boolean.TRUE, transferMessage.getHeader("boolean", Boolean.class));
-        assertEquals((Long) 123l, transferMessage.getHeader("long", Long.class));
+        assertEquals((Long) 123L, transferMessage.getHeader("long", Long.class));
         assertEquals((Double) 1.23, transferMessage.getHeader("double", Double.class));
         assertEquals("hello", transferMessage.getHeader("string", String.class));
         assertNotNull(transferExchange.getProperty("requestObjectProperty", SerializableRequestDto.class));
@@ -88,7 +88,7 @@ public class JmsInOutTransferExchangeTest extends CamelTestSupport {
         assertNotNull(resultMessage.getBody(SerializableResponseDto.class));
         assertNotNull(resultMessage.getHeader("requestObject", SerializableRequestDto.class));
         assertEquals(Boolean.TRUE, resultMessage.getHeader("boolean", Boolean.class));
-        assertEquals((Long) 123l, resultMessage.getHeader("long", Long.class));
+        assertEquals((Long) 123L, resultMessage.getHeader("long", Long.class));
         assertEquals((Double) 1.23, resultMessage.getHeader("double", Double.class));
         assertEquals("hello", resultMessage.getHeader("string", String.class));
         assertNotNull(resultMessage.getHeader("responseHeader", SerializableResponseDto.class));


[3/4] git commit: fixed CS error

Posted by cm...@apache.org.
fixed CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/064268c4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/064268c4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/064268c4

Branch: refs/heads/camel-2.10.x
Commit: 064268c43ffbc163f4181284dcda99e614ba6ada
Parents: ddf1f6a
Author: cmueller <cm...@apache.org>
Authored: Wed Jun 19 22:59:38 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Wed Jun 19 22:59:38 2013 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/language/groovy/GroovyLanguage.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/064268c4/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java
----------------------------------------------------------------------
diff --git a/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java b/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java
index 73d89a4..bcde9f0 100644
--- a/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java
+++ b/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyLanguage.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.language.groovy;
 
+import groovy.lang.Script;
+
 import org.apache.camel.IsSingleton;
 import org.apache.camel.spi.Language;
 import org.apache.camel.util.LRUSoftCache;
 
-import groovy.lang.Script;
-
 /**
  * @version
  */


[2/4] git commit: fixed an unit test issue which reports an invalid character

Posted by cm...@apache.org.
fixed an unit test issue which reports an invalid character


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddf1f6a1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddf1f6a1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddf1f6a1

Branch: refs/heads/camel-2.10.x
Commit: ddf1f6a172aa5443638d0f638aafdd2b1ca69b14
Parents: 02633e5
Author: cmueller <cm...@apache.org>
Authored: Wed Jun 19 22:47:20 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Wed Jun 19 22:47:20 2013 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/test/blueprint/DebugBlueprintTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ddf1f6a1/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
index 56a9b40..8b39378 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
@@ -70,4 +70,4 @@ public class DebugBlueprintTest extends CamelBlueprintTestSupport {
         debugAfterMethodCalled = true;
     }
 }
-// END SNIPPET: example
\ No newline at end of file
+// END SNIPPET: example