Skip to content

[Build] Fix the manifest target and source information for jdbc projects #121888

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

Merged
merged 1 commit into from
Feb 11, 2025
Merged

[Build] Fix the manifest target and source information for jdbc projects #121888

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: 0 additions & 1 deletion ...internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public class ElasticsearchJavaBasePlugin implements Plugin<Project> {

@Override
public void apply(Project project) {
project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
// make sure the global build info plugin is applied to the root project
project.getRootProject().getPluginManager().apply(GlobalBuildInfoPlugin.class);
buildParams = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class);
Expand Down
15 changes: 10 additions & 5 deletions x-pack/plugin/sql/jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,20 @@ dependencies {
testImplementation project(':modules:rest-root')
}

tasks.named("compileJava").configure {
java {
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
}

tasks.named("compileTestJava").configure {
targetCompatibility = buildParams.getMinimumRuntimeVersion()
sourceCompatibility = buildParams.getMinimumRuntimeVersion()
}

tasks.named("test").configure {
// reset the unit test classpath as using the shadow jar won't work due to relocated packages
classpath = sourceSets.test.runtimeClasspath
}

tasks.named("shadowJar").configure {
relocate 'com.fasterxml', 'shadow.fasterxml'
Expand All @@ -34,7 +43,3 @@ tasks.named("shadowJar").configure {
}
}

tasks.named("test").configure {
// reset the unit test classpath as using the shadow jar won't work due to relocated packages
classpath = sourceSets.test.runtimeClasspath
}
7 changes: 6 additions & 1 deletion x-pack/plugin/sql/sql-client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ dependencies {
testImplementation(testArtifact(project(xpackModule('core'))))
}

tasks.named("compileJava").configure {
java {
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
}

tasks.named("compileTestJava").configure {
targetCompatibility = buildParams.getMinimumRuntimeVersion()
sourceCompatibility = buildParams.getMinimumRuntimeVersion()
}

tasks.named('forbiddenApisMain').configure {
// does not depend on core, so only jdk and http signatures should be checked
replaceSignatureFiles 'jdk-signatures'
Expand Down
7 changes: 6 additions & 1 deletion x-pack/plugin/sql/sql-proto/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ dependencies {
}
}

tasks.named("compileJava").configure {
java {
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
}

tasks.named("compileTestJava").configure {
targetCompatibility = buildParams.getMinimumRuntimeVersion()
sourceCompatibility = buildParams.getMinimumRuntimeVersion()
}

tasks.named('forbiddenApisMain').configure {
//sql does not depend on server, so only jdk signatures should be checked
replaceSignatureFiles 'jdk-signatures'
Expand Down