Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix automatic module name of the change agent #30944

Merged
merged 2 commits into from
Feb 7, 2023
Merged

Fix automatic module name of the change agent #30944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcf25a0
Revert "Fix automatic module name of the change agent (fixes #29719)"
triceo Feb 7, 2023
528a312
Fix automatic module name of the change agent (fixes #30868)
triceo Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-klass-change-agent</artifactId>
<artifactId>quarkus-class-change-agent</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
5 changes: 3 additions & 2 deletions core/class-change-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
<relativePath>../../build-parent/pom.xml</relativePath>
</parent>

<!-- Using "klass" instead of "class", which is not allowed in automatic module name of the resulting JAR. -->
<artifactId>quarkus-klass-change-agent</artifactId>
<artifactId>quarkus-class-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 All @@ -32,6 +31,8 @@
<manifestEntries>
<Premain-Class>io.quarkus.changeagent.ClassChangeAgent</Premain-Class>
<Can-Redefine-Classes>true</Can-Redefine-Classes>
<!-- "class" is not accepted in module name. -->
<Automatic-Module-Name>quarkus.klass.change.agent</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion core/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-klass-change-agent</artifactId>
<artifactId>quarkus-class-change-agent</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/runtime/pom.xml
View file
Open in desktop
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-klass-change-agent</parentFirstArtifact>
<parentFirstArtifact>io.quarkus:quarkus-class-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
2 changes: 1 addition & 1 deletion ...ls/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java
View file
Open in desktop
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-klass-change-agent")) {
&& artifactId.getName().equals("quarkus-class-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
View file
Open in desktop
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-klass-change-agent")
if (a.getArtifactId().equals("quarkus-class-change-agent")
&& a.getGroupId().equals("io.quarkus")) {
builder.jvmArgs("-javaagent:" + a.getFile().getAbsolutePath());
} else {
Expand Down