You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/03/31 14:22:37 UTC
[camel-k-runtime] branch master updated (7a4fa40 -> 2f7eb1e)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git.
from 7a4fa40 Merge pull request #286 from apache/commons-lang3
new 5aa0227 Add platform-http capability
new 2f7eb1e Update JDK in Jenkinsfile
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 2 +-
.../camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy | 2 ++
.../src/it/generate-catalog-quarkus/verify.groovy | 2 ++
.../java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 6 ++++++
4 files changed, 11 insertions(+), 1 deletion(-)
[camel-k-runtime] 01/02: Add platform-http capability
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 5aa0227c2e4a16763a27588b9ac29c50c2b7af41
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Mar 31 15:48:48 2020 +0200
Add platform-http capability
---
.../camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy | 2 ++
.../src/it/generate-catalog-quarkus/verify.groovy | 2 ++
.../java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 6 ++++++
3 files changed, 10 insertions(+)
diff --git a/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy
index 570e81d..3faf58c 100644
--- a/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy
+++ b/tooling/camel-k-maven-plugin/src/it/generate-catalog-main/verify.groovy
@@ -30,6 +30,8 @@ new File(basedir, "catalog.yaml").withReader {
assert catalog.spec.runtime.capabilities['rest'].dependencies[0].artifactId == 'camel-rest'
assert catalog.spec.runtime.capabilities['rest'].dependencies[1].groupId == 'org.apache.camel.k'
assert catalog.spec.runtime.capabilities['rest'].dependencies[1].artifactId == 'camel-k-runtime-http'
+ assert catalog.spec.runtime.capabilities['platform-http'].dependencies[0].groupId == 'org.apache.camel.k'
+ assert catalog.spec.runtime.capabilities['platform-http'].dependencies[0].artifactId == 'camel-k-runtime-http'
assert catalog.metadata.labels['camel.apache.org/runtime.version'] == runtimeVersion
diff --git a/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy b/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy
index af9d3db..74f44e0 100644
--- a/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy
+++ b/tooling/camel-k-maven-plugin/src/it/generate-catalog-quarkus/verify.groovy
@@ -30,6 +30,8 @@ new File(basedir, "catalog.yaml").withReader {
assert catalog.spec.runtime.capabilities['rest'].dependencies[0].artifactId == 'camel-quarkus-rest'
assert catalog.spec.runtime.capabilities['rest'].dependencies[1].groupId == 'org.apache.camel.quarkus'
assert catalog.spec.runtime.capabilities['rest'].dependencies[1].artifactId == 'camel-quarkus-platform-http'
+ assert catalog.spec.runtime.capabilities['platform-http'].dependencies[0].groupId == 'org.apache.camel.quarkus'
+ assert catalog.spec.runtime.capabilities['platform-http'].dependencies[0].artifactId == 'camel-quarkus-platform-http'
assert catalog.metadata.labels['camel.apache.org/runtime.version'] == runtimeVersion
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
index b1637a2..99de096 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
@@ -130,6 +130,9 @@ public class GenerateCatalogMojo extends AbstractMojo {
"health",
CamelCapability.forArtifact("org.apache.camel.k", "camel-k-runtime-health"));
runtimeSpec.putCapability(
+ "platform-http",
+ CamelCapability.forArtifact("org.apache.camel.k", "camel-k-runtime-http"));
+ runtimeSpec.putCapability(
"rest",
new CamelCapability.Builder()
.addDependency("org.apache.camel", "camel-rest")
@@ -147,6 +150,9 @@ public class GenerateCatalogMojo extends AbstractMojo {
"health",
CamelCapability.forArtifact("org.apache.camel.quarkus", "camel-quarkus-microprofile-health"));
runtimeSpec.putCapability(
+ "platform-http",
+ CamelCapability.forArtifact("org.apache.camel.quarkus", "camel-quarkus-platform-http"));
+ runtimeSpec.putCapability(
"rest",
new CamelCapability.Builder()
.addDependency("org.apache.camel.quarkus", "camel-quarkus-rest")
[camel-k-runtime] 02/02: Update JDK in Jenkinsfile
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 2f7eb1e3db9467c95344982f89af664f3db5a839
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Mar 31 16:05:33 2020 +0200
Update JDK in Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4a261b8..5d50293 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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 1.8 (latest)'
+def JDK_NAME = env.JDK_NAME ?: 'JDK 11 (latest)'
def MAVEN_PARAMS = "-U -e -fae -ntp -V -Dmaven.repo.local=${LOCAL_REPOSITORY}"