This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new deaa973 Simplify component configuration for box, fhir & google itests
deaa973 is described below
commit deaa973d92f8dda6717c22f72d820a8804cff3c8
Author: James Netherton <[email protected]>
AuthorDate: Thu Aug 6 11:03:56 2020 +0100
Simplify component configuration for box, fhir & google itests
---
.../box/src/main/resources/application.properties | 11 ++++----
.../fhir/src/main/resources/application.properties | 7 ++---
integration-tests/google/pom.xml | 4 +++
.../src/main/resources/application.properties | 32 +++++++++++-----------
4 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/integration-tests/box/src/main/resources/application.properties
b/integration-tests/box/src/main/resources/application.properties
index 7cb8b39..d8da800 100644
--- a/integration-tests/box/src/main/resources/application.properties
+++ b/integration-tests/box/src/main/resources/application.properties
@@ -23,9 +23,8 @@
## Authentication properties for Box Component using STANDARD_AUTHENTICATION
#############################################################################
-camel.component.box.configuration =
#class:org.apache.camel.component.box.BoxConfiguration
-camel.component.box.configuration.authenticationType = STANDARD_AUTHENTICATION
-camel.component.box.configuration.userName = {{env:BOX_USER_NAME}}
-camel.component.box.configuration.userPassword = {{env:BOX_USER_PASSWORD}}
-camel.component.box.configuration.clientId = {{env:BOX_CLIENT_ID}}
-camel.component.box.configuration.clientSecret = {{env:BOX_CLIENT_SECRET}}
+camel.component.box.authenticationType = STANDARD_AUTHENTICATION
+camel.component.box.userName = {{env:BOX_USER_NAME}}
+camel.component.box.userPassword = {{env:BOX_USER_PASSWORD}}
+camel.component.box.clientId = {{env:BOX_CLIENT_ID}}
+camel.component.box.clientSecret = {{env:BOX_CLIENT_SECRET}}
diff --git a/integration-tests/fhir/src/main/resources/application.properties
b/integration-tests/fhir/src/main/resources/application.properties
index 6e39edb..bb884e0 100644
--- a/integration-tests/fhir/src/main/resources/application.properties
+++ b/integration-tests/fhir/src/main/resources/application.properties
@@ -34,7 +34,6 @@ quarkus.camel.fhir.enable-r5=false
#
# Camel :: FHIR
#
-camel.component.fhir.configuration =
#class:org.apache.camel.component.fhir.FhirConfiguration
-camel.component.fhir.configuration.log = false
-camel.component.fhir.configuration.server-url = {{camel.fhir.test-url}}
-camel.component.fhir.configuration.fhir-context = #bean:DSTU3
+camel.component.fhir.log = false
+camel.component.fhir.server-url = {{camel.fhir.test-url}}
+camel.component.fhir.fhir-context = #bean:DSTU3
diff --git a/integration-tests/google/pom.xml b/integration-tests/google/pom.xml
index 92af900..d401b60 100644
--- a/integration-tests/google/pom.xml
+++ b/integration-tests/google/pom.xml
@@ -42,6 +42,10 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-google-calendar</artifactId>
</dependency>
<dependency>
diff --git a/integration-tests/google/src/main/resources/application.properties
b/integration-tests/google/src/main/resources/application.properties
index eeaf467..a1d8b89 100644
--- a/integration-tests/google/src/main/resources/application.properties
+++ b/integration-tests/google/src/main/resources/application.properties
@@ -16,25 +16,25 @@
## ---------------------------------------------------------------------------
# Camel Google Calendar
-camel.component.google-calendar.configuration.application-name={{env:GOOGLE_API_APPLICATION_NAME}}
-camel.component.google-calendar.configuration.client-id={{env:GOOGLE_API_CLIENT_ID}}
-camel.component.google-calendar.configuration.client-secret={{env:GOOGLE_API_CLIENT_SECRET}}
-camel.component.google-calendar.configuration.refresh-token={{env:GOOGLE_API_REFRESH_TOKEN}}
+camel.component.google-calendar.application-name={{env:GOOGLE_API_APPLICATION_NAME}}
+camel.component.google-calendar.client-id={{env:GOOGLE_API_CLIENT_ID}}
+camel.component.google-calendar.client-secret={{env:GOOGLE_API_CLIENT_SECRET}}
+camel.component.google-calendar.refresh-token={{env:GOOGLE_API_REFRESH_TOKEN}}
# Camel Google Mail
-camel.component.google-mail.configuration.application-name={{env:GOOGLE_API_APPLICATION_NAME}}
-camel.component.google-mail.configuration.client-id={{env:GOOGLE_API_CLIENT_ID}}
-camel.component.google-mail.configuration.client-secret={{env:GOOGLE_API_CLIENT_SECRET}}
-camel.component.google-mail.configuration.refresh-token={{env:GOOGLE_API_REFRESH_TOKEN}}
+camel.component.google-mail.application-name={{env:GOOGLE_API_APPLICATION_NAME}}
+camel.component.google-mail.client-id={{env:GOOGLE_API_CLIENT_ID}}
+camel.component.google-mail.client-secret={{env:GOOGLE_API_CLIENT_SECRET}}
+camel.component.google-mail.refresh-token={{env:GOOGLE_API_REFRESH_TOKEN}}
# Camel Google Drive
-camel.component.google-drive.configuration.application-name={{env:GOOGLE_API_APPLICATION_NAME}}
-camel.component.google-drive.configuration.client-id={{env:GOOGLE_API_CLIENT_ID}}
-camel.component.google-drive.configuration.client-secret={{env:GOOGLE_API_CLIENT_SECRET}}
-camel.component.google-drive.configuration.refresh-token={{env:GOOGLE_API_REFRESH_TOKEN}}
+camel.component.google-drive.application-name={{env:GOOGLE_API_APPLICATION_NAME}}
+camel.component.google-drive.client-id={{env:GOOGLE_API_CLIENT_ID}}
+camel.component.google-drive.client-secret={{env:GOOGLE_API_CLIENT_SECRET}}
+camel.component.google-drive.refresh-token={{env:GOOGLE_API_REFRESH_TOKEN}}
# Camel Google Sheets
-camel.component.google-sheets.configuration.application-name={{env:GOOGLE_API_APPLICATION_NAME}}
-camel.component.google-sheets.configuration.client-id={{env:GOOGLE_API_CLIENT_ID}}
-camel.component.google-sheets.configuration.client-secret={{env:GOOGLE_API_CLIENT_SECRET}}
-camel.component.google-sheets.configuration.refresh-token={{env:GOOGLE_API_REFRESH_TOKEN}}
+camel.component.google-sheets.application-name={{env:GOOGLE_API_APPLICATION_NAME}}
+camel.component.google-sheets.client-id={{env:GOOGLE_API_CLIENT_ID}}
+camel.component.google-sheets.client-secret={{env:GOOGLE_API_CLIENT_SECRET}}
+camel.component.google-sheets.refresh-token={{env:GOOGLE_API_REFRESH_TOKEN}}
