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 2018/12/17 14:23:38 UTC
[camel] branch sandbox/camel-3.x updated (3ca643b -> 38c608f)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 3ca643b Fixed CS
new b5e846f Upgrade Kubernetes Client to version 4.1.1
new d47eb6d Upgrade Kubernetes Model to version 4.1.1
new a6761a3 Camel-Kubernetes: Fixed tests after upgrading to version 4.1.1
new 13676dc Remove duplicate code
new e587160 Upgrade Json Schema Validator to version 0.1.25
new 187a14e CAMEL-12994: Added unit tests
new 4488130 CAMEL-12994: Fixed issue in camel-saxon to skip reservered namespace prefix according to the XQuery spec.
new fca8c43 CAMEL-13010: Deprecate camel-script
new 38c608f Regen
The 9 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:
.../org/apache/camel/builder/ExpressionClause.java | 2 ++
.../camel/builder/ExpressionClauseSupport.java | 2 ++
.../camel/model/language/JavaScriptExpression.java | 6 ++++-
.../src/main/docs/jetty-component.adoc | 2 +-
.../component/jetty9/JettyHttpComponent9.java | 3 +--
.../producer/KubernetesHPAProducerTest.java | 10 ++++----
.../camel/component/xquery/XQueryBuilder.java | 9 +++++--
.../saxon/SpringXQueryTransformIssueTest.java} | 30 ++++++++++------------
.../builder/saxon/XQueryTransformIssueTest.java | 20 ++++++++++-----
.../camel-saxon/src/test/resources/myinput.xml | 9 ++++++-
.../saxon/SpringXQueryTransformIssueTest.xml} | 7 +++--
components/camel-script/pom.xml | 2 +-
.../src/main/docs/javaScript-language.adoc | 7 +++--
components/readme.adoc | 4 +--
docs/components/modules/ROOT/nav.adoc | 4 +--
parent/pom.xml | 6 ++---
16 files changed, 74 insertions(+), 49 deletions(-)
copy components/{camel-test-spring/src/test/java/org/apache/camel/test/issues/MockEndpointsAndSkipTest.java => camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java} (70%)
copy connectors/examples/beverage-component/src/test/java/org/beverage/BeverageTest.java => components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java (66%)
copy camel-core/src/test/data/bar.xml => components/camel-saxon/src/test/resources/myinput.xml (88%)
copy components/{camel-spring/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml => camel-saxon/src/test/resources/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.xml} (89%)
[camel] 01/09: Upgrade Kubernetes Client to version 4.1.1
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b5e846f5ba67bcfa6cb7c0f93d1c862127a1365e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 17 11:17:43 2018 +0100
Upgrade Kubernetes Client to version 4.1.1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1d80699..d174914 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -449,7 +449,7 @@
<karaf4-version>4.2.1</karaf4-version>
<kie-version>7.14.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
- <kubernetes-client-version>4.1.0</kubernetes-client-version>
+ <kubernetes-client-version>4.1.1</kubernetes-client-version>
<kubernetes-model-version>4.1.0</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
[camel] 07/09: CAMEL-12994: Fixed issue in camel-saxon to skip
reservered namespace prefix according to the XQuery spec.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4488130d7ff47d53f3872aa9b6d22379f86a6522
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 17 13:39:33 2018 +0100
CAMEL-12994: Fixed issue in camel-saxon to skip reservered namespace prefix according to the XQuery spec.
---
.../java/org/apache/camel/component/xquery/XQueryBuilder.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
index 6c3bac9..055aeef 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
@@ -720,8 +720,13 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
for (Map.Entry<String, String> entry : entries) {
String prefix = entry.getKey();
String uri = entry.getValue();
- staticQueryContext.declareNamespace(prefix, uri);
- staticQueryContext.setInheritNamespaces(true);
+ // skip invalid prefix or uri according to XQuery spec
+ boolean invalid = "xml".equals(prefix) || "xmlns".equals(prefix);
+ if (!invalid) {
+ LOG.debug("Declaring namespace [prefix: {}, uri: {}]", prefix, uri);
+ staticQueryContext.declareNamespace(prefix, uri);
+ staticQueryContext.setInheritNamespaces(true);
+ }
}
expression = createQueryExpression(staticQueryContext);
[camel] 09/09: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 38c608fc2ab0449801b23e7eb5f0431d3a938f77
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 17 15:23:05 2018 +0100
Regen
---
components/camel-jetty9/src/main/docs/jetty-component.adoc | 2 +-
components/camel-script/src/main/docs/javaScript-language.adoc | 4 +++-
components/readme.adoc | 2 +-
docs/components/modules/ROOT/nav.adoc | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc
index 5e993f2..8530b17 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -218,7 +218,7 @@ The component supports 34 options, which are listed below.
| *camel.component.jetty.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
| *camel.component.jetty.response-buffer-size* | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer
| *camel.component.jetty.response-header-size* | Allows to configure a custom value of the response header size on the Jetty connectors. | | Integer
-| *camel.component.jetty.send-server-version* | If the option is true, jetty server will send the date header to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected. | true | Boolean
+| *camel.component.jetty.send-server-version* | If the option is true, jetty will send the server header with the jetty version information to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected. | true | Boolean
| *camel.component.jetty.socket-connector-properties* | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. The option is a java.util.Map<java.lang.String,java.lang.Object> type. | | String
| *camel.component.jetty.socket-connectors* | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. The option is a java.util.Map<java.lang.Integer,org.eclipse.jetty.server.Connector> type. | | String
| *camel.component.jetty.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String
diff --git a/components/camel-script/src/main/docs/javaScript-language.adoc b/components/camel-script/src/main/docs/javaScript-language.adoc
index fbf90f6..4192638 100644
--- a/components/camel-script/src/main/docs/javaScript-language.adoc
+++ b/components/camel-script/src/main/docs/javaScript-language.adoc
@@ -1,6 +1,8 @@
+[[javaScript-language]]
== JavaScript Language (deprecated)
*Available as of Camel version 1.0*
+
*Available as of Camel version 1.0*
@@ -195,4 +197,4 @@ the download page for the latest versions).
<artifactId>camel-script</artifactId>
<version>x.x.x</version>
</dependency>
----------------------------------------
+---------------------------------------
\ No newline at end of file
diff --git a/components/readme.adoc b/components/readme.adoc
index 8b48140..ba56c00 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -986,7 +986,7 @@ Expression Languages
^^^^^^^^^^^^^^^^^^^^
// languages: START
-Number of Languages: 18 in 9 JAR artifacts (0 deprecated)
+Number of Languages: 18 in 9 JAR artifacts (1 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 5004391..bc0fb29 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -36,8 +36,8 @@
* xref:azure-blob-component.adoc[Azure Storage Blob Service Component]
* xref:azure-queue-component.adoc[Azure Storage Queue Service Component]
* xref:azure.adoc[Camel Components for Windows Azure Services]
-* xref:barcode-dataformat.adoc[Barcode DataFormat]
* xref:base64-dataformat.adoc[Base64 DataFormat]
+* xref:barcode-dataformat.adoc[Barcode DataFormat]
* xref:bean-validator-component.adoc[Bean Validator Component]
* xref:beanio-dataformat.adoc[BeanIO DataFormat]
* xref:beanstalk-component.adoc[Beanstalk Component]
@@ -253,7 +253,7 @@
* xref:xquery-component.adoc[XQuery Component]
* xref:xquery-language.adoc[XQuery Language]
* xref:schematron-component.adoc[Schematron Component]
-* xref:javaScript-language.adoc[JavaScript Language]
+* xref:javaScript-language.adoc[JavaScript Language (deprecated)]
* xref:php-language.adoc[PHP Language (deprecated)]
* xref:python-language.adoc[Python Language (deprecated)]
* xref:ruby-language.adoc[Ruby Language (deprecated)]
[camel] 06/09: CAMEL-12994: Added unit tests
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 187a14ed61ee04087e59a424894b41870e3a273e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 17 13:27:03 2018 +0100
CAMEL-12994: Added unit tests
---
.../saxon/SpringXQueryTransformIssueTest.java | 44 ++++++++++++++++++
.../builder/saxon/XQueryTransformIssueTest.java | 52 ++++++++++++++++++++++
.../camel-saxon/src/test/resources/myinput.xml | 27 +++++++++++
.../saxon/SpringXQueryTransformIssueTest.xml | 38 ++++++++++++++++
4 files changed, 161 insertions(+)
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java
new file mode 100644
index 0000000..4389ff9
--- /dev/null
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder.saxon;
+
+import java.io.FileInputStream;
+
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class SpringXQueryTransformIssueTest extends CamelSpringTestSupport {
+
+ @Test
+ public void testTransform() throws Exception {
+ String data = IOHelper.loadText(new FileInputStream("src/test/resources/myinput.xml"));
+
+ getMockEndpoint("mock:result").expectedBodiesReceived("123TestConcat");
+
+ template.sendBody("direct:start", data);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.xml");
+ }
+}
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java
new file mode 100644
index 0000000..e6a883e
--- /dev/null
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder.saxon;
+
+import java.io.FileInputStream;
+
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.junit.Test;
+
+public class XQueryTransformIssueTest extends CamelTestSupport {
+
+ @Test
+ public void testTransform() throws Exception {
+ String data = IOHelper.loadText(new FileInputStream("src/test/resources/myinput.xml"));
+
+ getMockEndpoint("mock:result").expectedBodiesReceived("123TestConcat");
+
+ template.sendBody("direct:start", data);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RoutesBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .transform().xquery("concat(/Envelope/Body/getEmployee/EmpId/text(),\"TestConcat\")", String.class)
+ .to("log:info")
+ .to("mock:result");
+ }
+ };
+ }
+}
diff --git a/components/camel-saxon/src/test/resources/myinput.xml b/components/camel-saxon/src/test/resources/myinput.xml
new file mode 100644
index 0000000..d7ca32e
--- /dev/null
+++ b/components/camel-saxon/src/test/resources/myinput.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<Envelope>
+ <Header/>
+ <Body>
+ <getEmployee>
+ <EmpId>123</EmpId>
+ </getEmployee>
+ </Body>
+</Envelope>
\ No newline at end of file
diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.xml b/components/camel-saxon/src/test/resources/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.xml
new file mode 100644
index 0000000..ce68485
--- /dev/null
+++ b/components/camel-saxon/src/test/resources/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:start"/>
+ <transform>
+ <xquery type="String">concat(/Envelope/Body/getEmployee/EmpId/text(),"TestConcat")</xquery>
+ </transform>
+ <to uri="log:info"/>
+ <to uri="mock:result"/>
+ </route>
+ </camelContext>
+
+</beans>
[camel] 04/09: Remove duplicate code
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 13676dc3f74da0be8179aebf5a131afeeef56f32
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 17 12:06:32 2018 +0100
Remove duplicate code
---
.../java/org/apache/camel/component/jetty9/JettyHttpComponent9.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
index 0b4141f..0e6ada2 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
@@ -60,8 +60,7 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
org.eclipse.jetty.server.HttpConfiguration httpConfig = new org.eclipse.jetty.server.HttpConfiguration();
httpConfig.setSendServerVersion(endpoint.isSendServerVersion());
httpConfig.setSendDateHeader(endpoint.isSendDateHeader());
- httpConfig.setSendDateHeader(endpoint.isSendDateHeader());
-
+
if (requestBufferSize != null) {
// Does not work
//httpConfig.setRequestBufferSize(requestBufferSize);
[camel] 05/09: Upgrade Json Schema Validator to version 0.1.25
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e587160de8b3f691fdae2b32f16404613b774d3d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 17 12:35:31 2018 +0100
Upgrade Json Schema Validator to version 0.1.25
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 04a6a35..6aba0dc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -527,7 +527,7 @@
<netty3-version>3.10.6.Final</netty3-version>
<netty-version>4.1.32.Final</netty-version>
<netty40-version>4.0.56.Final</netty40-version>
- <networknt-json-schema-validator-version>0.1.24</networknt-json-schema-validator-version>
+ <networknt-json-schema-validator-version>0.1.25</networknt-json-schema-validator-version>
<noggit-bundle-version>0.5_1</noggit-bundle-version>
<objenesis-version>2.6</objenesis-version>
<!-- should be in-sync with deltaspike -->
[camel] 03/09: Camel-Kubernetes: Fixed tests after upgrading to
version 4.1.1
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a6761a3f9449878ef1ae403c13dd90894facb61d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 17 11:49:57 2018 +0100
Camel-Kubernetes: Fixed tests after upgrading to version 4.1.1
---
.../kubernetes/producer/KubernetesHPAProducerTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
index 2c30b6d..181562f 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java
@@ -49,7 +49,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@Test
public void listTest() throws Exception {
- server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers")
+ server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers")
.andReturn(200, new HorizontalPodAutoscalerListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
List<HorizontalPodAutoscaler> result = template.requestBody("direct:list", "", List.class);
@@ -58,7 +58,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@Test
public void listByLabelsTest() throws Exception {
- server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
+ server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers?labelSelector=" + toUrlEncoded("key1=value1,key2=value2"))
.andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
Exchange ex = template.request("direct:listByLabels", new Processor() {
@@ -81,8 +81,8 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
HorizontalPodAutoscaler hpa1 = new HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1").withNamespace("test").and().build();
HorizontalPodAutoscaler hpa2 = new HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa2").withNamespace("ns1").and().build();
- server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
- server.expect().withPath("/apis/autoscaling/v1/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200, hpa2).once();
+ server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
+ server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/ns1/horizontalpodautoscalers/hpa2").andReturn(200, hpa2).once();
Exchange ex = template.request("direct:getHPA", new Processor() {
@Override
@@ -100,7 +100,7 @@ public class KubernetesHPAProducerTest extends KubernetesTestSupport {
@Test
public void deleteHPATest() throws Exception {
HorizontalPodAutoscaler hpa1 = new HorizontalPodAutoscalerBuilder().withNewMetadata().withName("hpa1").withNamespace("test").and().build();
- server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
+ server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers/hpa1").andReturn(200, hpa1).once();
Exchange ex = template.request("direct:deleteHPA", new Processor() {
[camel] 08/09: CAMEL-13010: Deprecate camel-script
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fca8c431db6dd8b180bdef5783b79da53ad66a6e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 17 12:35:45 2018 +0100
CAMEL-13010: Deprecate camel-script
Conflicts:
camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
components/readme.adoc
---
.../src/main/java/org/apache/camel/builder/ExpressionClause.java | 2 ++
.../main/java/org/apache/camel/builder/ExpressionClauseSupport.java | 2 ++
.../java/org/apache/camel/model/language/JavaScriptExpression.java | 6 +++++-
components/camel-script/pom.xml | 2 +-
components/camel-script/src/main/docs/javaScript-language.adoc | 5 +++--
components/readme.adoc | 2 +-
6 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index ae81c7b..705caba 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -420,7 +420,9 @@ public class ExpressionClause<T> extends ExpressionDefinition {
*
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
+ * @deprecated JavaScript is deprecated in Java 11 onwards
*/
+ @Deprecated
public T javaScript(String text) {
return delegate.javaScript(text);
}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index f972764..cc6a502 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -292,7 +292,9 @@ public class ExpressionClauseSupport<T> {
*
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
+ * @deprecated JavaScript is deprecated in Java 11 onwards
*/
+ @Deprecated
public T javaScript(String text) {
return expression(new JavaScriptExpression(text));
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
index a29b172..e048c08 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
@@ -24,10 +24,14 @@ import org.apache.camel.spi.Metadata;
/**
* To use JavaScript in Camel expressions or predicates.
+ *
+ * @deprecated JavaScript is deprecated in Java 11 onwards
*/
-@Metadata(firstVersion = "1.0.0", label = "language,script", title = "JavaScript")
+@Metadata(firstVersion = "1.0.0", label = "language,script", title = "JavaScript",
+ deprecationNode = "JavaScript is deprecated in Java 11 onwards")
@XmlRootElement(name = "javaScript")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class JavaScriptExpression extends ExpressionDefinition {
public JavaScriptExpression() {
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index 648b966..c5de32d 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-script</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Script</name>
+ <name>Camel :: Script (deprecated)</name>
<description>Camel Script support</description>
<properties>
diff --git a/components/camel-script/src/main/docs/javaScript-language.adoc b/components/camel-script/src/main/docs/javaScript-language.adoc
index a554867..fbf90f6 100644
--- a/components/camel-script/src/main/docs/javaScript-language.adoc
+++ b/components/camel-script/src/main/docs/javaScript-language.adoc
@@ -1,7 +1,8 @@
-[[javaScript-language]]
-== JavaScript Language
+== JavaScript Language (deprecated)
*Available as of Camel version 1.0*
+*Available as of Camel version 1.0*
+
Camel supports
http://en.wikipedia.org/wiki/JavaScript[JavaScript/ECMAScript] among
diff --git a/components/readme.adoc b/components/readme.adoc
index 2c4e883..8b48140 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1006,7 +1006,7 @@ Number of Languages: 18 in 9 JAR artifacts (0 deprecated)
| link:camel-hl7/src/main/docs/terser-language.adoc[HL7 Terser] (camel-hl7) | 2.11 | To use HL7 terser scripts in Camel expressions or predicates.
-| link:camel-script/src/main/docs/javaScript-language.adoc[JavaScript] (camel-script) | 1.0 | To use JavaScript in Camel expressions or predicates.
+| link:camel-script/src/main/docs/javaScript-language.adoc[JavaScript] (camel-script) | 1.0 | *deprecated* To use JavaScript in Camel expressions or predicates.
| link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JsonPath] (camel-jsonpath) | 2.13 | To use JsonPath in Camel expressions or predicates.
[camel] 02/09: Upgrade Kubernetes Model to version 4.1.1
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d47eb6dc950be348dfddc83e74d112799f2dabf3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Dec 17 11:18:00 2018 +0100
Upgrade Kubernetes Model to version 4.1.1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d174914..04a6a35 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -450,7 +450,7 @@
<kie-version>7.14.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kubernetes-client-version>4.1.1</kubernetes-client-version>
- <kubernetes-model-version>4.1.0</kubernetes-model-version>
+ <kubernetes-model-version>4.1.1</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.10</leveldb-api-version>