Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: 'temurin'
java-version: 17
java-version: 21
cache: 'maven'
- name: Build camel-kamelets
run: ./mvnw -V -ntp clean install
Expand All @@ -85,7 +85,7 @@ jobs:
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: 'temurin'
java-version: 17
java-version: 21
- name: Deploy to ASF Snapshots Repository
# Deploy both artifacts and sources (maybe required by Camel K)
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-sbom-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '17' ]
java: [ '21' ]
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: 'temurin'
java-version: 17
java-version: 21
cache: 'maven'
- name: Build Kamelet libraries
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: 'temurin'
java-version: 17
java-version: 21
cache: 'maven'
- name: Build catalog 1st Run
run: ./mvnw clean install -DskipTests -DskipITs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-push-regen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: 'temurin'
java-version: 17
java-version: 21
cache: 'maven'
- name: Install Go
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.deploy
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0'
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
def JDK_NAME = env.JDK_NAME ?: 'jdk_21_latest'

def MAVEN_PARAMS = '-U -B -e -fae -V -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true'

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.ppc64le
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0'
def AGENT_LABEL = env.AGENT_LABEL ?: 'power9'
def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
def JDK_NAME = env.JDK_NAME ?: 'jdk_21_latest'

def MAVEN_PARAMS = '-U -B -e -fae -V -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true'

Expand Down
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
jdk:
- openjdk17
- openjdk21
2 changes: 1 addition & 1 deletion kamelets/databricks-sink.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ spec:
- "camel:jackson"
- "camel:kamelet"
- "camel:sql"
- "mvn:com.databricks:databricks-jdbc:3.1.1"
- "mvn:com.databricks:databricks-jdbc:3.2.1"
- "mvn:org.apache.commons:commons-dbcp2:2.14.0"
template:
beans:
Expand Down
2 changes: 1 addition & 1 deletion kamelets/databricks-source.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ spec:
- "camel:jackson"
- "camel:kamelet"
- "camel:sql"
- "mvn:com.databricks:databricks-jdbc:3.1.1"
- "mvn:com.databricks:databricks-jdbc:3.2.1"
- "mvn:org.apache.commons:commons-dbcp2:2.14.0"
template:
beans:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void testSupportedHeaders() throws Exception {
verifyHeaders("mysql-sink", 9);
verifyHeaders("mysql-source", 0);
verifyHeaders("nats-sink", 5);
verifyHeaders("nats-source", 7);
verifyHeaders("nats-source", 8);
verifyHeaders("oracle-database-sink", 9);
verifyHeaders("oracle-database-source", 0);
verifyHeaders("postgresql-sink", 9);
Expand Down
6 changes: 3 additions & 3 deletions library/camel-kamelets-crds/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>21</maven.compiler.release>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>

<fabric8-version>7.5.2</fabric8-version>
<maven-surefire-plugin-version>3.5.0</maven-surefire-plugin-version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ spec:
- "camel:jackson"
- "camel:kamelet"
- "camel:sql"
- "mvn:com.databricks:databricks-jdbc:3.1.1"
- "mvn:com.databricks:databricks-jdbc:3.2.1"
- "mvn:org.apache.commons:commons-dbcp2:2.14.0"
template:
beans:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ spec:
- "camel:jackson"
- "camel:kamelet"
- "camel:sql"
- "mvn:com.databricks:databricks-jdbc:3.1.1"
- "mvn:com.databricks:databricks-jdbc:3.2.1"
- "mvn:org.apache.commons:commons-dbcp2:2.14.0"
template:
beans:
Expand Down
10 changes: 5 additions & 5 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>4.19.0-SNAPSHOT</version>
<version>4.19.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.camel.kamelets</groupId>
Expand All @@ -43,9 +43,9 @@
</modules>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.release>21</maven.compiler.release>

<failIfNoTests>false</failIfNoTests>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -176,7 +176,7 @@
<exclude>**/README.md</exclude>
<exclude>**/ReadMe.md</exclude>
<exclude>**/resources/**/*.xsd</exclude>
<exclude>**/webapp/js/**/*</exclude>
<exclude>**/webapp/js/**/*</exclude>
<exclude>**/test/resources/**/*</exclude>
<exclude>**/test/data*/**/*</exclude>
<exclude>.gitignore</exclude>
Expand Down
2 changes: 1 addition & 1 deletion tests/camel-kamelets-itest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This folder contains a suite of integration tests for Kamelets

You need the following tools to run the tests:
- Java 17
- Java 21
- [JBang](https://www.jbang.dev/)
- [Camel JBang](https://camel.apache.org/manual/camel-jbang.html)
- [Citrus JBang App](https://citrusframework.org/citrus/reference/html/index.html#runtime-jbang-install)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ citrus.cluster.type=local
citrus.camel.jbang.max.attempts=10

# Camel JBang version (should align with version used in pom.xml)
citrus.camel.jbang.version=4.14.0
citrus.camel.jbang.version=4.19.0-SNAPSHOT
# Kamelets version (should point to the current snapshot release version)
citrus.camel.jbang.kamelets.version=4.15.0-SNAPSHOT
citrus.camel.jbang.kamelets.version=4.19.0-SNAPSHOT

# Enable dump of Camel JBang integration output
citrus.camel.jbang.dump.integration.output=true
Expand Down
Loading