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-quarkus.git
The following commit(s) were added to refs/heads/master by this push: new 7da74e8 chore(it): cleanup application.properties and poms new a11beb3 Merge pull request #84 from lburgazzoli/it-cleanup 7da74e8 is described below commit 7da74e857dce3bc73675347860a4c353ad1a6318 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Tue Jul 23 15:01:38 2019 +0200 chore(it): cleanup application.properties and poms --- integration-tests/aws-eks/pom.xml | 6 +++-- .../io/quarkus/it/camel/aws/CamelApplication.java | 24 ----------------- .../src/main/resources/application.properties | 25 ++++++++++++----- integration-tests/aws-s3/pom.xml | 8 ++++-- .../io/quarkus/it/camel/aws/CamelApplication.java | 24 ----------------- .../src/main/resources/application.properties | 25 ++++++++++++----- integration-tests/aws-sns/pom.xml | 14 +++++++--- .../io/quarkus/it/camel/aws/CamelApplication.java | 24 ----------------- .../src/main/resources/application.properties | 31 +++++++++++++++------- integration-tests/aws-sqs/pom.xml | 7 ++--- .../io/quarkus/it/camel/aws/CamelApplication.java | 24 ----------------- .../src/main/resources/application.properties | 29 ++++++++++++++------ .../core/src/main/resources/application.properties | 20 +++++++------- .../jdbc/src/main/resources/application.properties | 22 +++++++++++++-- .../src/main/resources/application.properties | 24 +++++++++++------ integration-tests/pom.xml | 2 ++ integration-tests/salesforce/pom.xml | 2 +- .../src/main/resources/application.properties | 25 +++++++++++------ .../src/main/resources/application.properties | 24 ++++++++++++++++- 19 files changed, 194 insertions(+), 166 deletions(-) diff --git a/integration-tests/aws-eks/pom.xml b/integration-tests/aws-eks/pom.xml index 627a1fe..849288e 100644 --- a/integration-tests/aws-eks/pom.xml +++ b/integration-tests/aws-eks/pom.xml @@ -45,12 +45,13 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-timer</artifactId> </dependency> + <!-- test dependencies --> + <!-- <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy</artifactId> </dependency> - <!-- test dependencies --> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-junit5</artifactId> @@ -63,6 +64,7 @@ <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> </dependency> + --> </dependencies> <build> @@ -111,7 +113,7 @@ <id>native-image</id> <activation> <property> - <name>native-camel</name> + <name>native</name> </property> </activation> <build> diff --git a/integration-tests/aws-eks/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java b/integration-tests/aws-eks/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java deleted file mode 100644 index f94e7d0..0000000 --- a/integration-tests/aws-eks/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java +++ /dev/null @@ -1,24 +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 io.quarkus.it.camel.aws; - -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; - -@ApplicationPath("/test") -public class CamelApplication extends Application { -} \ No newline at end of file diff --git a/integration-tests/aws-eks/src/main/resources/application.properties b/integration-tests/aws-eks/src/main/resources/application.properties index 63e0844..aa1aaf2 100644 --- a/integration-tests/aws-eks/src/main/resources/application.properties +++ b/integration-tests/aws-eks/src/main/resources/application.properties @@ -14,17 +14,30 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- +# +# Quarkus +# +quarkus.log.file.enable = false quarkus.ssl.native=true -camel.context.name=quarkus-camel-aws-eks +# +# Quarkus :: Camel +# +quarkus.camel.disable-xml=true +quarkus.camel.disable-jaxb=true +quarkus.camel.dump-routes=true +quarkus.camel.defer-init-phase=true + +# +# Camel +# +camel.context.name = quarkus-camel-example camel.component.properties.prefixToken={{ camel.component.properties.suffixToken=}} -camel.conf={{env:CAMEL_CONF:}} -camel.confd={{env:CAMEL_CONFD:}} -camel.routes.dump=true -camel.routes.defer=true -camel.routes.locations= +# +# Camel :: AWS +# camel.component.aws-eks.access-key={{env:EKS_ACCESS_KEY}} camel.component.aws-eks.secret-key={{env:EKS_SECRET_KEY}} camel.component.aws-eks.region={{env:EKS_REGION}} diff --git a/integration-tests/aws-s3/pom.xml b/integration-tests/aws-s3/pom.xml index 380b6e9..9e5ff97 100644 --- a/integration-tests/aws-s3/pom.xml +++ b/integration-tests/aws-s3/pom.xml @@ -45,12 +45,15 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-timer</artifactId> </dependency> + + + <!-- test dependencies --> + <!-- <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy</artifactId> </dependency> - <!-- test dependencies --> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-junit5</artifactId> @@ -63,6 +66,7 @@ <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> </dependency> + --> </dependencies> <build> @@ -111,7 +115,7 @@ <id>native-image</id> <activation> <property> - <name>native-camel</name> + <name>native</name> </property> </activation> <build> diff --git a/integration-tests/aws-s3/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java b/integration-tests/aws-s3/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java deleted file mode 100644 index f94e7d0..0000000 --- a/integration-tests/aws-s3/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java +++ /dev/null @@ -1,24 +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 io.quarkus.it.camel.aws; - -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; - -@ApplicationPath("/test") -public class CamelApplication extends Application { -} \ No newline at end of file diff --git a/integration-tests/aws-s3/src/main/resources/application.properties b/integration-tests/aws-s3/src/main/resources/application.properties index 8f8b6dc..db474df 100644 --- a/integration-tests/aws-s3/src/main/resources/application.properties +++ b/integration-tests/aws-s3/src/main/resources/application.properties @@ -14,17 +14,30 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- +# +# Quarkus +# quarkus.ssl.native=true +quarkus.log.file.enable = false -camel.context.name=quarkus-camel-aws-s3 +# +# Quarkus :: Camel +# +quarkus.camel.disable-xml=true +quarkus.camel.disable-jaxb=true +quarkus.camel.dump-routes=true +quarkus.camel.defer-init-phase=true + +# +# Camel +# +camel.context.name = quarkus-camel-example camel.component.properties.prefixToken={{ camel.component.properties.suffixToken=}} -camel.conf={{env:CAMEL_CONF:}} -camel.confd={{env:CAMEL_CONFD:}} -camel.routes.dump=true -camel.routes.defer=true -camel.routes.locations= +# +# Camel :: AWS +# camel.component.aws-s3.access-key={{env:S3_ACCESS_KEY}} camel.component.aws-s3.secret-key={{env:S3_SECRET_KEY}} camel.component.aws-s3.region={{env:S3_REGION}} diff --git a/integration-tests/aws-sns/pom.xml b/integration-tests/aws-sns/pom.xml index a50fc00..4050f79 100644 --- a/integration-tests/aws-sns/pom.xml +++ b/integration-tests/aws-sns/pom.xml @@ -31,7 +31,6 @@ <name>Camel Quarkus :: Integration Tests :: AWS SNS</name> <description>The camel integration tests</description> - <dependencies> <dependency> <groupId>org.apache.camel.quarkus</groupId> @@ -45,12 +44,14 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-timer</artifactId> </dependency> + + <!-- test dependencies --> + <!-- + Not needed as we do not have tests <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy</artifactId> </dependency> - - <!-- test dependencies --> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-junit5</artifactId> @@ -63,6 +64,7 @@ <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> </dependency> + --> </dependencies> <build> @@ -111,7 +113,7 @@ <id>native-image</id> <activation> <property> - <name>native-camel</name> + <name>native</name> </property> </activation> <build> @@ -151,6 +153,10 @@ <graalvmHome>${graalvmHome}</graalvmHome> <enableJni>true</enableJni> <enableAllSecurityServices>true</enableAllSecurityServices> + <additionalBuildArgs> + + + </additionalBuildArgs> </configuration> </execution> </executions> diff --git a/integration-tests/aws-sns/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java b/integration-tests/aws-sns/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java deleted file mode 100644 index f94e7d0..0000000 --- a/integration-tests/aws-sns/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java +++ /dev/null @@ -1,24 +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 io.quarkus.it.camel.aws; - -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; - -@ApplicationPath("/test") -public class CamelApplication extends Application { -} \ No newline at end of file diff --git a/integration-tests/aws-sns/src/main/resources/application.properties b/integration-tests/aws-sns/src/main/resources/application.properties index f57c58e..8aef741 100644 --- a/integration-tests/aws-sns/src/main/resources/application.properties +++ b/integration-tests/aws-sns/src/main/resources/application.properties @@ -14,17 +14,30 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- +# +# Quarkus +# quarkus.ssl.native=true +quarkus.log.file.enable = false -camel.context.name=quarkus-camel-aws-sns -camel.properties.prefixToken={{ -camel.properties.suffixToken=}} -camel.conf={{env:CAMEL_CONF:}} -camel.confd={{env:CAMEL_CONFD:}} -camel.routes.dump=true -camel.routes.defer=true -camel.routes.locations= +# +# Quarkus :: Camel +# +quarkus.camel.disable-xml=true +quarkus.camel.disable-jaxb=true +quarkus.camel.dump-routes=true +quarkus.camel.defer-init-phase=true +# +# Camel +# +camel.context.name = quarkus-camel-example +camel.component.properties.prefixToken={{ +camel.component.properties.suffixToken=}} + +# +# Camel :: AWS +# camel.component.aws-sns.access-key={{env:SNS_ACCESS_KEY}} camel.component.aws-sns.secret-key={{env:SNS_SECRET_KEY}} -camel.component.aws-sns.region={{env:SNS_REGION}} +camel.component.aws-sns.region={{env:SNS_REGION}} \ No newline at end of file diff --git a/integration-tests/aws-sqs/pom.xml b/integration-tests/aws-sqs/pom.xml index 058efa2..fd86f16 100644 --- a/integration-tests/aws-sqs/pom.xml +++ b/integration-tests/aws-sqs/pom.xml @@ -45,12 +45,12 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-timer</artifactId> </dependency> + <!-- test dependencies --> + <!-- <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy</artifactId> </dependency> - - <!-- test dependencies --> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-junit5</artifactId> @@ -63,6 +63,7 @@ <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> </dependency> + --> </dependencies> <build> @@ -111,7 +112,7 @@ <id>native-image</id> <activation> <property> - <name>native-camel</name> + <name>native</name> </property> </activation> <build> diff --git a/integration-tests/aws-sqs/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java b/integration-tests/aws-sqs/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java deleted file mode 100644 index f94e7d0..0000000 --- a/integration-tests/aws-sqs/src/main/java/io/quarkus/it/camel/aws/CamelApplication.java +++ /dev/null @@ -1,24 +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 io.quarkus.it.camel.aws; - -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; - -@ApplicationPath("/test") -public class CamelApplication extends Application { -} \ No newline at end of file diff --git a/integration-tests/aws-sqs/src/main/resources/application.properties b/integration-tests/aws-sqs/src/main/resources/application.properties index a5c8c35..a1cbbb8 100644 --- a/integration-tests/aws-sqs/src/main/resources/application.properties +++ b/integration-tests/aws-sqs/src/main/resources/application.properties @@ -14,17 +14,30 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- +# +# Quarkus +# quarkus.ssl.native=true +quarkus.log.file.enable = false -camel.context.name=quarkus-camel-aws-sqs -camel.properties.prefixToken={{ -camel.properties.suffixToken=}} -camel.conf={{env:CAMEL_CONF:}} -camel.confd={{env:CAMEL_CONFD:}} -camel.routes.dump=true -camel.routes.defer=true -camel.routes.locations= +# +# Quarkus :: Camel +# +quarkus.camel.disable-xml=true +quarkus.camel.disable-jaxb=true +quarkus.camel.dump-routes=true +quarkus.camel.defer-init-phase=true +# +# Camel +# +camel.context.name = quarkus-camel-example +camel.component.properties.prefixToken={{ +camel.component.properties.suffixToken=}} + +# +# Camel :: AWS +# camel.component.aws-sqs.access-key={{env:SQS_ACCESS_KEY}} camel.component.aws-sqs.secret-key={{env:SQS_SECRET_KEY}} camel.component.aws-sqs.region={{env:SQS_REGION}} diff --git a/integration-tests/core/src/main/resources/application.properties b/integration-tests/core/src/main/resources/application.properties index b25f9e7..aaf71d0 100644 --- a/integration-tests/core/src/main/resources/application.properties +++ b/integration-tests/core/src/main/resources/application.properties @@ -20,22 +20,22 @@ quarkus.log.file.enable = false # -# Camel +# Quarkus :: Camel # quarkus.camel.disable-xml=true -quarkus.camel.disable-jaxb=true - -camel.context.name=quarkus-camel-example -camel.context.loadTypeConverters=false - -camel.routes.dump=true -camel.routes.defer=true -camel.routes.locations= +quarkus.camel.disable-jaxb=true +quarkus.camel.dump-routes=true +quarkus.camel.defer-init-phase=true +# +# Camel +# +camel.context.name = quarkus-camel-example +camel.context.load-type-converters=false camel.component.properties.prefixToken={{ camel.component.properties.suffixToken=}} # # Integration # -integration.folder={{sys:folder:./target/orders}} +integration.folder={{sys:folder:./target/orders}} \ No newline at end of file diff --git a/integration-tests/jdbc/src/main/resources/application.properties b/integration-tests/jdbc/src/main/resources/application.properties index be1cfcb..649ec19 100644 --- a/integration-tests/jdbc/src/main/resources/application.properties +++ b/integration-tests/jdbc/src/main/resources/application.properties @@ -14,11 +14,29 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- +# +# Quarkus +# +quarkus.log.file.enable = false + +# +# Quarkus :: Camel +# quarkus.camel.disable-xml=true -quarkus.camel.disable-jaxb=true +quarkus.camel.disable-jaxb=true quarkus.camel.dump-routes=true +# +# Quarkus :: DS +# quarkus.datasource.camel-ds.url=jdbc:h2:tcp://localhost/mem:test quarkus.datasource.camel-ds.driver=org.h2.Driver quarkus.datasource.camel-ds.max-size=8 -quarkus.datasource.camel-ds.min-size=2 \ No newline at end of file +quarkus.datasource.camel-ds.min-size=2 + +# +# Camel +# +camel.context.name = quarkus-camel-example +camel.component.properties.prefixToken={{ +camel.component.properties.suffixToken=}} diff --git a/integration-tests/netty4-http/src/main/resources/application.properties b/integration-tests/netty4-http/src/main/resources/application.properties index c1ba322..9c608d1 100644 --- a/integration-tests/netty4-http/src/main/resources/application.properties +++ b/integration-tests/netty4-http/src/main/resources/application.properties @@ -20,17 +20,25 @@ quarkus.log.file.enable = false # -# Camel +# Quarkus :: Camel # quarkus.camel.disable-xml=true -quarkus.camel.disable-jaxb=true - -camel.context.name=quarkus-camel-example -camel.context.loadTypeConverters=false +quarkus.camel.disable-jaxb=true +quarkus.camel.dump-routes=true +quarkus.camel.defer-init-phase=false -camel.routes.dump=true -camel.routes.defer=true -camel.routes.locations= +# +# Camel +# +camel.context.name = quarkus-camel-example camel.component.properties.prefixToken={{ camel.component.properties.suffixToken=}} + +# +# Camel :: AWS +# +camel.component.aws-sqs.access-key={{env:SQS_ACCESS_KEY}} +camel.component.aws-sqs.secret-key={{env:SQS_SECRET_KEY}} +camel.component.aws-sqs.region={{env:SQS_REGION}} + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index cbc8434..f8f91c0 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -34,8 +34,10 @@ <name>Camel Quarkus :: Integration Tests</name> <modules> + <!-- build those first --> <module>core</module> <module>netty4-http</module> + <module>aws-s3</module> <module>aws-sns</module> <module>aws-sqs</module> diff --git a/integration-tests/salesforce/pom.xml b/integration-tests/salesforce/pom.xml index 20a7148..7937f6a 100644 --- a/integration-tests/salesforce/pom.xml +++ b/integration-tests/salesforce/pom.xml @@ -110,7 +110,7 @@ <id>native-image</id> <activation> <property> - <name>native-camel</name> + <name>native</name> </property> </activation> <build> diff --git a/integration-tests/salesforce/src/main/resources/application.properties b/integration-tests/salesforce/src/main/resources/application.properties index a639044..3065c01 100644 --- a/integration-tests/salesforce/src/main/resources/application.properties +++ b/integration-tests/salesforce/src/main/resources/application.properties @@ -14,17 +14,26 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- + +# +# Quarkus +# quarkus.ssl.native=true +quarkus.camel.disable-xml=true +quarkus.camel.disable-jaxb=true +quarkus.camel.dump-routes=true +quarkus.camel.defer-init-phase=true -camel.context.name=quarkus-camel-salesforce -camel.properties.prefixToken={{ -camel.properties.suffixToken=}} -camel.conf={{env:CAMEL_CONF:}} -camel.confd={{env:CAMEL_CONFD:}} -camel.dump=true -camel.defer=true -camel.routesUri= +# +# Camel +# +camel.context.name = quarkus-camel-example +camel.component.properties.prefixToken={{ +camel.component.properties.suffixToken=}} +# +# Camel :: Salesforce +# camel.component.salesforce.loginUrl = https://login.salesforce.com camel.component.salesforce.userName = {{env:SALESFORCE_USERNAME}} camel.component.salesforce.password = {{env:SALESFORCE_PASSWORD}} diff --git a/integration-tests/servlet/src/main/resources/application.properties b/integration-tests/servlet/src/main/resources/application.properties index 885634a..6de5929 100644 --- a/integration-tests/servlet/src/main/resources/application.properties +++ b/integration-tests/servlet/src/main/resources/application.properties @@ -14,10 +14,32 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- +# +# Quarkus +# +quarkus.log.file.enable = false +quarkus.ssl.native=true + +# +# Quarkus :: Camel +# quarkus.camel.disable-xml=true -quarkus.camel.disable-jaxb=true +quarkus.camel.disable-jaxb=true +quarkus.camel.dump-routes=true +quarkus.camel.defer-init-phase=false + +# +# Quarkus :: Camel :: Servlet +# quarkus.camel.servlet.url-patterns=/folder-1/*,/folder-2/* quarkus.camel.servlet.my-named-servlet.url-patterns=/my-named-folder/* quarkus.camel.servlet.my-named-servlet.servlet-class=io.quarkus.it.camel.servlet.CustomServlet quarkus.camel.servlet.ignored-key.servlet-name=my-favorite-servlet quarkus.camel.servlet.ignored-key.url-patterns=/my-favorite-folder/* + +# +# Camel +# +camel.context.name = quarkus-camel-example +camel.component.properties.prefixToken={{ +camel.component.properties.suffixToken=}}