Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Camel 4 #1563

Merged
merged 31 commits into from
Sep 5, 2023
Merged

Camel 4 #1563

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ef506f1
Update GH CI to use Java 17 for the Maven Archetype integration tests
orpiske Jul 13, 2023
3f68b7d
Version bump to 4.0.0-SNAPSHOT to align with Camel 4
orpiske Jun 19, 2023
c065ced
camel.version
orpiske Jun 19, 2023
3fb1d98
Fixed missing version for AssertJ
orpiske Jun 19, 2023
7eb4d52
Added missing version for testcontainers on the test module
orpiske Jun 19, 2023
11b16ea
Removed references to the ActiveMQ from the SJMS2
orpiske Jun 19, 2023
99a68ee
Added missing version for testcontainers on the test module
orpiske Jun 19, 2023
fac56c7
Fixed a circular dependency making it hard to bootstrap the project w…
orpiske Jun 19, 2023
2034976
Bump minimum Java version to 17
orpiske Jun 19, 2023
aee8713
Adjust to use Maven versions that support Java 17
orpiske Jun 19, 2023
8e95f31
Fixed missing commons-dbcp2 version
orpiske Jun 19, 2023
4049cc8
Fixed missing versions in POM files
orpiske Jun 19, 2023
3ef7180
Fixes core according to Camel 4 changes
orpiske Jun 19, 2023
d743cfb
Removed ActiveMQ from parent pom
orpiske Jun 20, 2023
2cda6d6
Stop adding ActiveMQ as a dependency for the sjms2 connector
orpiske Jun 20, 2023
c60ed13
Made the sjms2 tests compatible with Jakarta
orpiske Jun 20, 2023
0eb7851
Converted CXF to build with Jakarta 10
orpiske Jun 20, 2023
c103011
Removed the elasticsearch connector because it was replaced by a new …
orpiske Jun 19, 2023
070bb30
Removed the RabbitMQ connector because it was removed on Camel 4
orpiske Jun 19, 2023
0738355
Removed the ActiveMQ JMS connector because it was removed on Camel 4
orpiske Jun 19, 2023
7ee3d5c
Removed the elasticsearch connector tests because it was replaced by …
orpiske Jun 19, 2023
d060a1e
Removed the RabbitMQ connector tests because it was removed on Camel 4
orpiske Jun 19, 2023
47877f9
Removed the Solr connector tests because it was removed on Camel 4
orpiske Jun 19, 2023
d6298a2
Removed the websocket connector because it was removed on Camel 4
orpiske Jun 19, 2023
a220d9b
Added plexus-build-api version.
valdar Aug 28, 2023
a21dc36
Updated mvnw
valdar Aug 28, 2023
43ca6f3
regen after update to camel 4.0.0
valdar Sep 4, 2023
5752009
Updated slf4 and guava dependencies.
valdar Sep 4, 2023
ec73852
Fixed tests.
valdar Sep 4, 2023
6a5054f
Added back elasticsearch tests.
valdar Sep 5, 2023
bdcafdb
Fixed maven connector generation plugin tests.
valdar Sep 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/maven-it.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '17' ]
java: [ '17' ]
steps:
- uses: actions/[email protected]
- name: Set up JDK ${{ matrix.java }}
Expand Down
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# 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.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
<artifactId>archetypes</artifactId>
<version>3.21.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.kafkaconnector.archetypes</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
<artifactId>archetypes</artifactId>
<version>3.21.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.kafkaconnector.archetypes</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
<artifactId>archetypes</artifactId>
<version>3.21.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.kafkaconnector.archetypes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
<artifactId>parent</artifactId>
<version>3.21.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion buildingtools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
<artifactId>parent</artifactId>
<version>3.21.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions camel-kafka-connector-catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel.kafkaconnector</groupId>
<artifactId>parent</artifactId>
<version>3.21.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-cloudtrail-source-source",
"type": "source",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Receive data from an AWS Cloudtrail.\n\nThe basic authentication method for the Cloudtrail service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-cloudwatch-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Send data to Amazon CloudWatch metrics.\n\nThe basic authentication method for the AWS CloudWatch metrics service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the CloudWatch client loads the credentials through this provider and doesn't use the basic authentication method.\n\nYou can set the following properties in the header:\n\n`metric-name` \/ `ce-metricname` for the metric name.\n`metric-value` \/ `ce-metricvalue` for the metric value.\n`metric-unit` \/ `ce-metricunit` for the metric unit.\n`metric-timestamp` \/ `ce-metrictimestamp` for the metric timestamp.\n`metric-dimension-name` \/ `ce-metricdimensionname` for the dimension name.\n`metric-dimension-value` \/ `ce-metricdimensionvalue` for the dimension value."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-ddb-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Send data to Amazon DynamoDB. The sent data inserts, updates, or deletes an item on the specified AWS DynamoDB table.\n\nThe basic authentication method for the AWS DynamoDB service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the DynamoDB client loads the credentials through this provider and doesn't use the basic authentication method.\n\nThis Kamelet expects a JSON-formatted body and it must include the primary key values that define the DynamoDB item. The mapping between the JSON fields and table attribute values is done by key. For example, for '{\"username\":\"oscerd\", \"city\":\"Rome\"}' input, the Kamelet inserts or update an item in the specified AWS DynamoDB table and sets the values for the 'username' and 'city' attributes. \n\nFor PutItem operation the Json body defines all item attributes.\nFor DeleteItem operation the Json body defines only the primary key attributes that identify the item to delete.\nFor UpdateItem operation the Json body defines both key attributes to identify the item to be updated and all item attributes tht get updated on the item.\n\nThe given Json body can use \"key\" and \"item\" as top level properties. Both define a Json object that will be mapped to respective attribute value maps\n{\n \"key\": {},\n \"item\": {}\n}"
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-ddb-streams-source-source",
"type": "source",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Receive events from Amazon DynamoDB Streams.\n\nThe basic authentication method for the AWS DynamoDB Streams service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the DynamoDB Streams client loads the credentials through this provider and doesn't use the basic authentication method."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-ec2-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Check the status of EC2 instances\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS EC2 Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the EC2 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet.\n\nThe Kamelet expects the following headers to be set:\n\n- `instanceIds` \/ `ce-instanceids`: as a comma separated list of EC2 instance ids."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-eventbridge-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Send events to an Amazon Eventbridge Eventbus.\n\nThe basic authentication method for the Eventbridge service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Eventbridge client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the headers, you need to set the `resources-arn` \/ `ce-resources-arn` property to specify the ARN of resources related to the event.\n\nIn the headers, you need to set the `detail-type` \/ `ce-detail-type` property to specify the detail type related to the event.\n\nIn the headers, you need to set the `event-source` \/ `ce-event-source` property to specify the event source related to the event.\n\nIf you do not set the property in the header, the Kamelet uses the exchange ID for the file name."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-kinesis-firehose-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Send message to an AWS Kinesis Firehose Stream\n\nAccess Key\/Secret Key are the basic method for authenticating to the AWS Kinesis Firehose Service. These parameters are optional because the Kamelet provides the 'useDefaultCredentialsProvider'.\n\nWhen using a default Credentials Provider the Kinesis Firehose client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-kinesis-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Send data to AWS Kinesis.\n\nThe basic authentication method for the Kinesis service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Kinesis client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the `file` \/ `ce-partition` property to set the Kinesis partition key.\n\nIf you do not set the property in the header, the Kamelet uses the exchange ID for the partition key.\n\nYou can also set the `sequence-number` \/ `ce-sequencenumber` property in the header to specify the Sequence number."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-kinesis-source-source",
"type": "source",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Receive data from AWS Kinesis.\n\nThe basic authentication method for the Kinesis service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Kinesis client loads the credentials through this provider and doesn't use the basic authentication method.\n\nTwo headers will be duplicated with different names for clarity at sink level, CamelAwsKinesisPartitionKey will be duplicated into aws.kinesis.partition.key and CamelAwsKinesisSequenceNumber will be duplicated in aws.kinesis.sequence.number"
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-lambda-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Send a payload to an AWS Lambda function.\n\nThe basic authentication method for the Lambda service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the Lambda client loads the credentials through this provider and doesn't use the basic authentication method."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-redshift-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Send data to an AWS Redshift Database.\n\nThis Kamelet expects a JSON-formatted body. Use key:value pairs to map the JSON fields and parameters. For example, here is a query:\n\n'INSERT INTO accounts (username,city) VALUES (:#username,:#city)'\n\nHere is example input for the example query:\n\n'{ \"username\":\"oscerd\", \"city\":\"Rome\"}'"
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-redshift-source-source",
"type": "source",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Query data from an AWS RedShift Database."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-s3-cdc-source-source",
"type": "source",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Receive data from AWS SQS subscribed to Eventbridge Bus reporting events related to an S3 bucket or multiple buckets.\nAccess Key\/Secret Key are the basic method for authenticating to the AWS SQS Service.\nTo use this Kamelet you'll need to set up Eventbridge on your bucket and subscribe Eventbridge bus to an SQS Queue.\nFor doing this you'll need to enable Evenbridge notification on your bucket and creating a rule on Eventbridge console related to all the events on S3 bucket and pointing to the SQS Queue specified as parameter in this Kamelet."
},
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"groupId": "org.apache.camel.kafkaconnector",
"id": "camel-aws-s3-sink-sink",
"type": "sink",
"version": "3.20.1-SNAPSHOT",
"version": "4.0.0-SNAPSHOT",
"description": "Upload data to an Amazon S3 Bucket.\n\nThe basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.\n\nIf you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic authentication method.\n\nIn the header, you can optionally set the `file` \/ `ce-partition` property to specify the name of the file to upload.\n\nIf you do not set the property in the header, the Kamelet uses the exchange ID for the file name."
},
"properties": {
Expand Down
Loading