This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 72060b73309833b7e02ee1de898e24fbb4670f3b Author: Andrea Cosentino <[email protected]> AuthorDate: Tue Jun 8 15:09:12 2021 +0200 CAMEL-16519 - Remove Camel-APNS --- .../camel/springboot/catalog/components.properties | 1 - .../catalog/components/google-functions.json | 2 +- components-starter/README.adoc | 6 +-- docs/modules/ROOT/pages/list.adoc | 6 +-- docs/modules/ROOT/pages/spring-boot.adoc | 2 +- .../camel/itest/springboot/CamelApnsTest.java | 49 ---------------------- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 7 files changed, 9 insertions(+), 59 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties index 52a7407..211f423 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties @@ -3,7 +3,6 @@ ahc ahc-ws ahc-wss amqp -apns arangodb as2 asterisk diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json index 90fbb7a..0975885 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-functions.json @@ -2,7 +2,7 @@ "component": { "kind": "component", "name": "google-functions", - "title": "GoogleCloudFunctions", + "title": "Google Cloud Functions", "description": "Manage and invoke Google Cloud Functions", "deprecated": false, "firstVersion": "3.9.0", diff --git a/components-starter/README.adoc b/components-starter/README.adoc index 1984a1e..b4f6cde 100644 --- a/components-starter/README.adoc +++ b/components-starter/README.adoc @@ -5,7 +5,7 @@ Apache Camel Spring Boot supports the following Camel artifacts as Spring Boot S == Camel Components // components: START -Number of Camel components: 332 in 268 JAR artifacts (1 deprecated) +Number of Camel components: 331 in 267 JAR artifacts (0 deprecated) [width="100%",cols="4,3,3,3,6",options="header"] |=== @@ -237,6 +237,8 @@ Number of Camel components: 332 in 268 JAR artifacts (1 deprecated) | xref:latest@components::google-calendar-stream-component.adoc[Google Calendar Stream] | camel-google-calendar-starter | Stable | 2.23 | Poll for changes in a Google Calendar. +| xref:latest@components::google-functions-component.adoc[Google Cloud Functions] | camel-google-functions-starter | Stable | 3.9 | Manage and invoke Google Cloud Functions + | xref:latest@components::google-drive-component.adoc[Google Drive] | camel-google-drive-starter | Stable | 2.14 | Manage files in Google Drive. | xref:latest@components::google-mail-component.adoc[Google Mail] | camel-google-mail-starter | Stable | 2.15 | Manage messages in Google Mail. @@ -251,8 +253,6 @@ Number of Camel components: 332 in 268 JAR artifacts (1 deprecated) | xref:latest@components::google-storage-component.adoc[Google Storage] | camel-google-storage-starter | Stable | 3.9 | Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library. -| xref:latest@components::google-functions-component.adoc[GoogleCloudFunctions] | camel-google-functions-starter | Stable | 3.9 | Manage and invoke Google Cloud Functions - | xref:latest@components::gora-component.adoc[Gora] | camel-gora-starter | Stable | 2.14 | Access NoSQL databases using the Apache Gora framework. | xref:latest@components::grape-component.adoc[Grape] | camel-grape-starter | Stable | 2.16 | Fetch, load and manage additional jars dynamically after Camel Context was started. diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc index 1984a1e..b4f6cde 100644 --- a/docs/modules/ROOT/pages/list.adoc +++ b/docs/modules/ROOT/pages/list.adoc @@ -5,7 +5,7 @@ Apache Camel Spring Boot supports the following Camel artifacts as Spring Boot S == Camel Components // components: START -Number of Camel components: 332 in 268 JAR artifacts (1 deprecated) +Number of Camel components: 331 in 267 JAR artifacts (0 deprecated) [width="100%",cols="4,3,3,3,6",options="header"] |=== @@ -237,6 +237,8 @@ Number of Camel components: 332 in 268 JAR artifacts (1 deprecated) | xref:latest@components::google-calendar-stream-component.adoc[Google Calendar Stream] | camel-google-calendar-starter | Stable | 2.23 | Poll for changes in a Google Calendar. +| xref:latest@components::google-functions-component.adoc[Google Cloud Functions] | camel-google-functions-starter | Stable | 3.9 | Manage and invoke Google Cloud Functions + | xref:latest@components::google-drive-component.adoc[Google Drive] | camel-google-drive-starter | Stable | 2.14 | Manage files in Google Drive. | xref:latest@components::google-mail-component.adoc[Google Mail] | camel-google-mail-starter | Stable | 2.15 | Manage messages in Google Mail. @@ -251,8 +253,6 @@ Number of Camel components: 332 in 268 JAR artifacts (1 deprecated) | xref:latest@components::google-storage-component.adoc[Google Storage] | camel-google-storage-starter | Stable | 3.9 | Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library. -| xref:latest@components::google-functions-component.adoc[GoogleCloudFunctions] | camel-google-functions-starter | Stable | 3.9 | Manage and invoke Google Cloud Functions - | xref:latest@components::gora-component.adoc[Gora] | camel-gora-starter | Stable | 2.14 | Access NoSQL databases using the Apache Gora framework. | xref:latest@components::grape-component.adoc[Grape] | camel-grape-starter | Stable | 2.16 | Fetch, load and manage additional jars dynamically after Camel Context was started. diff --git a/docs/modules/ROOT/pages/spring-boot.adoc b/docs/modules/ROOT/pages/spring-boot.adoc index e549df8..e25b761 100644 --- a/docs/modules/ROOT/pages/spring-boot.adoc +++ b/docs/modules/ROOT/pages/spring-boot.adoc @@ -201,7 +201,7 @@ The component supports 172 options, which are listed below. | *camel.springboot.route-filter-include-pattern* | Used for filtering routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression. For example to only include routes which starts with foo in their route id's, use: include=foo* And to exclude routes which starts from JMS endpoints, use: exclude=jms:* Multiple patterns can be separated by comma, f [...] | *camel.springboot.routes-collector-enabled* | Whether the routes collector is enabled or not. When enabled Camel will auto-discover routes (RouteBuilder instances from the registry and also load additional routes from the file system). The routes collector is default enabled. | true | Boolean | *camel.springboot.routes-exclude-pattern* | Used for exclusive filtering of routes from directories. The exclusive filtering takes precedence over inclusive filtering. The pattern is using Ant-path style pattern. Multiple patterns can be specified separated by comma, as example, to exclude all the routes from a directory whose name contains foo use: **/*foo*. | | String -| *camel.springboot.routes-include-pattern* | Used for inclusive filtering of routes from directories. The exclusive filtering takes precedence over inclusive filtering. The pattern is using Ant-path style pattern. Multiple patterns can be specified separated by comma, as example, to include all the routes from a directory whose name contains foo use: **/*foo*. | classpath:camel/*.xml,classpath:camel-template/*.xml,classpath:camel-rest/*.xml | String +| *camel.springboot.routes-include-pattern* | Used for inclusive filtering of routes from directories. The exclusive filtering takes precedence over inclusive filtering. The pattern is using Ant-path style pattern. Multiple patterns can be specified separated by comma, as example, to include all the routes from a directory whose name contains foo use: **/*foo*. | classpath:camel/*,classpath:camel-template/*,classpath:camel-rest/* | String | *camel.springboot.shutdown-log-inflight-exchanges-on-timeout* | Sets whether to log information about the inflight Exchanges which are still running during a shutdown which didn't complete without the given timeout. This requires to enable the option inflightRepositoryExchangeEnabled. | true | Boolean | *camel.springboot.shutdown-now-on-timeout* | Sets whether to force shutdown of all consumers when a timeout occurred and thus not all consumers was shutdown within that period. You should have good reasons to set this option to false as it means that the routes keep running and is halted abruptly when CamelContext has been shutdown. | true | Boolean | *camel.springboot.shutdown-routes-in-reverse-order* | Sets whether routes should be shutdown in reverse or the same order as they where started. | true | Boolean diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelApnsTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelApnsTest.java deleted file mode 100644 index 42e2081..0000000 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelApnsTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.itest.springboot; - -import org.apache.camel.itest.springboot.util.ArquillianPackager; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - - -@RunWith(Arquillian.class) -public class CamelApnsTest extends AbstractSpringBootTestSupport { - - @Deployment - public static Archive<?> createSpringBootPackage() throws Exception { - return ArquillianPackager.springBootPackage(createTestConfig()); - } - - public static ITestConfig createTestConfig() { - return new ITestConfigBuilder() - .module(inferModuleName(CamelApnsTest.class)) - .resource("components/apns-clientStore.p12", "clientStore.p12") - .resource("components/apns-serverStore.p12", "serverStore.p12") - .build(); - } - - @Test - public void componentTests() throws Exception { - this.runComponentTest(config); - this.runModuleUnitTestsIfEnabled(config); - } - -} diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 6eeaede..455d860 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -294,7 +294,7 @@ <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.4.16</version> + <version>1.4.17</version> </dependency> <dependency> <groupId>commons-io</groupId>
