You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/10/22 07:23:10 UTC
[camel-quarkus] branch camel-master updated (f109f3c -> d731a9f)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
discard f109f3c Upgrade to Camel 3.7.0
add bca5add Updated CHANGELOG.md
add 0ba78ce Set retention-days parameter on upload-artifact action
add b9a2528 Exclude glassfish dependencies from hbase-testing-util
add 613827b Lumberjack native support fixes #1732
add df62fb3 Remove workaround for AdviceWithRouteBuilder replaceFromWith and microprofile-metrics conflict
add bdb7d18 Remove DigitalSignatureConstants reflection registration
add 2eab33c Main extension cannot load rest XML definitions
add fbf7c60 Updated CHANGELOG.md
add 6ad3987 Enable Spring dependent extensions to work with Quarkus Spring
new d731a9f Upgrade to Camel 3.7.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f109f3c)
\
N -- N -- N refs/heads/camel-master (d731a9f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.github/workflows/camel-master-cron.yaml | 7 +-
.github/workflows/ci-build.yaml | 19 +--
.github/workflows/purge-stale-artifacts-cron.yaml | 38 -----
.github/workflows/quarkus-master-cron.yaml | 7 +-
.gitignore | 1 +
CHANGELOG.md | 17 ++-
.../pages/reference/extensions/lumberjack.adoc | 14 +-
.../partials/reference/components/lumberjack.adoc | 6 +-
.../quarkus/main/CamelMainRoutesCollector.java | 53 -------
.../lumberjack/deployment/LumberjackProcessor.java | 46 ------
extensions-jvm/lumberjack/integration-test/pom.xml | 98 -------------
.../lumberjack/it/LumberjackResource.java | 51 -------
extensions-jvm/pom.xml | 1 -
extensions-support/spring/README.adoc | 49 +++++++
.../spring/beans}/pom.xml | 83 +++++------
.../spring/context}/pom.xml | 80 +++++-----
extensions-support/spring/core/pom.xml | 97 +++++++++++++
extensions-support/spring/integration-test/pom.xml | 103 +++++++++++++
.../support/spring/ClassLoadingService.java | 19 +--
.../support/spring/test/SpringSupportTest.java | 48 ++++++
extensions-support/spring/pom.xml | 4 +
extensions-support/spring/runtime/pom.xml | 12 +-
.../crypto/deployment/CryptoProcessor.java | 9 --
extensions/jpa/runtime/pom.xml | 4 -
.../lumberjack/deployment/pom.xml | 8 +
.../deployment/LumberjackProcessor.java} | 8 +-
{extensions-jvm => extensions}/lumberjack/pom.xml | 1 -
.../lumberjack/runtime/pom.xml | 15 ++
.../main/resources/META-INF/quarkus-extension.yaml | 3 +-
.../runtime/CamelMicroProfileMetricsRecorder.java | 6 +-
extensions/pom.xml | 1 +
.../component/qute/QuteEndpointUriFactory.java | 4 +-
integration-tests/{nats => lumberjack}/pom.xml | 28 ++--
.../lumberjack/it/LumberjackResource.java | 79 ++++++++++
.../lumberjack/it/LumberjackResponse.java | 34 +++--
.../component/lumberjack/it/LumberjackRoutes.java | 80 ++++++++++
.../component/lumberjack/it/LumberjackService.java | 161 +++++++++++++++++++++
.../lumberjack/it/LumberjackSslService.java} | 57 +++-----
.../src/main/resources/application.properties | 5 +-
.../lumberjack/src/main/resources/io/window10.bin | Bin 0 -> 1195 bytes
.../lumberjack/src/main/resources/io/window15.bin | Bin 0 -> 1489 bytes
.../lumberjack/src/main/resources/ssl/keystore.jks | Bin 0 -> 1473 bytes
.../component/lumberjack/it/LumberjackIT.java} | 5 +-
.../component/lumberjack/it/LumberjackTest.java | 73 ++++++++++
.../lumberjack/it/LumberjackTestResource.java} | 9 +-
integration-tests/pom.xml | 1 +
pom.xml | 8 +
poms/bom-test/pom.xml | 4 +
poms/bom/pom.xml | 57 ++++++++
tooling/scripts/test-categories.yaml | 1 +
50 files changed, 1003 insertions(+), 511 deletions(-)
delete mode 100644 .github/workflows/purge-stale-artifacts-cron.yaml
delete mode 100644 extensions-jvm/lumberjack/deployment/src/main/java/org/apache/camel/quarkus/component/lumberjack/deployment/LumberjackProcessor.java
delete mode 100644 extensions-jvm/lumberjack/integration-test/pom.xml
delete mode 100644 extensions-jvm/lumberjack/integration-test/src/main/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackResource.java
create mode 100644 extensions-support/spring/README.adoc
copy {extensions/jpa/runtime => extensions-support/spring/beans}/pom.xml (51%)
copy {extensions/jpa/runtime => extensions-support/spring/context}/pom.xml (50%)
create mode 100644 extensions-support/spring/core/pom.xml
create mode 100644 extensions-support/spring/integration-test/pom.xml
copy integration-tests/master/src/main/java/org/apache/camel/quarkus/component/master/it/MasterResource.java => extensions-support/spring/integration-test/src/main/java/org/apache/camel/quarkus/support/spring/ClassLoadingService.java (71%)
create mode 100644 extensions-support/spring/integration-test/src/test/java/org/apache/camel/quarkus/support/spring/test/SpringSupportTest.java
rename {extensions-jvm => extensions}/lumberjack/deployment/pom.xml (88%)
copy extensions/{weather/deployment/src/main/java/org/apache/camel/quarkus/component/weather/deployment/WeatherProcessor.java => lumberjack/deployment/src/main/java/org/apache/camel/quarkus/component/lumberjack/deployment/LumberjackProcessor.java} (84%)
rename {extensions-jvm => extensions}/lumberjack/pom.xml (97%)
rename {extensions-jvm => extensions}/lumberjack/runtime/pom.xml (86%)
rename {extensions-jvm => extensions}/lumberjack/runtime/src/main/resources/META-INF/quarkus-extension.yaml (97%)
copy integration-tests/{nats => lumberjack}/pom.xml (88%)
create mode 100644 integration-tests/lumberjack/src/main/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackResource.java
rename extensions-jvm/lumberjack/integration-test/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackTest.java => integration-tests/lumberjack/src/main/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackResponse.java (57%)
create mode 100644 integration-tests/lumberjack/src/main/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackRoutes.java
create mode 100644 integration-tests/lumberjack/src/main/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackService.java
copy integration-tests/{nats/src/main/java/org/apache/camel/quarkus/component/nats/it/NatsRoutes.java => lumberjack/src/main/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackSslService.java} (53%)
copy integration-tests/{core-discovery-disabled => lumberjack}/src/main/resources/application.properties (92%)
create mode 100644 integration-tests/lumberjack/src/main/resources/io/window10.bin
create mode 100644 integration-tests/lumberjack/src/main/resources/io/window15.bin
create mode 100644 integration-tests/lumberjack/src/main/resources/ssl/keystore.jks
copy integration-tests/{arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbIT.java => lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackIT.java} (89%)
create mode 100644 integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackTest.java
copy integration-tests/{sap-netweaver/src/test/java/org/apache/camel/quarkus/component/sap/netweaver/it/SapNetweaverTestResource.java => lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackTestResource.java} (80%)
[camel-quarkus] 01/01: Upgrade to Camel 3.7.0
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d731a9fd8eb6bd27795a531aa04a5301b0b4944f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Oct 19 07:16:38 2020 +0100
Upgrade to Camel 3.7.0
---
.../java/org/apache/camel/component/qute/QuteEndpointUriFactory.java | 4 ++--
pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointUriFactory.java b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointUriFactory.java
index f24c41f..28b192e 100644
--- a/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointUriFactory.java
+++ b/extensions/qute/component/src/generated/java/org/apache/camel/component/qute/QuteEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class QuteEndpointUriFactory extends org.apache.camel.support.component.E
}
@Override
- public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+ public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
String syntax = scheme + BASE;
String uri = syntax;
Map<String, Object> copy = new HashMap<>(properties);
uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
- uri = buildQueryParameters(uri, copy);
+ uri = buildQueryParameters(uri, copy, encode);
return uri;
}
diff --git a/pom.xml b/pom.xml
index fcbae41..8485b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<awssdk1-swf-libs.version>1.11.22</awssdk1-swf-libs.version>
<awssdk2.version>2.14.3</awssdk2.version>
<bouncycastle.version>1.66</bouncycastle.version>
- <camel.version>3.6.0</camel.version>
+ <camel.version>3.7.0-SNAPSHOT</camel.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version><!-- keep in sync with Camel -->
<commons-cli.version>1.4</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core -->
<commons-collections.version>3.2.2</commons-collections.version><!-- used by hbase, should be pretty stable as commons-collections are not developed actively anymore -->