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/30 14:40:03 UTC
[camel-quarkus] branch master updated (9f3c133 -> fcea692)
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-quarkus.git.
from 9f3c133 Add jaxb dependency #996
new 7af5e5a Update Quarkus to v1.3.1.Final
new d96f984 Update maven-jar-plugin to v3.2.0
new 4c7b302 Set MAVEN_OPTS for JVM build steps
new fcea692 Use ubi-quarkus-native-image:19.3.1-java8 as build image
The 4 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 | 4 ++++
integration-tests/infinispan/pom.xml | 6 +++++-
.../component/infinispan/InfinispanServerTestResource.java | 2 +-
pom.xml | 10 +++++++++-
4 files changed, 19 insertions(+), 3 deletions(-)
[camel-quarkus] 01/04: Update Quarkus to v1.3.1.Final
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-quarkus.git
commit 7af5e5a29633fbd50e1c9f78230efad7a238c54b
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sat Mar 28 15:35:54 2020 +0100
Update Quarkus to v1.3.1.Final
---
integration-tests/infinispan/pom.xml | 6 +++++-
.../quarkus/component/infinispan/InfinispanServerTestResource.java | 2 +-
pom.xml | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/integration-tests/infinispan/pom.xml b/integration-tests/infinispan/pom.xml
index 4b73a61..fe80a0a 100644
--- a/integration-tests/infinispan/pom.xml
+++ b/integration-tests/infinispan/pom.xml
@@ -123,7 +123,11 @@
</exclusions>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-commons-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<!--
We override these to satisfy Infinispan server, see:
diff --git a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
index ee2213e..e9dec75 100644
--- a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
+++ b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
@@ -20,13 +20,13 @@ import java.util.Collections;
import java.util.Map;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.infinispan.commons.test.TestResourceTracker;
import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.server.hotrod.HotRodServer;
import org.infinispan.server.hotrod.test.HotRodTestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.test.fwk.TestResourceTracker;
public class InfinispanServerTestResource implements QuarkusTestResourceLifecycleManager {
private HotRodServer hotRodServer;
diff --git a/pom.xml b/pom.xml
index b047941..b18ab9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<javassist.version>3.22.0-CR2</javassist.version><!-- debezium -->
<jetty.version>9.4.18.v20190429</jetty.version>
<kotlin.version>1.3.61</kotlin.version>
- <quarkus.version>1.3.0.Final</quarkus.version>
+ <quarkus.version>1.3.1.Final</quarkus.version>
<quarkus-qpid-jms.version>0.11.3</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
[camel-quarkus] 03/04: Set MAVEN_OPTS for JVM build steps
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-quarkus.git
commit 4c7b302645ec48910a88a99e6ca9ccce55aa9a93
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Mar 30 09:02:40 2020 +0100
Set MAVEN_OPTS for JVM build steps
---
.github/workflows/pr-build.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 75d6584..67afc45 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -35,6 +35,8 @@ env:
jobs:
build:
runs-on: ubuntu-latest
+ env:
+ MAVEN_OPTS: -Xmx3000m
steps:
- name: Set BRANCH_OPTIONS
if: github.base_ref == 'camel-master' || github.base_ref == 'quarkus-master'
@@ -63,6 +65,8 @@ jobs:
strategy:
matrix:
java: [ '11' , '12' ]
+ env:
+ MAVEN_OPTS: -Xmx3000m
steps:
- name: Set BRANCH_OPTIONS
if: github.base_ref == 'camel-master' || github.base_ref == 'quarkus-master'
[camel-quarkus] 02/04: Update maven-jar-plugin to v3.2.0
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-quarkus.git
commit d96f984b61d8e9b3f9461547368bd48223de9b4c
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sun Mar 29 18:04:23 2020 +0200
Update maven-jar-plugin to v3.2.0
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index b18ab9d..16c0588 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,7 @@
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<!-- NOTE: We pin to this version due to https://github.com/apache/camel-quarkus/issues/723 -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<cq-plugin.version>0.2.0</cq-plugin.version>
@@ -270,6 +271,12 @@
<version>${groovy-maven-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ </plugin>
+
<!-- license-maven-plugin is not necessarily relevant for user applications.
It is managed here so that we can have its config defined on a single place.
It is executed from profiles only -->
[camel-quarkus] 04/04: Use ubi-quarkus-native-image:19.3.1-java8 as
build image
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-quarkus.git
commit fcea69282dbef0487988e1647f1c3264bd98d23e
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Mar 30 11:35:42 2020 +0100
Use ubi-quarkus-native-image:19.3.1-java8 as build image
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 16c0588..5dad376 100644
--- a/pom.xml
+++ b/pom.xml
@@ -753,6 +753,7 @@
</property>
</activation>
<properties>
+ <quarkus.native.builder-image>quay.io/quarkus/ubi-quarkus-native-image:19.3.1-java8</quarkus.native.builder-image>
<quarkus.native.container-build>true</quarkus.native.container-build>
<quarkus.native.container-runtime>docker</quarkus.native.container-runtime>
</properties>