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/10/23 12:09:46 UTC
[camel-k-runtime] branch master updated (6c152a1 -> 1e36b99)
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 6c152a1 yaml: regen
new ad66520 kamelet: use raw url
new 511f53b build(actions): disable http keepalive
new 1e36b99 build(actions): remove leftovers
The 3 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:
.github/workflows/ci-build.yml | 16 +++++++---------
.github/workflows/pr-validate.yml | 10 ++++++++--
.../apache/camel/component/kamelet/KameletComponent.java | 9 ++++++++-
3 files changed, 23 insertions(+), 12 deletions(-)
[camel-k-runtime] 02/03: build(actions): disable http keepalive
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 511f53bc66c40f711064035074feffc4b2776852
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 23 12:57:18 2020 +0200
build(actions): disable http keepalive
---
.github/workflows/ci-build.yml | 10 +++++++---
.github/workflows/pr-validate.yml | 10 ++++++++--
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index e2aa863..f3906d7 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -16,6 +16,10 @@
#
name: Build
+env:
+ MAVEN_OPTS: -Xmx3000m
+ MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
+
on:
push:
branches:
@@ -70,7 +74,7 @@ jobs:
version: ${{ matrix.java }}
- name: Build on ${{ matrix.java }}
run: |
- ./mvnw -V -B -ntp clean install
+ ./mvnw ${MAVEN_ARGS} -B clean install
build-native:
runs-on: ubuntu-latest
needs: build
@@ -109,7 +113,7 @@ jobs:
run: tar -xzf maven-repo-${{ github.run_id }}-${{ github.run_number }}.tgz -C ~
- name: Integration Test - ${{ matrix.native-image-project }}
run: |
- ./mvnw -V -B -ntp -nsu clean install \
+ ./mvnw ${MAVEN_ARGS} -B -nsu clean install \
-Dnative \
-Dnative-image.xmx=6g \
-Ddocker \
@@ -128,7 +132,7 @@ jobs:
with:
version: '11'
- name: Deploy to ASF Snapshots Repository
- run: ./mvnw -V clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
+ run: ./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
#
# JS build disabled as fails for OOM
diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
index 58ce713..b041abc 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -16,6 +16,10 @@
#
name: Validate PR
+env:
+ MAVEN_OPTS: -Xmx3000m
+ MAVEN_ARGS: -V -ntp -Dhttp.keepAlive=false -e
+
on:
pull_request:
branches:
@@ -36,7 +40,9 @@ jobs:
version: '11'
- name: mvn package
run: |
- ./mvnw -ntp clean verify \
+ ./mvnw ${MAVEN_ARGS} \
+ -Dhttp.keepAlive=false \
-Dcheckstyle.failOnViolation=true \
-DskipTests \
- -Psourcecheck,license
+ -Psourcecheck,license \
+ clean verify
[camel-k-runtime] 03/03: build(actions): remove leftovers
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 1e36b99256331984ef0d71e3a24d49e065b7c7d7
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 23 12:57:37 2020 +0200
build(actions): remove leftovers
---
.github/workflows/ci-build.yml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index f3906d7..c6d4d1a 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -133,9 +133,3 @@ jobs:
version: '11'
- name: Deploy to ASF Snapshots Repository
run: ./mvnw ${MAVEN_ARGS} clean deploy -DskipTests -DskipITs --settings .github/asf-deploy-settings.xml
-
-#
-# JS build disabled as fails for OOM
-# relates to: https://github.com/oracle/graal/issues/2129
-#
-
[camel-k-runtime] 01/03: kamelet: use raw url
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 ad66520a48959463820cd410ccd1dfb6a2744cfd
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Fri Oct 23 12:13:48 2020 +0200
kamelet: use raw url
---
.../org/apache/camel/component/kamelet/KameletComponent.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
index f072686..6908f30 100644
--- a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
+++ b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
@@ -35,6 +35,7 @@ import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.LifecycleStrategySupport;
import org.apache.camel.support.service.ServiceHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,7 +125,7 @@ public class KameletComponent extends DefaultComponent {
// determine the parameters that the kamelet should take by using the original
// uri as we need to preserve the original format.
- final String query = URISupport.extractQuery(uri);
+ final String query = StringHelper.after(uri, "?");
final Map<String, Object> queryParams = URISupport.parseQuery(query, true, true);
// replace resolved params with the original ones
@@ -175,6 +176,12 @@ public class KameletComponent extends DefaultComponent {
}
@Override
+ public boolean useRawUri() {
+ // should use encoded uri by default
+ return true;
+ }
+
+ @Override
protected void doInit() throws Exception {
getCamelContext().addLifecycleStrategy(lifecycleHandler);