Skip to content

Commit

Permalink
Merge branch 'main' into fixJaxb
Browse files Browse the repository at this point in the history
  • Loading branch information
gastaldi authored Sep 8, 2021
2 parents 19c20f9 + 5717733 commit a9f2a16
Show file tree
Hide file tree
Showing 554 changed files with 17,336 additions and 3,131 deletions.
2 changes: 1 addition & 1 deletion .github/native-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{
"category": "Data3",
"timeout": 70,
"test-modules": "flyway, hibernate-orm-panache, hibernate-orm-panache-kotlin, hibernate-orm-envers, liquibase",
"test-modules": "flyway, hibernate-orm-panache, hibernate-orm-panache-kotlin, hibernate-orm-envers, liquibase, liquibase-mongodb",
"os-name": "ubuntu-latest"
},
{
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,10 @@ jobs:
uses: actions/upload-artifact@v2
if: ${{ failure() || cancelled() }}
with:
name: "build-reports-JVM Tests - JDK ${{matrix.java.name}}"
name: "build-reports-Initial JDK 11 Build"
path: |
target/build-report.json
LICENSE.txt
retention-days: 2

calculate-test-jobs:
Expand Down Expand Up @@ -322,6 +323,7 @@ jobs:
path: |
**/target/*-reports/TEST-*.xml
target/build-report.json
LICENSE.txt
retention-days: 2
- name: Upload gc.log
uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -388,6 +390,7 @@ jobs:
path: |
**/target/*-reports/TEST-*.xml
target/build-report.json
LICENSE.txt
retention-days: 2

gradle-tests:
Expand Down Expand Up @@ -447,6 +450,7 @@ jobs:
**/build/test-results/test/TEST-*.xml
**/target/*-reports/TEST-*.xml
target/build-report.json
LICENSE.txt
retention-days: 2

devtools-tests:
Expand Down Expand Up @@ -506,6 +510,7 @@ jobs:
path: |
**/target/*-reports/TEST-*.xml
target/build-report.json
LICENSE.txt
retention-days: 2

tcks-test:
Expand Down Expand Up @@ -564,6 +569,7 @@ jobs:
path: |
**/target/*-reports/TEST-*.xml
target/build-report.json
LICENSE.txt
retention-days: 2

native-tests:
Expand Down Expand Up @@ -643,4 +649,5 @@ jobs:
**/target/*-reports/TEST-*.xml
**/build/test-results/test/TEST-*.xml
target/build-report.json
LICENSE.txt
retention-days: 2
83 changes: 58 additions & 25 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<bouncycastle.version>1.69</bouncycastle.version>
<bouncycastle.fips.version>1.0.2.1</bouncycastle.fips.version>
<bouncycastle.tls.fips.version>1.0.12.2</bouncycastle.tls.fips.version>
<jandex.version>2.3.1.Final</jandex.version>
<jandex.version>2.4.0.Final</jandex.version>
<resteasy.version>4.7.0.Final</resteasy.version>
<opentracing.version>0.33.0</opentracing.version>
<opentracing-jaxrs.version>1.0.0</opentracing-jaxrs.version>
Expand Down Expand Up @@ -45,15 +45,15 @@
<smallrye-config.version>2.4.4</smallrye-config.version>
<smallrye-health.version>3.1.1</smallrye-health.version>
<smallrye-metrics.version>3.0.1</smallrye-metrics.version>
<smallrye-open-api.version>2.1.10</smallrye-open-api.version>
<smallrye-graphql.version>1.3.1</smallrye-graphql.version>
<smallrye-open-api.version>2.1.12</smallrye-open-api.version>
<smallrye-graphql.version>1.3.2</smallrye-graphql.version>
<smallrye-opentracing.version>2.0.1</smallrye-opentracing.version>
<smallrye-fault-tolerance.version>5.2.1</smallrye-fault-tolerance.version>
<smallrye-jwt.version>3.2.1</smallrye-jwt.version>
<smallrye-context-propagation.version>1.2.0</smallrye-context-propagation.version>
<smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
<smallrye-reactive-types-converter.version>2.6.0</smallrye-reactive-types-converter.version>
<smallrye-mutiny-vertx-binding.version>2.12.0</smallrye-mutiny-vertx-binding.version>
<smallrye-mutiny-vertx-binding.version>2.13.0</smallrye-mutiny-vertx-binding.version>
<smallrye-reactive-messaging.version>3.9.1</smallrye-reactive-messaging.version>
<jakarta.activation.version>1.2.1</jakarta.activation.version>
<jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
Expand Down Expand Up @@ -109,7 +109,7 @@
<wildfly-elytron.version>1.16.1.Final</wildfly-elytron.version>
<jboss-modules.version>1.8.7.Final</jboss-modules.version>
<jboss-threads.version>3.4.2.Final</jboss-threads.version>
<vertx.version>4.1.2</vertx.version>
<vertx.version>4.1.3</vertx.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.14</httpcore.version>
<httpasync.version>4.1.4</httpasync.version>
Expand All @@ -120,7 +120,7 @@
<mariadb-jdbc.version>2.7.4</mariadb-jdbc.version>
<mysql-jdbc.version>8.0.26</mysql-jdbc.version>
<mssql-jdbc.version>7.2.2.jre8</mssql-jdbc.version>
<oracle-jdbc.version>21.1.0.0</oracle-jdbc.version>
<oracle-jdbc.version>21.3.0.0</oracle-jdbc.version>
<derby-jdbc.version>10.14.2.0</derby-jdbc.version>
<db2-jdbc.version>11.5.6.0</db2-jdbc.version>
<shrinkwrap.version>1.2.6</shrinkwrap.version>
Expand All @@ -131,7 +131,7 @@
<infinispan.version>12.1.7.Final</infinispan.version>
<infinispan.protostream.version>4.4.1.Final</infinispan.protostream.version>
<caffeine.version>2.9.2</caffeine.version>
<netty.version>4.1.65.Final</netty.version>
<netty.version>4.1.67.Final</netty.version>
<reactive-streams.version>1.0.3</reactive-streams.version>
<jboss-logging.version>3.4.2.Final</jboss-logging.version>
<mutiny.version>1.0.0</mutiny.version>
Expand All @@ -145,7 +145,7 @@
<aws-lambda-java-events.version>3.10.0</aws-lambda-java-events.version>
<aws-lambda-serverless-java-container.version>1.6</aws-lambda-serverless-java-container.version>
<aws-xray.version>2.9.1</aws-xray.version>
<awssdk.version>2.17.29</awssdk.version>
<awssdk.version>2.17.35</awssdk.version>
<aws-alexa-sdk.version>2.40.0</aws-alexa-sdk.version>
<azure-functions-java-library.version>1.4.2</azure-functions-java-library.version>
<kotlin.version>1.5.30</kotlin.version>
Expand All @@ -156,27 +156,28 @@
<awaitility.version>4.1.0</awaitility.version>
<jboss-logmanager.version>1.0.9</jboss-logmanager.version>
<jgit.version>5.12.0.202106070339-r</jgit.version>
<flyway.version>7.14.0</flyway.version>
<flyway.version>7.15.0</flyway.version>
<yasson.version>1.0.9</yasson.version>
<liquibase.version>4.4.3</liquibase.version>
<liquibase-mongodb.version>4.4.3</liquibase-mongodb.version>
<snakeyaml.version>1.29</snakeyaml.version>
<osgi.version>6.0.0</osgi.version>
<neo4j-java-driver.version>4.3.4</neo4j-java-driver.version>
<mongo-client.version>4.3.1</mongo-client.version>
<mongo-client.version>4.3.2</mongo-client.version>
<mongo-crypt.version>1.2.1</mongo-crypt.version>
<artemis.version>2.17.0</artemis.version>
<proton-j.version>0.33.8</proton-j.version>
<proton-j.version>0.33.9</proton-j.version>
<okhttp.version>3.14.9</okhttp.version>
<sentry.version>5.1.2</sentry.version>
<hibernate-quarkus-local-cache.version>0.1.0</hibernate-quarkus-local-cache.version>
<kubernetes-client.version>5.7.0</kubernetes-client.version>
<kubernetes-client.version>5.7.2</kubernetes-client.version>
<flapdoodle.mongo.version>2.2.0</flapdoodle.mongo.version>
<quarkus-spring-api.version>5.2.SP4</quarkus-spring-api.version>
<quarkus-spring-data-api.version>2.1.SP2</quarkus-spring-data-api.version>
<quarkus-spring-security-api.version>5.2.Final</quarkus-spring-security-api.version>
<quarkus-spring-boot-api.version>2.1.SP1</quarkus-spring-boot-api.version>
<mockito.version>3.12.4</mockito.version>
<jna.version>5.3.1</jna.version><!-- should satisfy both testcontainers and mongodb -->
<jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
<antlr.version>4.9.2</antlr.version>
<quarkus-security.version>1.1.4.Final</quarkus-security.version>
<keycloak.version>14.0.0</keycloak.version>
Expand Down Expand Up @@ -352,6 +353,15 @@
<scope>import</scope>
</dependency>

<!-- Oracle JDBC driver -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc-bom</artifactId>
<version>${oracle-jdbc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Mutiny and Vert.x Mutiny Binding BOMs -->
<dependency>
<groupId>io.smallrye.reactive</groupId>
Expand Down Expand Up @@ -818,6 +828,16 @@
<artifactId>quarkus-liquibase-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-liquibase-mongodb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-liquibase-mongodb-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-orm</artifactId>
Expand Down Expand Up @@ -1540,13 +1560,6 @@
<artifactId>quarkus-vertx-http-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-http-deployment</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-web</artifactId>
Expand Down Expand Up @@ -1607,6 +1620,11 @@
<artifactId>quarkus-mailer</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-mailer-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-mongodb-client</artifactId>
Expand Down Expand Up @@ -1924,6 +1942,21 @@
<artifactId>quarkus-amazon-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-amazon-lambda-event-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-amazon-lambda-http-event-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-amazon-lambda-rest-event-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-amazon-common-deployment</artifactId>
Expand Down Expand Up @@ -4488,11 +4521,6 @@
<artifactId>mssql-jdbc</artifactId>
<version>${mssql-jdbc.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${oracle-jdbc.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
Expand Down Expand Up @@ -5061,6 +5089,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.liquibase.ext</groupId>
<artifactId>liquibase-mongodb</artifactId>
<version>${liquibase-mongodb.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<failsafe-plugin.version>${version.surefire.plugin}</failsafe-plugin.version>

<!-- jandex maven plugin version -->
<jandex-maven-plugin.version>1.1.1</jandex-maven-plugin.version>
<jandex-maven-plugin.version>1.2.0</jandex-maven-plugin.version>

<!-- These properties are needed in order for them to be resolvable by the documentation -->
<!-- The Graal version we suggest using in documentation - as that's
Expand Down
4 changes: 4 additions & 0 deletions core/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-development-mode-spi</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public interface Capability {

String RESTEASY_MUTINY = RESTEASY + ".mutiny";
String RESTEASY_REACTIVE = RESTEASY + ".reactive";
String RESTEASY_REACTIVE_JSON = RESTEASY_REACTIVE + ".json";
String RESTEASY_REACTIVE_JSON_JACKSON = RESTEASY_REACTIVE_JSON + ".jackson";
String RESTEASY_REACTIVE_JSON_JSONB = RESTEASY_REACTIVE_JSON + ".jsonb";

String JWT = QUARKUS_PREFIX + "jwt";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public enum Feature {
KUBERNETES,
KUBERNETES_CLIENT,
LIQUIBASE,
LIQUIBASE_MONGODB,
LOGGING_GELF,
MAILER,
MICROMETER,
Expand Down
Loading

0 comments on commit a9f2a16

Please sign in to comment.