You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/07/13 12:58:07 UTC
[camel] branch master updated (0d5d68c -> 7c41be9)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 0d5d68c Convert []byte header to string (#3994)
new f93cc8b Upgrade Docker Java to version 3.2.5
new 6d50848 Camel-Docker: Fixed build after upgrading to 3.2.5
new 7c41be9 Regen
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
.../docker/it/FakeDockerCmdExecFactory.java | 28 +++++++++++++++-------
.../builder/endpoint/StaticEndpointBuilders.java | 8 +++----
parent/pom.xml | 2 +-
4 files changed, 26 insertions(+), 14 deletions(-)
[camel] 01/03: Upgrade Docker Java to version 3.2.5
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f93cc8b927ab230b69e4ee63684b33238be0b6ab
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 13 12:21:26 2020 +0200
Upgrade Docker Java to version 3.2.5
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e2b89ed..42e6d78 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -151,7 +151,7 @@
<djl-mxnet-native-version>1.7.0-a</djl-mxnet-native-version>
<djl-pytorch-native-version>1.5.0</djl-pytorch-native-version>
<djl-tensorflow-native-version>2.1.0</djl-tensorflow-native-version>
- <docker-java-version>3.2.1</docker-java-version>
+ <docker-java-version>3.2.5</docker-java-version>
<dozer-version>6.5.0</dozer-version>
<drools-version>7.39.0.Final</drools-version>
<dropbox-version>3.1.4</dropbox-version>
[camel] 03/03: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7c41be931493d60e10f0e5d60373ec1236af4b4b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 13 14:57:33 2020 +0200
Regen
---
camel-dependencies/pom.xml | 2 +-
.../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 19dff54..5025696 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -173,7 +173,7 @@
<djl-tensorflow-native-version>2.1.0</djl-tensorflow-native-version>
<djl-version>0.5.0</djl-version>
<dnsjava-version>3.1.0</dnsjava-version>
- <docker-java-version>3.2.1</docker-java-version>
+ <docker-java-version>3.2.5</docker-java-version>
<dozer-version>6.5.0</dozer-version>
<drools-version>7.39.0.Final</drools-version>
<dropbox-version>3.1.4</dropbox-version>
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 9a36502..91f1cc0 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -4515,7 +4515,7 @@ public class StaticEndpointBuilders {
*
* @param path operation
*/
- static org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.DockerEndpointBuilder docker(
+ public static org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.DockerEndpointBuilder docker(
String path) {
return org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.endpointBuilder("docker", path);
}
@@ -4544,7 +4544,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path operation
*/
- static org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.DockerEndpointBuilder docker(
+ public static org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.DockerEndpointBuilder docker(
String componentName,
String path) {
return org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.endpointBuilder(componentName, path);
@@ -15381,7 +15381,7 @@ public class StaticEndpointBuilders {
*
* @param path serverUrls/path
*/
- public static org.apache.camel.builder.endpoint.dsl.ZooKeeperEndpointBuilderFactory.ZooKeeperEndpointBuilder zookeeper(
+ static org.apache.camel.builder.endpoint.dsl.ZooKeeperEndpointBuilderFactory.ZooKeeperEndpointBuilder zookeeper(
String path) {
return org.apache.camel.builder.endpoint.dsl.ZooKeeperEndpointBuilderFactory.endpointBuilder("zookeeper", path);
}
@@ -15405,7 +15405,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path serverUrls/path
*/
- public static org.apache.camel.builder.endpoint.dsl.ZooKeeperEndpointBuilderFactory.ZooKeeperEndpointBuilder zookeeper(
+ static org.apache.camel.builder.endpoint.dsl.ZooKeeperEndpointBuilderFactory.ZooKeeperEndpointBuilder zookeeper(
String componentName,
String path) {
return org.apache.camel.builder.endpoint.dsl.ZooKeeperEndpointBuilderFactory.endpointBuilder(componentName, path);
[camel] 02/03: Camel-Docker: Fixed build after upgrading to 3.2.5
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6d508483e1dc4d8ba3c8819265b168a06e4871ff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 13 14:07:12 2020 +0200
Camel-Docker: Fixed build after upgrading to 3.2.5
---
.../docker/it/FakeDockerCmdExecFactory.java | 28 +++++++++++++++-------
.../builder/endpoint/StaticEndpointBuilders.java | 8 +++----
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
index 70e822c..04a4a65 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/FakeDockerCmdExecFactory.java
@@ -30,6 +30,7 @@ import com.github.dockerjava.api.command.CopyFileFromContainerCmd;
import com.github.dockerjava.api.command.CreateContainerCmd;
import com.github.dockerjava.api.command.CreateImageCmd;
import com.github.dockerjava.api.command.CreateNetworkCmd;
+import com.github.dockerjava.api.command.CreateSecretCmd;
import com.github.dockerjava.api.command.CreateServiceCmd;
import com.github.dockerjava.api.command.CreateVolumeCmd;
import com.github.dockerjava.api.command.DisconnectFromNetworkCmd;
@@ -53,6 +54,7 @@ import com.github.dockerjava.api.command.LeaveSwarmCmd;
import com.github.dockerjava.api.command.ListContainersCmd;
import com.github.dockerjava.api.command.ListImagesCmd;
import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.command.ListSecretsCmd;
import com.github.dockerjava.api.command.ListServicesCmd;
import com.github.dockerjava.api.command.ListSwarmNodesCmd;
import com.github.dockerjava.api.command.ListTasksCmd;
@@ -68,12 +70,16 @@ import com.github.dockerjava.api.command.PushImageCmd;
import com.github.dockerjava.api.command.RemoveContainerCmd;
import com.github.dockerjava.api.command.RemoveImageCmd;
import com.github.dockerjava.api.command.RemoveNetworkCmd;
+import com.github.dockerjava.api.command.RemoveSecretCmd;
import com.github.dockerjava.api.command.RemoveServiceCmd;
import com.github.dockerjava.api.command.RemoveSwarmNodeCmd;
import com.github.dockerjava.api.command.RemoveVolumeCmd;
import com.github.dockerjava.api.command.RenameContainerCmd;
+import com.github.dockerjava.api.command.ResizeContainerCmd;
+import com.github.dockerjava.api.command.ResizeExecCmd;
import com.github.dockerjava.api.command.RestartContainerCmd;
import com.github.dockerjava.api.command.SaveImageCmd;
+import com.github.dockerjava.api.command.SaveImagesCmd;
import com.github.dockerjava.api.command.SearchImagesCmd;
import com.github.dockerjava.api.command.StartContainerCmd;
import com.github.dockerjava.api.command.StatsCmd;
@@ -453,26 +459,32 @@ public class FakeDockerCmdExecFactory implements DockerCmdExecFactory {
}
@Override
- public com.github.dockerjava.api.command.SaveImagesCmd.Exec createSaveImagesCmdExec() {
- // TODO Auto-generated method stub
+ public SaveImagesCmd.Exec createSaveImagesCmdExec() {
return null;
}
@Override
- public com.github.dockerjava.api.command.ListSecretsCmd.Exec createListSecretsCmdExec() {
- // TODO Auto-generated method stub
+ public ListSecretsCmd.Exec createListSecretsCmdExec() {
return null;
}
@Override
- public com.github.dockerjava.api.command.CreateSecretCmd.Exec createCreateSecretCmdExec() {
- // TODO Auto-generated method stub
+ public CreateSecretCmd.Exec createCreateSecretCmdExec() {
return null;
}
@Override
- public com.github.dockerjava.api.command.RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
- // TODO Auto-generated method stub
+ public RemoveSecretCmd.Exec createRemoveSecretCmdExec() {
return null;
}
+
+ @Override
+ public ResizeContainerCmd.Exec createResizeContainerCmdExec() {
+ return null;
+ }
+
+ @Override
+ public ResizeExecCmd.Exec createResizeExecCmdExec() {
+ return null;
+ }
}
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index a8d0a80..9a36502 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -4515,7 +4515,7 @@ public class StaticEndpointBuilders {
*
* @param path operation
*/
- public static org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.DockerEndpointBuilder docker(
+ static org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.DockerEndpointBuilder docker(
String path) {
return org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.endpointBuilder("docker", path);
}
@@ -4544,7 +4544,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path operation
*/
- public static org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.DockerEndpointBuilder docker(
+ static org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.DockerEndpointBuilder docker(
String componentName,
String path) {
return org.apache.camel.builder.endpoint.dsl.DockerEndpointBuilderFactory.endpointBuilder(componentName, path);
@@ -13194,7 +13194,7 @@ public class StaticEndpointBuilders {
*
* @param path jobName
*/
- static org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory.SpringBatchEndpointBuilder springBatch(
+ public static org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory.SpringBatchEndpointBuilder springBatch(
String path) {
return org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory.endpointBuilder("spring-batch", path);
}
@@ -13215,7 +13215,7 @@ public class StaticEndpointBuilders {
* instead of the default name
* @param path jobName
*/
- static org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory.SpringBatchEndpointBuilder springBatch(
+ public static org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory.SpringBatchEndpointBuilder springBatch(
String componentName,
String path) {
return org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory.endpointBuilder(componentName, path);