From 166e0d81ace8748e76698df8e059967db3b14d12 Mon Sep 17 00:00:00 2001 From: Zoran Regvart Date: Thu, 12 Oct 2017 15:04:03 +0200 Subject: [PATCH] refactor: upgrade to Camel 2.20.0, few Maven bits Upgrades Camel to 2.20.0 (from Fuse EA) and removes the Fuse EA repository. Also adds Maven configuration intended to speed up the build (GC configuration, 8 parallel threads for downloads). --- .mvn/jvm.config | 1 + .mvn/maven.config | 1 + .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- connectors/sql-stored-connector/pom.xml | 17 +---------- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 2 +- pom.xml | 29 +------------------ 23 files changed, 23 insertions(+), 63 deletions(-) create mode 100644 .mvn/jvm.config create mode 100644 .mvn/maven.config diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 0000000..b7d49bf --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1 @@ +-Xmx512m -Djava.awt.headless=true -XX:+UseG1GC -XX:+UseStringDeduplication diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..adf4154 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dmaven.artifact.threads=8 diff --git a/connectors/day-trade-get-connector/src/main/resources/camel-connector.json b/connectors/day-trade-get-connector/src/main/resources/camel-connector.json index 221be3e..df8efab 100644 --- a/connectors/day-trade-get-connector/src/main/resources/camel-connector.json +++ b/connectors/day-trade-get-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "rest", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.rest.RestComponent", "name" : "DayTradeGetComponent", "scheme" : "day-trade-get", diff --git a/connectors/day-trade-place-connector/src/main/resources/camel-connector.json b/connectors/day-trade-place-connector/src/main/resources/camel-connector.json index a2501ac..5009742 100644 --- a/connectors/day-trade-place-connector/src/main/resources/camel-connector.json +++ b/connectors/day-trade-place-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "rest", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.rest.RestComponent", "name" : "DayTradePlaceComponent", "scheme" : "day-trade-place", diff --git a/connectors/salesforce-create-sobject-connector/src/main/resources/camel-connector.json b/connectors/salesforce-create-sobject-connector/src/main/resources/camel-connector.json index 4db6ef9..c2244f2 100644 --- a/connectors/salesforce-create-sobject-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-create-sobject-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceCreateSObject", "scheme" : "salesforce-create-sobject", diff --git a/connectors/salesforce-delete-sobject-connector/src/main/resources/camel-connector.json b/connectors/salesforce-delete-sobject-connector/src/main/resources/camel-connector.json index 4ef4039..f1b1f4d 100644 --- a/connectors/salesforce-delete-sobject-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-delete-sobject-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceDeleteSObject", "scheme" : "salesforce-delete-sobject", diff --git a/connectors/salesforce-delete-sobject-with-id-connector/src/main/resources/camel-connector.json b/connectors/salesforce-delete-sobject-with-id-connector/src/main/resources/camel-connector.json index 496f704..d46b6b6 100644 --- a/connectors/salesforce-delete-sobject-with-id-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-delete-sobject-with-id-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceDeleteSObjectWithId", "scheme" : "salesforce-delete-sobject-with-id", diff --git a/connectors/salesforce-get-sobject-connector/src/main/resources/camel-connector.json b/connectors/salesforce-get-sobject-connector/src/main/resources/camel-connector.json index 106c66a..e624043 100644 --- a/connectors/salesforce-get-sobject-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-get-sobject-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceGetSObject", "scheme" : "salesforce-get-sobject", diff --git a/connectors/salesforce-get-sobject-with-id-connector/src/main/resources/camel-connector.json b/connectors/salesforce-get-sobject-with-id-connector/src/main/resources/camel-connector.json index 5587d52..ec87209 100644 --- a/connectors/salesforce-get-sobject-with-id-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-get-sobject-with-id-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceGetSObjectWithId", "scheme" : "salesforce-get-sobject-with-id", diff --git a/connectors/salesforce-on-create-connector/src/main/resources/camel-connector.json b/connectors/salesforce-on-create-connector/src/main/resources/camel-connector.json index e390de6..e91e64b 100644 --- a/connectors/salesforce-on-create-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-on-create-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceOnCreate", "scheme" : "salesforce-on-create", diff --git a/connectors/salesforce-on-delete-connector/src/main/resources/camel-connector.json b/connectors/salesforce-on-delete-connector/src/main/resources/camel-connector.json index 886bd5c..e0565a8 100644 --- a/connectors/salesforce-on-delete-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-on-delete-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceOnDelete", "scheme" : "salesforce-on-delete", diff --git a/connectors/salesforce-on-update-connector/src/main/resources/camel-connector.json b/connectors/salesforce-on-update-connector/src/main/resources/camel-connector.json index 154d71f..d76f4a7 100644 --- a/connectors/salesforce-on-update-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-on-update-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceOnUpdate", "scheme" : "salesforce-on-update", diff --git a/connectors/salesforce-update-sobject-connector/src/main/resources/camel-connector.json b/connectors/salesforce-update-sobject-connector/src/main/resources/camel-connector.json index 2c56ebc..c827bb8 100644 --- a/connectors/salesforce-update-sobject-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-update-sobject-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceUpdateSObject", "scheme" : "salesforce-update-sobject", diff --git a/connectors/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json b/connectors/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json index eee6bcf..a8b1d45 100644 --- a/connectors/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceUpsertContact", "scheme" : "salesforce-upsert-contact-connector", diff --git a/connectors/salesforce-upsert-sobject-connector/src/main/resources/camel-connector.json b/connectors/salesforce-upsert-sobject-connector/src/main/resources/camel-connector.json index 771f21f..92a9440 100644 --- a/connectors/salesforce-upsert-sobject-connector/src/main/resources/camel-connector.json +++ b/connectors/salesforce-upsert-sobject-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceUpsertSObject", "scheme" : "salesforce-upsert-sobject", diff --git a/connectors/sql-stored-connector/pom.xml b/connectors/sql-stored-connector/pom.xml index f6f772f..819702d 100644 --- a/connectors/sql-stored-connector/pom.xml +++ b/connectors/sql-stored-connector/pom.xml @@ -16,7 +16,7 @@ UTF-8 UTF-8 - 2.20.0.fuse-000091 + 2.20.0 @@ -237,19 +237,4 @@ - - - jboss-ea - JBoss Early-access repository - https://repository.jboss.org/nexus/content/groups/ea/ - - true - - - false - - - - - diff --git a/connectors/timer-connector/src/main/resources/camel-connector.json b/connectors/timer-connector/src/main/resources/camel-connector.json index c5125be..703519b 100644 --- a/connectors/timer-connector/src/main/resources/camel-connector.json +++ b/connectors/timer-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "timer", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.timer.TimerComponent", "name" : "Timer", "scheme" : "periodic-timer-connector", diff --git a/connectors/trade-insight-buy-connector/src/main/resources/camel-connector.json b/connectors/trade-insight-buy-connector/src/main/resources/camel-connector.json index b655ecf..73645d0 100644 --- a/connectors/trade-insight-buy-connector/src/main/resources/camel-connector.json +++ b/connectors/trade-insight-buy-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "rest", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.rest.RestComponent", "name" : "TradeInsightBuy", "scheme" : "trade-insight-buy", diff --git a/connectors/trade-insight-sell-connector/src/main/resources/camel-connector.json b/connectors/trade-insight-sell-connector/src/main/resources/camel-connector.json index 3523da9..00de2f2 100644 --- a/connectors/trade-insight-sell-connector/src/main/resources/camel-connector.json +++ b/connectors/trade-insight-sell-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "rest", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.rest.RestComponent", "name" : "TradeInsightSell", "scheme" : "trade-insight-sell", diff --git a/connectors/trade-insight-top-connector/src/main/resources/camel-connector.json b/connectors/trade-insight-top-connector/src/main/resources/camel-connector.json index e2618e7..565fc46 100644 --- a/connectors/trade-insight-top-connector/src/main/resources/camel-connector.json +++ b/connectors/trade-insight-top-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "rest", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.rest.RestComponent", "name" : "TradeInsightTop", "scheme" : "trade-insight-top", diff --git a/connectors/twitter-mention-connector/src/main/resources/camel-connector.json b/connectors/twitter-mention-connector/src/main/resources/camel-connector.json index a562bb5..d96c4ba 100644 --- a/connectors/twitter-mention-connector/src/main/resources/camel-connector.json +++ b/connectors/twitter-mention-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "twitter-timeline", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-twitter", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.twitter.timeline.TwitterTimelineComponent", "name" : "TwitterMention", "scheme" : "twitter-mention-connector", diff --git a/connectors/twitter-search-connector/src/main/resources/camel-connector.json b/connectors/twitter-search-connector/src/main/resources/camel-connector.json index ecc1b32..94441c7 100644 --- a/connectors/twitter-search-connector/src/main/resources/camel-connector.json +++ b/connectors/twitter-search-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "twitter-search", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-twitter", - "baseVersion" : "2.20.0.fuse-000106", + "baseVersion" : "2.20.0", "baseJavaType" : "org.apache.camel.component.twitter.search.TwitterSearchComponent", "name" : "TwitterSearch", "scheme" : "twitter-search-connector", diff --git a/pom.xml b/pom.xml index 50a4469..0b46e58 100644 --- a/pom.xml +++ b/pom.xml @@ -78,33 +78,6 @@ - - - jboss-ea - JBoss Early-access repository - https://repository.jboss.org/nexus/content/groups/ea/ - - true - - - false - - - - - - jboss-ea - JBoss Early-access repository - https://repository.jboss.org/nexus/content/groups/ea/ - - true - - - false - - - - UTF-8 UTF-8 @@ -112,7 +85,7 @@ 1.8 1.5.6.RELEASE - 2.20.0.fuse-000106 + 2.20.0 3.0.0