Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Quarkus to v1.3.1.Final #992

Merged
merged 4 commits into from
Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/pr-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 5 additions & 1 deletion integration-tests/infinispan/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
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;
Expand Down
10 changes: 9 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -746,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>
Expand Down