Skip to content

Commit

Permalink
Upgrade Camel to 3.18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesnetherton authored and JiriOndrusek committed Jun 20, 2022
1 parent f1fc8bf commit c764afc
Show file tree
Hide file tree
Showing 21 changed files with 1,129 additions and 1,067 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.camel.quarkus.component.azure.storage.blob.deployment;

import com.azure.identity.implementation.IdentityClient;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
Expand All @@ -24,6 +25,7 @@
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;

Expand All @@ -43,7 +45,6 @@ ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {

@BuildStep
void reflectiveClasses(CombinedIndexBuildItem combinedIndex, BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {

final String[] modelClasses = combinedIndex
.getIndex()
.getKnownClasses()
Expand All @@ -65,10 +66,19 @@ IndexDependencyBuildItem indexDependency() {

@BuildStep
void nativeResources(BuildProducer<NativeImageResourceBuildItem> nativeResources) {

nativeResources.produce(new NativeImageResourceBuildItem(
"azure-storage-blob.properties"));

}

@BuildStep
void runtimeInitializedClasses(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClass) {
// Required by azure-identity
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("com.sun.jna.platform.win32.Crypt32"));
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem("com.sun.jna.platform.win32.Kernel32"));
runtimeInitializedClass.produce(new RuntimeInitializedClassBuildItem(IdentityClient.class.getName()));
runtimeInitializedClass.produce(
new RuntimeInitializedClassBuildItem("com.microsoft.aad.msal4jextensions.persistence.linux.ISecurityLibrary"));
runtimeInitializedClass.produce(
new RuntimeInitializedClassBuildItem("com.microsoft.aad.msal4jextensions.persistence.mac.ISecurityLibrary"));
}
}
4 changes: 4 additions & 0 deletions extensions/jira/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void configure() throws Exception {

from("direct:readWithManagedClient")
.to(componentUri("azure-storage-blob-managed-client", BlobOperationsDefinition.getBlob)
+ "&autowiredEnabled=false&accessKey=RAW(" + azureStorageAccountKey + ")");
+ "&autowiredEnabled=false");

from("direct:update")
.to(componentUri(BlobOperationsDefinition.uploadBlockBlob));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -992,14 +992,14 @@ private static SObjectDescription createSObjectDescription() {
description.setName("Account");

final SObjectDescriptionUrls sObjectDescriptionUrls1 = new SObjectDescriptionUrls();
sObjectDescriptionUrls1.setApprovalLayouts("/services/data/v53.0/sobjects/Account/describe/approvalLayouts");
sObjectDescriptionUrls1.setCompactLayouts("/services/data/v53.0/sobjects/Account/describe/compactLayouts");
sObjectDescriptionUrls1.setDescribe("/services/data/v53.0/sobjects/Account/describe");
sObjectDescriptionUrls1.setLayouts("/services/data/v53.0/sobjects/Account/describe/layouts");
sObjectDescriptionUrls1.setListviews("/services/data/v53.0/sobjects/Account/listviews");
sObjectDescriptionUrls1.setQuickActions("/services/data/v53.0/sobjects/Account/quickActions");
sObjectDescriptionUrls1.setRowTemplate("/services/data/v53.0/sobjects/Account/{ID}");
sObjectDescriptionUrls1.setSobject("/services/data/v53.0/sobjects/Account");
sObjectDescriptionUrls1.setApprovalLayouts("/services/data/v54.0/sobjects/Account/describe/approvalLayouts");
sObjectDescriptionUrls1.setCompactLayouts("/services/data/v54.0/sobjects/Account/describe/compactLayouts");
sObjectDescriptionUrls1.setDescribe("/services/data/v54.0/sobjects/Account/describe");
sObjectDescriptionUrls1.setLayouts("/services/data/v54.0/sobjects/Account/describe/layouts");
sObjectDescriptionUrls1.setListviews("/services/data/v54.0/sobjects/Account/listviews");
sObjectDescriptionUrls1.setQuickActions("/services/data/v54.0/sobjects/Account/quickActions");
sObjectDescriptionUrls1.setRowTemplate("/services/data/v54.0/sobjects/Account/{ID}");
sObjectDescriptionUrls1.setSobject("/services/data/v54.0/sobjects/Account");
sObjectDescriptionUrls1.setUiDetailTemplate("https://d24000000cqlxeai-dev-ed.my.salesforce.com/{ID}");
sObjectDescriptionUrls1.setUiEditTemplate("https://d24000000cqlxeai-dev-ed.my.salesforce.com/{ID}/e");
sObjectDescriptionUrls1.setUiNewRecord("https://d24000000cqlxeai-dev-ed.my.salesforce.com/001/e");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/async/53.0/job/750x0000000005LAAQ",
"url": "/services/async/54.0/job/750x0000000005LAAQ",
"method": "POST"
},
"response": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/async/53.0/job",
"url": "/services/async/54.0/job",
"method": "POST"
},
"response": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/query/?q=SELECT%20Id%2C%20AccountNumber%20FROM%20Account%20WHERE%20Id%20%3D%20%27001D000000IqhSLIAZ%27",
"url": "/services/data/v54.0/query/?q=SELECT%20Id%2C%20AccountNumber%20FROM%20Account%20WHERE%20Id%20%3D%20%27001D000000IqhSLIAZ%27",
"method": "GET"
},
"response": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/sobjects/Account/",
"url": "/services/data/v54.0/sobjects/Account/",
"method": "GET"
},
"response": {
"status": 200,
"body" : "{\"objectDescribe\":{\"name\":\"Account\",\"updateable\":true,\"label\":\"Account\",\"keyPrefix\":\"001\",\"replicateable\":true,\"retrieveable\":true,\"undeletable\":true,\"triggerable\":true},\"recentItems\":[{\"attributes\":{\"type\":\"Account\",\"url\":\"\/services\/data\/v53.0\/sobjects\/Account\/001D000000IqhSLIAZ\"},\"Id\":\"001D000000IqhSLIAZ\",\"Name\":\"asdasdasd\"}]}",
"body" : "{\"objectDescribe\":{\"name\":\"Account\",\"updateable\":true,\"label\":\"Account\",\"keyPrefix\":\"001\",\"replicateable\":true,\"retrieveable\":true,\"undeletable\":true,\"triggerable\":true},\"recentItems\":[{\"attributes\":{\"type\":\"Account\",\"url\":\"\/services\/data\/v54.0\/sobjects\/Account\/001D000000IqhSLIAZ\"},\"Id\":\"001D000000IqhSLIAZ\",\"Name\":\"asdasdasd\"}]}",
"headers": {
"Content-Type": "application/json; charset=UTF-8"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/sobjects/Account/Id/001D000000IqhSLIAZ",
"url": "/services/data/v54.0/sobjects/Account/Id/001D000000IqhSLIAZ",
"method": "GET"
},
"response": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/sobjects/Account/describe/",
"url": "/services/data/v54.0/sobjects/Account/describe/",
"method": "GET"
},
"response": {
"status": 200,
"body": "{\"name\":\"Account\",\"fields\":[{\"length\":18,\"name\":\"Id\",\"type\":\"id\",\"updateable\":false,\"label\":\"Account ID\"}],\"updateable\":true,\"label\":\"Account\",\"keyPrefix\":\"001\",\"custom\":false,\"urls\":{\"uiEditTemplate\":\"https:\/\/yourInstance.salesforce.com\/{ID}\/e\",\"sobject\":\"\/services\/data\/v53.0\/sobjects\/Account\",\"uiDetailTemplate\":\"https:\/\/yourInstance.salesforce.com\/{ID}\"},\"childRelationships\":[{\"field\":\"ParentId\",\"deprecatedAndHidden\":false}],\"createable\":true,\"customSetting\":false}",
"body": "{\"name\":\"Account\",\"fields\":[{\"length\":18,\"name\":\"Id\",\"type\":\"id\",\"updateable\":false,\"label\":\"Account ID\"}],\"updateable\":true,\"label\":\"Account\",\"keyPrefix\":\"001\",\"custom\":false,\"urls\":{\"uiEditTemplate\":\"https:\/\/yourInstance.salesforce.com\/{ID}\/e\",\"sobject\":\"\/services\/data\/v54.0\/sobjects\/Account\",\"uiDetailTemplate\":\"https:\/\/yourInstance.salesforce.com\/{ID}\"},\"childRelationships\":[{\"field\":\"ParentId\",\"deprecatedAndHidden\":false}],\"createable\":true,\"customSetting\":false}",
"headers": {
"Content-Type": "application/json; charset=UTF-8"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/query/?q=SELECT%20Id%2C%20IsDeleted%2C%20MasterRecordId%2C%20Name%2C%20Type%2C%20ParentId%2C%20BillingStreet%2C%20BillingCity%2C%20BillingState%2C%20BillingPostalCode%2C%20BillingCountry%2C%20BillingLatitude%2C%20BillingLongitude%2C%20BillingGeocodeAccuracy%2C%20BillingAddress%2C%20ShippingStreet%2C%20ShippingCity%2C%20ShippingState%2C%20ShippingPostalCode%2C%20ShippingCountry%2C%20ShippingLatitude%2C%20ShippingLongitude%2C%20ShippingGeocodeAccuracy%2C%20ShippingAddress%2C%20Phone%2C%20Fax%2C%20AccountNumber%2C%20Website%2C%20PhotoUrl%2C%20Sic%2C%20Industry%2C%20AnnualRevenue%2C%20NumberOfEmployees%2C%20Ownership%2C%20TickerSymbol%2C%20Description%2C%20Rating%2C%20Site%2C%20OwnerId%2C%20CreatedDate%2C%20CreatedById%2C%20LastModifiedDate%2C%20LastModifiedById%2C%20SystemModstamp%2C%20LastActivityDate%2C%20LastViewedDate%2C%20LastReferencedDate%2C%20Jigsaw%2C%20JigsawCompanyId%2C%20CleanStatus%2C%20AccountSource%2C%20DunsNumber%2C%20Tradestyle%2C%20NaicsCode%2C%20NaicsDesc%2C%20YearStarted%2C%20SicDesc%2C%20DandbCompanyId%2C%20CustomerPriority__c%2C%20SLA__c%2C%20Active__c%2C%20NumberofLocations__c%2C%20UpsellOpportunity__c%2C%20SLASerialNumber__c%2C%20SLAExpirationDate__c%2C%20MyMultiselect__c%20FROM%20Account%20LIMIT%201",
"url": "/services/data/v54.0/query/?q=SELECT%20Id%2C%20IsDeleted%2C%20MasterRecordId%2C%20Name%2C%20Type%2C%20ParentId%2C%20BillingStreet%2C%20BillingCity%2C%20BillingState%2C%20BillingPostalCode%2C%20BillingCountry%2C%20BillingLatitude%2C%20BillingLongitude%2C%20BillingGeocodeAccuracy%2C%20BillingAddress%2C%20ShippingStreet%2C%20ShippingCity%2C%20ShippingState%2C%20ShippingPostalCode%2C%20ShippingCountry%2C%20ShippingLatitude%2C%20ShippingLongitude%2C%20ShippingGeocodeAccuracy%2C%20ShippingAddress%2C%20Phone%2C%20Fax%2C%20AccountNumber%2C%20Website%2C%20PhotoUrl%2C%20Sic%2C%20Industry%2C%20AnnualRevenue%2C%20NumberOfEmployees%2C%20Ownership%2C%20TickerSymbol%2C%20Description%2C%20Rating%2C%20Site%2C%20OwnerId%2C%20CreatedDate%2C%20CreatedById%2C%20LastModifiedDate%2C%20LastModifiedById%2C%20SystemModstamp%2C%20LastActivityDate%2C%20LastViewedDate%2C%20LastReferencedDate%2C%20Jigsaw%2C%20JigsawCompanyId%2C%20CleanStatus%2C%20AccountSource%2C%20DunsNumber%2C%20Tradestyle%2C%20NaicsCode%2C%20NaicsDesc%2C%20YearStarted%2C%20SicDesc%2C%20DandbCompanyId%2C%20CustomerPriority__c%2C%20SLA__c%2C%20Active__c%2C%20NumberofLocations__c%2C%20UpsellOpportunity__c%2C%20SLASerialNumber__c%2C%20SLAExpirationDate__c%2C%20MyMultiselect__c%20FROM%20Account%20LIMIT%201",
"method": "GET"
},
"response": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/sobjects/Document/Name/test",
"url": "/services/data/v54.0/sobjects/Document/Name/test",
"method": "GET"
},
"response": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/limits/",
"url": "/services/data/v54.0/limits/",
"method": "GET"
},
"response": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/sobjects/",
"url": "/services/data/v54.0/sobjects/",
"method": "GET"
},
"response": {
"status": 200,
"body" : "{\"encoding\":\"UTF-8\",\"maxBatchSize\":200,\"sobjects\":[{\"activateable\":false,\"custom\":false,\"customSetting\":false,\"createable\":true,\"deletable\":true,\"deprecatedAndHidden\":false,\"feedEnabled\":true,\"keyPrefix\":\"001\",\"label\":\"Account\",\"labelPlural\":\"Accounts\",\"layoutable\":true,\"mergeable\":true,\"mruEnabled\":true,\"name\":\"Account\",\"queryable\":true,\"replicateable\":true,\"retrieveable\":true,\"searchable\":true,\"triggerable\":true,\"undeletable\":true,\"updateable\":true,\"urls\":{\"sobject\":\"\/services\/data\/v53.0\/sobjects\/Account\",\"describe\":\"\/services\/data\/v53.0\/sobjects\/Account\/describe\",\"rowTemplate\":\"\/services\/data\/v53.0\/sobjects\/Account\/{ID}\"}}]}",
"body" : "{\"encoding\":\"UTF-8\",\"maxBatchSize\":200,\"sobjects\":[{\"activateable\":false,\"custom\":false,\"customSetting\":false,\"createable\":true,\"deletable\":true,\"deprecatedAndHidden\":false,\"feedEnabled\":true,\"keyPrefix\":\"001\",\"label\":\"Account\",\"labelPlural\":\"Accounts\",\"layoutable\":true,\"mergeable\":true,\"mruEnabled\":true,\"name\":\"Account\",\"queryable\":true,\"replicateable\":true,\"retrieveable\":true,\"searchable\":true,\"triggerable\":true,\"undeletable\":true,\"updateable\":true,\"urls\":{\"sobject\":\"\/services\/data\/v54.0\/sobjects\/Account\",\"describe\":\"\/services\/data\/v54.0\/sobjects\/Account\/describe\",\"rowTemplate\":\"\/services\/data\/v54.0\/sobjects\/Account\/{ID}\"}}]}",
"headers": {
"Content-Type": "application/json; charset=UTF-8",
"Sforce-Limit-Info": "api-usage=18/5000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/",
"url": "/services/data/v54.0/",
"method": "GET"
},
"response": {
"status": 200,
"body": "{\"sobjects\":\"\/services\/data\/v53.0\/sobjects\",\"licensing\":\"\/services\/data\/v53.0\/licensing\",\"connect\":\"\/services\/data\/v53.0\/connect\",\"search\":\"\/services\/data\/v53.0\/search\",\"query\":\"\/services\/data\/v53.0\/query\",\"tooling\":\"\/services\/data\/v53.0\/tooling\",\"chatter\":\"\/services\/data\/v53.0\/chatter\",\"recent\":\"\/services\/data\/v53.0\/recent\"}",
"body": "{\"sobjects\":\"\/services\/data\/v54.0\/sobjects\",\"licensing\":\"\/services\/data\/v54.0\/licensing\",\"connect\":\"\/services\/data\/v54.0\/connect\",\"search\":\"\/services\/data\/v54.0\/search\",\"query\":\"\/services\/data\/v54.0\/query\",\"tooling\":\"\/services\/data\/v54.0\/tooling\",\"chatter\":\"\/services\/data\/v54.0\/chatter\",\"recent\":\"\/services\/data\/v54.0\/recent\"}",
"headers": {
"Content-Type": "application/json; charset=UTF-8",
"Sforce-Limit-Info": "api-usage=18/5000"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "09aa79df-8a19-41df-8655-e414d390d6ed",
"name": "salesforce_api_json",
"request": {
"url": "/services/data/v53.0/sobjects/Account",
"url": "/services/data/v54.0/sobjects/Account",
"method": "POST"
},
"response": {
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
<version>3.17.0</version>
<version>3.18.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.quarkus</groupId>
Expand All @@ -39,8 +39,8 @@
<properties>

<!-- Primary dependencies - maintained manually -->
<camel.major.minor>3.17</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
<camel.version>${camel.major.minor}.0</camel.version>
<camel.major.minor>3.18</camel.major.minor> <!-- run after each change: cd docs && mvnd validate -->
<camel.version>${camel.major.minor}.0-SNAPSHOT</camel.version>
<camel.docs.components.version>${camel.major.minor}.x</camel.docs.components.version><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.components.xref>${camel.docs.components.version}@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml -->
<camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable camel branch on which our Antora docs depends -->
Expand Down Expand Up @@ -115,7 +115,7 @@
<kotlin.version>1.6.21</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib -->
<kryo.version>2.24.0</kryo.version><!-- @sync org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo -->
<libthrift.version>${libthrift-version}</libthrift.version> <!-- Spark -->
<msal4j.version>1.11.3</msal4j.version><!-- @sync com.azure:azure-identity:${azure-identity-version} dep:com.microsoft.azure:msal4j -->
<msal4j.version>1.12.0</msal4j.version><!-- @sync com.azure:azure-identity:${azure-identity-version} dep:com.microsoft.azure:msal4j -->
<mvel2.version>2.4.14.Final</mvel2.version><!-- @sync org.apache.camel:camel-dependencies:${camel.version} prop:mvel-version -->
<okio.version>${squareup-okio-version}</okio.version>
<perfmark-api.version>0.25.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api -->
Expand Down
12 changes: 12 additions & 0 deletions poms/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3253,6 +3253,10 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
Expand Down Expand Up @@ -3281,6 +3285,14 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
Expand Down
Loading

0 comments on commit c764afc

Please sign in to comment.