You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/08/20 08:56:31 UTC
[1/3] camel git commit: reverting back to https
Repository: camel
Updated Branches:
refs/heads/master 58eb04a5c -> 1d73cbce7
reverting back to https
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d73cbce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d73cbce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d73cbce
Branch: refs/heads/master
Commit: 1d73cbce7a20863019e10037012e172a406fd880
Parents: c18f66c
Author: John Moon <jo...@transamerica.com>
Authored: Fri Aug 19 12:48:41 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Aug 20 10:21:28 2016 +0200
----------------------------------------------------------------------
examples/camel-example-swagger-xml/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1d73cbce/examples/camel-example-swagger-xml/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-swagger-xml/pom.xml b/examples/camel-example-swagger-xml/pom.xml
index 9e31761..999e5ac 100755
--- a/examples/camel-example-swagger-xml/pom.xml
+++ b/examples/camel-example-swagger-xml/pom.xml
@@ -34,7 +34,7 @@
<properties>
<swagger-ui.version>2.1.5</swagger-ui.version>
<logback-version>1.1.7</logback-version>
- <swagger.url>http://github.com/swagger-api/swagger-ui/archive</swagger.url>
+ <swagger.url>https://github.com/swagger-api/swagger-ui/archive</swagger.url>
<destDir>target/swagger-ui</destDir>
</properties>
[2/3] camel git commit: fixes for windows buid and maven proxy
Posted by da...@apache.org.
fixes for windows buid and maven proxy
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c18f66c0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c18f66c0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c18f66c0
Branch: refs/heads/master
Commit: c18f66c0b012abf8e7266f6f58a5fd4380668f36
Parents: 919a5ea
Author: John Moon <jo...@transamerica.com>
Authored: Fri Aug 19 12:24:53 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Aug 20 10:21:28 2016 +0200
----------------------------------------------------------------------
.../camel-olingo2/camel-olingo2-component/pom.xml | 14 +++++++++++++-
examples/camel-example-swagger-xml/pom.xml | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c18f66c0/components/camel-olingo2/camel-olingo2-component/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index f63fe33..0d14b50 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -38,6 +38,7 @@
<camel.osgi.export.pkg>${componentPackage}</camel.osgi.export.pkg>
<camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
+ <maven.exe.file.extension></maven.exe.file.extension>
</properties>
<dependencies>
@@ -277,6 +278,17 @@
<profiles>
<profile>
+ <id>Windows</id>
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ </activation>
+ <properties>
+ <maven.exe.file.extension>.cmd</maven.exe.file.extension>
+ </properties>
+ </profile>
+ <profile>
<!-- REVISIT as of now, the olingo odata2 sample service that is used in the tests
is not available in nexus and needs to be generated and built using its architype plugin.
If the sample service jar becomes available, we can use it directly -->
@@ -310,7 +322,7 @@
</execution>
</executions>
<configuration>
- <executable>mvn</executable>
+ <executable>mvn${maven.exe.file.extension}</executable>
<workingDirectory>${basedir}/target</workingDirectory>
<arguments>
<argument>archetype:generate</argument>
http://git-wip-us.apache.org/repos/asf/camel/blob/c18f66c0/examples/camel-example-swagger-xml/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-swagger-xml/pom.xml b/examples/camel-example-swagger-xml/pom.xml
index 999e5ac..9e31761 100755
--- a/examples/camel-example-swagger-xml/pom.xml
+++ b/examples/camel-example-swagger-xml/pom.xml
@@ -34,7 +34,7 @@
<properties>
<swagger-ui.version>2.1.5</swagger-ui.version>
<logback-version>1.1.7</logback-version>
- <swagger.url>https://github.com/swagger-api/swagger-ui/archive</swagger.url>
+ <swagger.url>http://github.com/swagger-api/swagger-ui/archive</swagger.url>
<destDir>target/swagger-ui</destDir>
</properties>
[3/3] camel git commit: socket write should be thread safe
Posted by da...@apache.org.
socket write should be thread safe
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/919a5eac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/919a5eac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/919a5eac
Branch: refs/heads/master
Commit: 919a5eac89205e635b3faf135d0217b1bfa261ad
Parents: 58eb04a
Author: Preben Asmussen <pr...@gmail.com>
Authored: Fri Aug 19 19:41:19 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Aug 20 10:21:28 2016 +0200
----------------------------------------------------------------------
.../apache/camel/component/splunk/support/SplunkDataWriter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/919a5eac/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java
----------------------------------------------------------------------
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java
index ee1a349..5650460 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/SplunkDataWriter.java
@@ -21,6 +21,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.Socket;
+import java.nio.charset.StandardCharsets;
import com.splunk.Args;
import com.splunk.Service;
@@ -53,10 +54,10 @@ public abstract class SplunkDataWriter implements DataWriter {
doWrite(event + SplunkEvent.LINEBREAK);
}
- protected void doWrite(String event) throws IOException {
+ protected synchronized void doWrite(String event) throws IOException {
LOG.debug("writing event to splunk:" + event);
OutputStream ostream = socket.getOutputStream();
- Writer writer = new OutputStreamWriter(ostream, "UTF-8");
+ Writer writer = new OutputStreamWriter(ostream, StandardCharsets.UTF_8);
writer.write(event);
writer.flush();
}