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

Add a constant for the Maven groupId #74

Merged
merged 1 commit into from
Jun 24, 2021
Merged

Add a constant for the Maven groupId #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions native-gradle-plugin/src/main/java/org/graalvm/buildtools/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class Utils {
public static final String NATIVE_TESTS_EXE = "native-tests" + EXECUTABLE_EXTENSION;
public static final String AGENT_FILTER = "agent-filter.json";
public static final String PERSIST_CONFIG_PROPERTY = "persistConfig";
public static final String MAVEN_GROUP_ID = "org.graalvm.buildtools";

public static Path getJavaHomeNativeImage(String javaHomeVariable, Boolean failFast) {
String graalHome = System.getenv(javaHomeVariable);
Expand Down
2 changes: 1 addition & 1 deletion native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ private void setAgentArgs(Project project, String sourceSetName, Task task, Bool
}

private void injectTestPluginDependencies(Project project) {
project.getDependencies().add("implementation", "org.graalvm.buildtools:junit-platform-native:"
project.getDependencies().add("implementation", Utils.MAVEN_GROUP_ID + ":junit-platform-native:"
+ VersionInfo.JUNIT_PLATFORM_NATIVE_VERSION);
}
}
1 change: 1 addition & 0 deletions native-maven-plugin/src/main/java/org/graalvm/buildtools/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public class Utils {
public static final String NATIVE_TESTS_EXE = "native-tests" + EXECUTABLE_EXTENSION;
public static final String AGENT_FILTER = "agent-filter.json";
public static final String PERSIST_CONFIG_PROPERTY = "persistConfig";
public static final String MAVEN_GROUP_ID = "org.graalvm.buildtools";

public static Path getJavaHomeNativeImage(String javaHomeVariable, Boolean failFast) {
String graalHome = System.getenv(javaHomeVariable);
Expand Down
2 changes: 1 addition & 1 deletion native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeTestMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private void runTests(Path targetFolder) throws MojoExecutionException {
private String getClassPath() throws MojoFailureException {
try {
List<Artifact> pluginDependencies = pluginArtifacts.stream()
.filter(it -> it.getGroupId().startsWith("org.graalvm.nativeimage") || it.getGroupId().startsWith("org.junit"))
.filter(it -> it.getGroupId().startsWith(Utils.MAVEN_GROUP_ID) || it.getGroupId().startsWith("org.junit"))
.collect(Collectors.toList());

List<String> projectClassPath = new ArrayList<>(project
Expand Down