You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/04/08 18:10:40 UTC
[camel-quarkus] branch master updated (2789123 -> b115aeb)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 2789123 fix: use `xref` to link pages
new 80fbec1 Split SNAPSHOT repository activation into separate profiles
new 4ab3eed Try to work around SNAPSHOT download issues with maven.wagon.http.retryHandler.count
new 07a6461 Build Quarkus master branch instead of relying on indeterminate SNAPSHOT versions
new 96fc78b Do not skip tests for native builds
new b115aeb Use TrustStoreResource in Olingo4 test
The 5 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/pr-build.yaml | 38 ++++++++++++++++------
.mvn/maven.config | 2 +-
integration-tests/olingo4/pom.xml | 5 +++
.../quarkus/component/olingo4/it/Olingo4Test.java | 3 ++
pom.xml | 33 ++++++++++++-------
5 files changed, 59 insertions(+), 22 deletions(-)
[camel-quarkus] 02/05: Try to work around SNAPSHOT download issues
with maven.wagon.http.retryHandler.count
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4ab3eed2f4d9e6546e993c25f6071ab5d01409e4
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 8 14:56:17 2020 +0100
Try to work around SNAPSHOT download issues with maven.wagon.http.retryHandler.count
---
.mvn/maven.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mvn/maven.config b/.mvn/maven.config
index 3b3d7bc..4e8af9f 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1 +1 @@
--Dmaven.wagon.http.retryHandler.requestSentEnabled=true
+-Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10
[camel-quarkus] 05/05: Use TrustStoreResource in Olingo4 test
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b115aeb9eba459abb63a0c3fdcb972b896e5013e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 8 17:05:47 2020 +0100
Use TrustStoreResource in Olingo4 test
Fixes #1061
---
integration-tests/olingo4/pom.xml | 5 +++++
.../org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java | 3 +++
2 files changed, 8 insertions(+)
diff --git a/integration-tests/olingo4/pom.xml b/integration-tests/olingo4/pom.xml
index ec59fcb..140d4b6 100644
--- a/integration-tests/olingo4/pom.xml
+++ b/integration-tests/olingo4/pom.xml
@@ -76,6 +76,11 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-integration-test-support</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java b/integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java
index 845db3c..dcd89b6 100644
--- a/integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java
+++ b/integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java
@@ -18,9 +18,11 @@ package org.apache.camel.quarkus.component.olingo4.it;
import java.io.IOException;
+import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
+import org.apache.camel.quarkus.test.TrustStoreResource;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -35,6 +37,7 @@ import static org.apache.camel.quarkus.component.olingo4.it.Olingo4Resource.TEST
import static org.hamcrest.core.Is.is;
@QuarkusTest
+@QuarkusTestResource(TrustStoreResource.class)
class Olingo4Test {
private static String sessionId;
[camel-quarkus] 03/05: Build Quarkus master branch instead of
relying on indeterminate SNAPSHOT versions
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 07a646157a4e7001cc19828f45a2d07544a83d1a
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 8 14:57:48 2020 +0100
Build Quarkus master branch instead of relying on indeterminate SNAPSHOT versions
---
.github/workflows/pr-build.yaml | 37 ++++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 16c9498..c02e4ef 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -38,10 +38,21 @@ jobs:
env:
MAVEN_OPTS: -Xmx3000m
steps:
- - name: Set BRANCH_OPTIONS
- if: github.base_ref == 'camel-master' || github.base_ref == 'quarkus-master'
+ - name: Setup apache-snapshots profile
+ if: github.base_ref == 'camel-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ - name: Setup oss-snapshots profile
+ if: github.base_ref == 'quarkus-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots'
+ - name: Build Quarkus
+ if: github.base_ref == 'quarkus-master'
+ run: |
+ git clone --depth 1 --branch master https://github.com/quarkusio/quarkus.git \
+ && cd quarkus \
+ && echo "Current Quarkus commit:" $(git rev-parse HEAD) \
+ && ./mvnw -B clean install -DskipTests -DskipITs
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
@@ -68,10 +79,14 @@ jobs:
env:
MAVEN_OPTS: -Xmx3000m
steps:
- - name: Set BRANCH_OPTIONS
- if: github.base_ref == 'camel-master' || github.base_ref == 'quarkus-master'
+ - name: Setup apache-snapshots profile
+ if: github.base_ref == 'camel-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ - name: Setup oss-snapshots profile
+ if: github.base_ref == 'quarkus-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots'
- uses: actions/checkout@v2
- name: Set up JDK ${{ matrix.java }}
uses: joschi/setup-jdk@v1
@@ -204,10 +219,14 @@ jobs:
bean-validator
validator
steps:
- - name: Set BRANCH_OPTIONS
- if: github.base_ref == 'camel-master' || github.base_ref == 'quarkus-master'
+ - name: Setup apache-snapshots profile
+ if: github.base_ref == 'camel-master'
+ run: |
+ echo '::set-env name=BRANCH_OPTIONS::-Papache-snapshots'
+ - name: Setup oss-snapshots profile
+ if: github.base_ref == 'quarkus-master'
run: |
- echo '::set-env name=BRANCH_OPTIONS::-Psnapshots'
+ echo '::set-env name=BRANCH_OPTIONS::-Poss-snapshots'
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
[camel-quarkus] 04/05: Do not skip tests for native builds
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 96fc78b8f3996a9f420a193748a59025e85bbc8f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 8 15:39:12 2020 +0100
Do not skip tests for native builds
---
.github/workflows/pr-build.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index c02e4ef..c95d8f3 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -250,7 +250,6 @@ jobs:
eval ./mvnw -V -ntp ${BRANCH_OPTIONS} clean verify \
-Dnative \
-Ddocker \
- -DskipTests \
-pl "${modules[*]}"
# memoryhogs:
[camel-quarkus] 01/05: Split SNAPSHOT repository activation into
separate profiles
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 80fbec12616be95843d55e004505a77af4e649a9
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Apr 8 14:55:24 2020 +0100
Split SNAPSHOT repository activation into separate profiles
---
pom.xml | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5f3fcd4..35c243f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -801,7 +801,7 @@
</profile>
<profile>
- <id>snapshots</id>
+ <id>apache-snapshots</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
@@ -817,16 +817,6 @@
<enabled>false</enabled>
</releases>
</repository>
- <repository>
- <id>oss-snapshots-repo</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -839,6 +829,27 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <profile>
+ <id>oss-snapshots</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>oss-snapshots-repo</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
<pluginRepository>
<id>oss-snapshots-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>