Skip to content

Commit

Permalink
Fix automatic module name of the change agent (fixes #29719)
Browse files Browse the repository at this point in the history
  • Loading branch information
triceo committed Feb 2, 2023
1 parent fcb7e7b commit 3441e73
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-class-change-agent</artifactId>
<artifactId>quarkus-klass-change-agent</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion core/class-change-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<relativePath>../../build-parent/pom.xml</relativePath>
</parent>

<artifactId>quarkus-class-change-agent</artifactId>
<!-- Using "klass" instead of "class", which is not allowed in automatic module name of the resulting JAR. -->
<artifactId>quarkus-klass-change-agent</artifactId>
<name>Quarkus - Core - Class Change Agent</name>
<description>
A Java Agent that exposes the instrumentation API. This allows for super fast
Expand Down
2 changes: 1 addition & 1 deletion core/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-class-change-agent</artifactId>
<artifactId>quarkus-klass-change-agent</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<parentFirstArtifact>org.junit.jupiter:junit-jupiter-params</parentFirstArtifact>
<parentFirstArtifact>org.junit.platform:junit-platform-commons</parentFirstArtifact>
<parentFirstArtifact>org.junit.platform:junit-platform-engine</parentFirstArtifact>
<parentFirstArtifact>io.quarkus:quarkus-class-change-agent</parentFirstArtifact>
<parentFirstArtifact>io.quarkus:quarkus-klass-change-agent</parentFirstArtifact>
<parentFirstArtifact>org.jacoco:org.jacoco.agent:runtime</parentFirstArtifact>
<parentFirstArtifact>io.quarkus:quarkus-bootstrap-gradle-resolver</parentFirstArtifact>
<parentFirstArtifact>io.quarkus:quarkus-junit5-mockito-config</parentFirstArtifact>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ private void addQuarkusDevModeDeps(GradleDevModeLauncher.Builder builder, Applic
if (!(artifactId.getGroup().equals("io.quarkus")
&& artifactId.getName().equals("quarkus-ide-launcher"))) {
if (artifactId.getGroup().equals("io.quarkus")
&& artifactId.getName().equals("quarkus-class-change-agent")) {
&& artifactId.getName().equals("quarkus-klass-change-agent")) {
builder.jvmArgs("-javaagent:" + appDep.getFile().getAbsolutePath());
} else {
builder.classpathEntry(ArtifactKey.of(appDep.getModuleVersion().getId().getGroup(), appDep.getName(),
Expand Down
2 changes: 1 addition & 1 deletion devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ private void addQuarkusDevModeDeps(MavenDevModeLauncher.Builder builder, Applica
final org.eclipse.aether.artifact.Artifact a = appDep.getArtifact();
if (!(a.getArtifactId().equals("quarkus-ide-launcher")
&& a.getGroupId().equals("io.quarkus"))) {
if (a.getArtifactId().equals("quarkus-class-change-agent")
if (a.getArtifactId().equals("quarkus-klass-change-agent")
&& a.getGroupId().equals("io.quarkus")) {
builder.jvmArgs("-javaagent:" + a.getFile().getAbsolutePath());
} else {
Expand Down

0 comments on commit 3441e73

Please sign in to comment.