Skip to content

Commit

Permalink
Merge branch 'main' into issue-32595o
Browse files Browse the repository at this point in the history
  • Loading branch information
dcotfr authored Oct 28, 2023
2 parents 9cf8830 + 5afc0ec commit a10c7e4
Show file tree
Hide file tree
Showing 76 changed files with 1,801 additions and 413 deletions.
14 changes: 7 additions & 7 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<opentelemetry-alpha.version>1.30.0-alpha</opentelemetry-alpha.version>
<jaeger.version>1.8.1</jaeger.version>
<quarkus-http.version>5.0.3.Final</quarkus-http.version>
<micrometer.version>1.11.1</micrometer.version><!-- keep in sync with hdrhistogram -->
<micrometer.version>1.11.5</micrometer.version><!-- keep in sync with hdrhistogram -->
<hdrhistogram.version>2.1.12</hdrhistogram.version><!-- keep in sync with micrometer -->
<google-auth.version>0.22.0</google-auth.version>
<graphql-java.version>21.1</graphql-java.version> <!-- keep in sync with smallrye-graphql -->
Expand Down Expand Up @@ -84,8 +84,8 @@
<jakarta.websocket-api.version>2.1.1</jakarta.websocket-api.version>
<jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
<jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
<jaxb-runtime.version>4.0.3</jaxb-runtime.version>
<asm.version>9.5</asm.version>
<jaxb-runtime.version>4.0.4</jaxb-runtime.version>
<asm.version>9.6</asm.version>
<commons-io.version>2.13.0</commons-io.version>
<jboss-metadata-web.version>16.0.0.Final</jboss-metadata-web.version>
<maven-toolchain.version>3.0-alpha-2</maven-toolchain.version>
Expand All @@ -109,7 +109,7 @@
<narayana.version>7.0.0.Final</narayana.version>
<agroal.version>2.1</agroal.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
<elasticsearch-opensource-components.version>8.10.2</elasticsearch-opensource-components.version>
<elasticsearch-opensource-components.version>8.10.4</elasticsearch-opensource-components.version>
<rxjava.version>2.2.21</rxjava.version>
<wildfly.openssl-java.version>2.2.5.Final</wildfly.openssl-java.version>
<wildfly.openssl-linux.version>2.2.2.Final</wildfly.openssl-linux.version>
Expand Down Expand Up @@ -167,12 +167,12 @@
<maven-invoker.version>3.2.0</maven-invoker.version>
<awaitility.version>4.2.0</awaitility.version>
<jboss-logmanager.version>3.0.2.Final</jboss-logmanager.version>
<flyway.version>9.22.2</flyway.version>
<flyway.version>9.22.3</flyway.version>
<yasson.version>3.0.3</yasson.version>
<!-- liquibase-mongodb is not released everytime with liquibase anymore, but the two versions need to be compatible -->
<liquibase.version>4.24.0</liquibase.version>
<liquibase-mongodb.version>4.24.0</liquibase-mongodb.version>
<snakeyaml.version>2.1</snakeyaml.version>
<snakeyaml.version>2.2</snakeyaml.version>
<osgi.version>6.0.0</osgi.version>
<mongo-client.version>4.11.0</mongo-client.version>
<mongo-crypt.version>1.8.0</mongo-crypt.version>
Expand All @@ -190,7 +190,7 @@
<jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
<antlr.version>4.10.1</antlr.version><!-- needs to align with same property in build-parent/pom.xml -->
<quarkus-security.version>2.0.2.Final</quarkus-security.version>
<keycloak.version>22.0.4</keycloak.version>
<keycloak.version>22.0.5</keycloak.version>
<logstash-gelf.version>1.15.1</logstash-gelf.version>
<checker-qual.version>3.38.0</checker-qual.version>
<error-prone-annotations.version>2.22.0</error-prone-annotations.version>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@

<!-- The image to use for tests that run Keycloak -->
<!-- IMPORTANT: If this is changed you must also update bom/application/pom.xml and KeycloakBuildTimeConfig/DevServicesConfig in quarkus-oidc/deployment to match the version -->
<keycloak.version>22.0.4</keycloak.version>
<keycloak.version>22.0.5</keycloak.version>
<keycloak.wildfly.version>19.0.3</keycloak.wildfly.version>
<keycloak.docker.image>quay.io/keycloak/keycloak:${keycloak.version}</keycloak.docker.image>
<keycloak.docker.legacy.image>quay.io/keycloak/keycloak:${keycloak.wildfly.version}-legacy</keycloak.docker.legacy.image>
Expand Down
21 changes: 1 addition & 20 deletions core/builder/src/main/java/io/quarkus/builder/BuildChain.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,17 @@
*/
public final class BuildChain {
private final Set<ItemId> initialIds;
private final int initialSingleCount;
private final int initialMultiCount;
private final Set<ItemId> finalIds;
private final List<StepInfo> startSteps;
private final Set<ItemId> consumed;
private final List<BuildProvider> providers;
private final int endStepCount;
private final ClassLoader classLoader;

BuildChain(final int initialSingleCount, final int initialMultiCount, final Set<StepInfo> startSteps,
final Set<ItemId> consumed, BuildChainBuilder builder, final int endStepCount) {
BuildChain(final Set<StepInfo> startSteps, BuildChainBuilder builder, final int endStepCount) {
providers = builder.getProviders();
initialIds = builder.getInitialIds();
finalIds = builder.getFinalIds();
this.initialSingleCount = initialSingleCount;
this.initialMultiCount = initialMultiCount;
this.startSteps = new ArrayList<>(startSteps);
this.consumed = consumed;
this.endStepCount = endStepCount;
this.classLoader = builder.getClassLoader();
}
Expand Down Expand Up @@ -96,22 +89,10 @@ boolean hasInitial(final ItemId itemId) {
return initialIds.contains(itemId);
}

int getInitialSingleCount() {
return initialSingleCount;
}

int getInitialMultiCount() {
return initialMultiCount;
}

List<StepInfo> getStartSteps() {
return startSteps;
}

Set<ItemId> getConsumed() {
return consumed;
}

Set<ItemId> getFinalIds() {
return finalIds;
}
Expand Down
Loading

0 comments on commit a10c7e4

Please sign in to comment.