Skip to content

Commit

Permalink
Upgrade to Quarkus 2.13.1.Final
Browse files Browse the repository at this point in the history
  • Loading branch information
@gsmet
gsmet committed Oct 5, 2022
1 parent 717af82 commit 311a58e
Show file tree
Hide file tree
Showing 7 changed files with 2,032 additions and 2,033 deletions.
18 changes: 9 additions & 9 deletions generated-platform-project/quarkus-camel/bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
<version>3.18.0</version>
<version>3.20.0</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
Expand Down Expand Up @@ -10598,22 +10598,22 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-api</artifactId>
<version>3.2.1</version>
<version>3.2.3</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-file</artifactId>
<version>3.2.1</version>
<version>3.2.3</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-json</artifactId>
<version>3.2.1</version>
<version>3.2.3</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
<version>3.2.1</version>
<version>3.2.3</version>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
Expand Down Expand Up @@ -10660,7 +10660,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-transforms</artifactId>
<version>3.2.1</version>
<version>3.2.3</version>
</dependency>
<dependency>
<groupId>org.apache.kudu</groupId>
Expand Down Expand Up @@ -10891,17 +10891,17 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-script-util</artifactId>
<version>1.7.10</version>
<version>1.7.20</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm-host</artifactId>
<version>1.7.10</version>
<version>1.7.20</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jvm</artifactId>
<version>1.7.10</version>
<version>1.7.20</version>
</dependency>
<dependency>
<groupId>org.jruby.jcodings</groupId>
Expand Down
21 changes: 10 additions & 11 deletions ...project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
import io.quarkus.maven.dependency.ArtifactCoords;
import io.quarkus.maven.dependency.ArtifactKey;
import io.quarkus.maven.dependency.Dependency;
import io.quarkus.maven.dependency.GACT;
import io.quarkus.maven.dependency.GACTV;
import io.quarkus.maven.dependency.ResolvedArtifactDependency;
import io.quarkus.runtime.LaunchMode;
import io.smallrye.common.expression.Expression;
Expand All @@ -59,7 +57,7 @@ public class QuarkusBootstrapProvider implements Closeable {
.concurrencyLevel(4).softValues().initialCapacity(10).build();

static ArtifactKey getProjectId(MavenProject project) {
return new GACT(project.getGroupId(), project.getArtifactId());
return ArtifactKey.ga(project.getGroupId(), project.getArtifactId());
}

public RepositorySystem repositorySystem() {
Expand Down Expand Up @@ -209,12 +207,13 @@ private CuratedApplication doBootstrap(QuarkusBootstrapMojo mojo, LaunchMode mod
final List<MavenProject> localProjects = mojo.mavenProject().getCollectedProjects();
final Set<ArtifactKey> localProjectKeys = new HashSet<>(localProjects.size());
for (MavenProject p : localProjects) {
localProjectKeys.add(new GACT(p.getGroupId(), p.getArtifactId()));
localProjectKeys.add(ArtifactKey.ga(p.getGroupId(), p.getArtifactId()));
}
reloadableModules = new HashSet<>(localProjects.size() + 1);
for (Artifact a : mojo.mavenProject().getArtifacts()) {
if (localProjectKeys.contains(new GACT(a.getGroupId(), a.getArtifactId()))) {
reloadableModules.add(new GACT(a.getGroupId(), a.getArtifactId(), a.getClassifier(), a.getType()));
if (localProjectKeys.contains(ArtifactKey.ga(a.getGroupId(), a.getArtifactId()))) {
reloadableModules
.add(ArtifactKey.of(a.getGroupId(), a.getArtifactId(), a.getClassifier(), a.getType()));
}
}
reloadableModules.add(appArtifact.getKey());
Expand All @@ -228,7 +227,6 @@ private CuratedApplication doBootstrap(QuarkusBootstrapMojo mojo, LaunchMode mod
} catch (AppModelResolverException e) {
throw new MojoExecutionException("Failed to bootstrap application in " + mode + " mode", e);
}

QuarkusBootstrap.Builder builder = QuarkusBootstrap.builder()
.setAppArtifact(appModel.getAppArtifact())
.setExistingModel(appModel)
Expand All @@ -237,6 +235,7 @@ private CuratedApplication doBootstrap(QuarkusBootstrapMojo mojo, LaunchMode mod
.setBuildSystemProperties(effectiveProperties)
.setProjectRoot(mojo.baseDir().toPath())
.setBaseName(mojo.finalName())
.setOriginalBaseName(mojo.mavenProject().getBuild().getFinalName())
.setTargetDirectory(mojo.buildDir().toPath())
.setForcedDependencies(forcedDependencies);

Expand Down Expand Up @@ -277,12 +276,12 @@ protected CuratedApplication bootstrapApplication(QuarkusBootstrapMojo mojo, Lau
return prodApp == null ? prodApp = doBootstrap(mojo, mode) : prodApp;
}

protected GACTV managingProject(QuarkusBootstrapMojo mojo) {
protected ArtifactCoords managingProject(QuarkusBootstrapMojo mojo) {
if (mojo.appArtifactCoords() == null) {
return null;
}
final Artifact artifact = mojo.mavenProject().getArtifact();
return new GACTV(artifact.getGroupId(), artifact.getArtifactId(),
return ArtifactCoords.of(artifact.getGroupId(), artifact.getArtifactId(),
artifact.getClassifier(), artifact.getArtifactHandler().getExtension(),
artifact.getVersion());
}
Expand Down Expand Up @@ -321,7 +320,7 @@ private ArtifactCoords appArtifact(QuarkusBootstrapMojo mojo)
}
final String groupId = coordsArr[0];
final String artifactId = coordsArr[1];
String classifier = "";
String classifier = ArtifactCoords.DEFAULT_CLASSIFIER;
String type = ArtifactCoords.TYPE_JAR;
String version = null;
if (coordsArr.length == 3) {
Expand Down Expand Up @@ -349,7 +348,7 @@ private ArtifactCoords appArtifact(QuarkusBootstrapMojo mojo)
}
}

return new GACTV(groupId, artifactId, classifier, type, version);
return ArtifactCoords.of(groupId, artifactId, classifier, type, version);
}

@Override
Expand Down
Loading

0 comments on commit 311a58e

Please sign in to comment.