Skip to content

Commit

Permalink
Merge pull request #760 from gsmet/quarkus-2.16.1
Browse files Browse the repository at this point in the history
Upgrade to Quarkus 2.16.1.Final
  • Loading branch information
gsmet authored Feb 1, 2023
2 parents 9c01668 + e4a2ef3 commit 0d866dc
Show file tree
Hide file tree
Showing 9 changed files with 1,441 additions and 1,460 deletions.
10 changes: 5 additions & 5 deletions generated-platform-project/quarkus-camel/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10932,22 +10932,22 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-api</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-file</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-json</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
Expand Down Expand Up @@ -10994,7 +10994,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-transforms</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.kudu</groupId>
Expand Down
30 changes: 15 additions & 15 deletions generated-platform-project/quarkus-drools/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,52 +81,52 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.14.1</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.github.javaparser</groupId>
Expand Down Expand Up @@ -269,7 +269,7 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.0</version>
<version>4.7.1</version>
</dependency>
<dependency>
<groupId>io.github.bonigarcia</groupId>
Expand Down Expand Up @@ -1568,22 +1568,22 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.1</version>
<version>5.9.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.9.1</version>
<version>5.9.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.9.1</version>
<version>5.9.2</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.9.1</version>
<version>5.9.2</version>
</dependency>
<dependency>
<groupId>org.kie</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext;
import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContextConfig;
import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions;
import io.quarkus.bootstrap.util.BootstrapUtils;
import io.quarkus.bootstrap.workspace.ArtifactSources;
import io.quarkus.bootstrap.workspace.SourceDir;
Expand Down Expand Up @@ -1184,7 +1183,6 @@ private QuarkusDevModeLauncher newLauncher(Boolean debugPortOk) throws Exception
if (argsString != null) {
builder.applicationArgs(argsString);
}
propagateUserProperties(builder);

return builder.build();
}
Expand All @@ -1207,26 +1205,6 @@ private void setJvmArgs(Builder builder) throws Exception {

}

private void propagateUserProperties(MavenDevModeLauncher.Builder builder) {
Properties userProps = BootstrapMavenOptions.newInstance().getSystemProperties();
if (userProps == null) {
return;
}
final StringBuilder buf = new StringBuilder();
buf.append("-D");
for (Object o : userProps.keySet()) {
String name = o.toString();
final String value = userProps.getProperty(name);
buf.setLength(2);
buf.append(name);
if (value != null && !value.isEmpty()) {
buf.append('=');
buf.append(value);
}
builder.jvmArgs(buf.toString());
}
}

private void applyCompilerFlag(Optional<Xpp3Dom> compilerPluginConfiguration, String flagName,
Consumer<String> builderCall) {
compilerPluginConfiguration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ static ArtifactKey getProjectId(MavenProject project) {

static Map<Path, Model> getProjectMap(MavenSession session) {
final List<MavenProject> allProjects = session.getAllProjects();
if (allProjects == null) {
return Map.of();
}
final Map<Path, Model> projectModels = new HashMap<>(allProjects.size());
for (MavenProject mp : allProjects) {
mp.getOriginalModel().setPomFile(mp.getFile());
Expand Down
Loading

0 comments on commit 0d866dc

Please sign in to comment.