This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kameleon.git
The following commit(s) were added to refs/heads/main by this push:
new 8504a6b Update camel to 3.17 (#19)
8504a6b is described below
commit 8504a6b577a228b2de1ade452f579b521a4bade4
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Thu Jun 2 10:00:31 2022 -0400
Update camel to 3.17 (#19)
---
.github/workflows/main.yml | 12 +-----------
pom.xml | 14 +++++++-------
src/main/docker/Dockerfile.jvm | 2 +-
.../camel/kameleon/generator/GeneratorService.java | 12 ++++++++----
src/main/resources/kameleon.json | 16 ++++++++--------
5 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9ec4877..0917abb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,13 +18,6 @@ jobs:
with:
path: main
- - name: Checkout Kamelet Catalogue
- uses: actions/checkout@v2
- with:
- repository: apache/camel-kamelets
- ref: v0.4.0
- path: camel-kamelets
-
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
@@ -39,10 +32,7 @@ jobs:
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- - name: Build Kamelet Catalogue
- run: mvn install -f camel-kamelets
-
- - name: Test application
+ - name: Build application
run: mvn compile test -f main
- name: Build application
diff --git a/pom.xml b/pom.xml
index fdae89d..d66a66d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.kameleon</groupId>
<artifactId>kameleon</artifactId>
- <version>0.2.0</version>
+ <version>0.3.0</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
@@ -33,15 +33,15 @@ under the License.
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <quarkus-plugin.version>2.3.0.Final</quarkus-plugin.version>
+ <quarkus-plugin.version>2.9.2.Final</quarkus-plugin.version>
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
- <quarkus.platform.version>2.3.0.Final</quarkus.platform.version>
+ <quarkus.platform.version>2.9.2.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
- <version.camel-quarkus>2.3.0</version.camel-quarkus>
- <version.camel-classic>3.11.3</version.camel-classic>
- <version.camel-kamelet>0.4.0</version.camel-kamelet>
- <version.maven-artifact>3.8.1</version.maven-artifact>
+ <version.camel-quarkus>2.9.0</version.camel-quarkus>
+ <version.camel-classic>3.17.0</version.camel-classic>
+ <version.camel-kamelet>0.8.1</version.camel-kamelet>
+ <version.maven-artifact>3.8.4</version.maven-artifact>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/src/main/docker/Dockerfile.jvm b/src/main/docker/Dockerfile.jvm
index 128eae5..0acfdfa 100644
--- a/src/main/docker/Dockerfile.jvm
+++ b/src/main/docker/Dockerfile.jvm
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
ARG JAVA_PACKAGE=java-11-openjdk-headless
ARG RUN_JAVA_VERSION=1.3.8
diff --git
a/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java
b/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java
index f579aeb..c9e39ba 100644
--- a/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java
+++ b/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java
@@ -67,11 +67,12 @@ public class GeneratorService {
if (!"quarkus".equals(type)) {
String folderName = temp.getAbsolutePath() + "/" + artifactId;
generateClassicArchetype(temp, type, archetypeVersion, groupId,
artifactId, version);
- if (Files.exists(Paths.get(folderName)) && !components.isBlank()
&& !components.isEmpty()) {
+ Path path = Paths.get(folderName);
+ if (Files.exists(path) && !components.isBlank() &&
!components.isEmpty()) {
addComponents(folderName, components);
setJavaVersion(folderName, javaVersion);
packageProject(folderName, zipFileName);
- } else if (Files.exists(Paths.get(folderName))) {
+ } else if (Files.exists(path)) {
setJavaVersion(folderName, javaVersion);
packageProject(folderName, zipFileName);
}
@@ -109,6 +110,8 @@ public class GeneratorService {
List<Plugin> plugins = model.getBuild().getPlugins();
Plugin mavenCompiler = plugins.stream().filter(p ->
p.getArtifactId().equals("maven-compiler-plugin")).findFirst().get();
Xpp3Dom config = (Xpp3Dom) mavenCompiler.getConfiguration();
+ if (config.getChild("source") == null) config.addChild(new
Xpp3Dom("source"));
+ if (config.getChild("target") == null) config.addChild(new
Xpp3Dom("target"));
config.getChild("source").setValue(javaVersion.equals("8") ? "1.8" :
javaVersion);
config.getChild("target").setValue(javaVersion.equals("8") ? "1.8" :
javaVersion);
mavenCompiler.setConfiguration(config);
@@ -159,7 +162,6 @@ public class GeneratorService {
request.setBatchMode(true);
request.setProperties(properties);
request.setBaseDirectory(folder);
-
execute(request);
}
@@ -174,12 +176,14 @@ public class GeneratorService {
}
private void execute(InvocationRequest request) throws
MavenInvocationException, IOException {
- Path localRepo = Files.exists(Paths.get(MAVEN_REPO)) ?
Paths.get(MAVEN_REPO) : Files.createDirectory(Paths.get(MAVEN_REPO));
+ Path path = Paths.get(MAVEN_REPO);
+ Path localRepo = Files.exists(path) ? path :
Files.createDirectory(path);
Invoker invoker = new DefaultInvoker();
invoker.setMavenHome(new File(System.getenv("MAVEN_HOME")));
invoker.setLocalRepositoryDirectory(localRepo.toFile());
invoker.execute(request);
+
}
private void packageProject(String folder, String filename) {
diff --git a/src/main/resources/kameleon.json b/src/main/resources/kameleon.json
index e522f74..2cad423 100644
--- a/src/main/resources/kameleon.json
+++ b/src/main/resources/kameleon.json
@@ -6,7 +6,7 @@
"componentListTitle": "Camel components",
"versions": [
{
- "name": "3.11.3",
+ "name": "3.17.0",
"suffix": "LTS",
"javaVersions": ["11", "1.8"],
"defaultJava": "11",
@@ -15,7 +15,7 @@
"archetypeArtifactId": "camel-archetype-main"
},
{
- "name": "3.7.6",
+ "name": "3.14.3",
"suffix": "LTS",
"javaVersions": ["11", "1.8"],
"defaultJava": "11",
@@ -40,7 +40,7 @@
"componentListTitle": "Camel components",
"versions": [
{
- "name": "3.11.3",
+ "name": "3.17.0",
"suffix": "LTS",
"javaVersions": ["11", "1.8"],
"defaultJava": "11",
@@ -49,7 +49,7 @@
"archetypeArtifactId": "camel-archetype-spring-boot"
},
{
- "name": "3.7.6",
+ "name": "3.14.3",
"suffix": "LTS",
"javaVersions": ["11", "1.8"],
"defaultJava": "11",
@@ -74,7 +74,7 @@
"componentListTitle": "Camel components",
"versions": [
{
- "name": "3.11.3",
+ "name": "3.17.0",
"suffix": "LTS",
"javaVersions": ["11", "1.8"],
"defaultJava": "11",
@@ -83,7 +83,7 @@
"archetypeArtifactId": "camel-archetype-cdi"
},
{
- "name": "3.7.6",
+ "name": "3.14.3",
"suffix": "LTS",
"javaVersions": ["11", "1.8"],
"defaultJava": "11",
@@ -108,7 +108,7 @@
"componentListTitle": "Camel Quarkus extensions",
"versions": [
{
- "name": "2.3.0",
+ "name": "2.9.0",
"suffix": "",
"javaVersions": ["11"],
"defaultJava": "11",
@@ -124,7 +124,7 @@
"componentListTitle": "Kamelets",
"versions": [
{
- "name": "3.11.3",
+ "name": "3.17.0",
"suffix": "",
"javaVersions": ["11"],
"defaultJava": "11",
