yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-08 15:30:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(pegasus): upgrade pegasus, remove gradle 8 hacks for pegasus plugin (#9798)

Browse Source
This commit is contained in:
david-leifker 2024-02-07 17:03:22 -06:00 committed by GitHub
parent 63322225d9
commit 09d4260b18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 2578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build.gradle
View File

@ -30,7 +30,7 @@ buildscript {
ext.junitJupiterVersion = '5.6.1' ext.junitJupiterVersion = '5.6.1'
// Releases: https://github.com/linkedin/rest.li/blob/master/CHANGELOG.md // Releases: https://github.com/linkedin/rest.li/blob/master/CHANGELOG.md
ext.pegasusVersion = '29.48.4' ext.pegasusVersion = '29.51.0'
ext.mavenVersion = '3.6.3' ext.mavenVersion = '3.6.3'
ext.springVersion = '6.1.2' ext.springVersion = '6.1.2'
ext.springBootVersion = '3.2.1' ext.springBootVersion = '3.2.1'
@ -269,13 +269,14 @@ allprojects {
apply plugin: 'eclipse' apply plugin: 'eclipse'
// apply plugin: 'org.gradlex.java-ecosystem-capabilities' // apply plugin: 'org.gradlex.java-ecosystem-capabilities'
tasks.withType(Test).configureEach { tasks.withType(Test).configureEach { task -> if (task.project.name != "metadata-io") {
// https://docs.gradle.org/current/userguide/performance.html // https://docs.gradle.org/current/userguide/performance.html
maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1 maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
if (project.configurations.getByName("testImplementation").getDependencies() if (project.configurations.getByName("testImplementation").getDependencies()
.any{ it.getName().contains("testng") }) { .any { it.getName().contains("testng") }) {
useTestNG() useTestNG()
}
} }
} }

3
buildSrc/build.gradle
View File

@ -25,7 +25,4 @@ dependencies {
compileOnly 'org.projectlombok:lombok:1.18.30' compileOnly 'org.projectlombok:lombok:1.18.30'
annotationProcessor 'org.projectlombok:lombok:1.18.30' annotationProcessor 'org.projectlombok:lombok:1.18.30'
// pegasus dependency, overrides for tasks
implementation 'com.linkedin.pegasus:gradle-plugins:29.48.4'
} }

2444
buildSrc/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java
View File

File diff suppressed because it is too large Load Diff

124
buildSrc/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java
View File

@ -1,124 +0,0 @@
package com.linkedin.pegasus.gradle.tasks;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.gradle.api.DefaultTask;
import org.gradle.api.file.FileCollection;
import org.gradle.api.specs.Specs;
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.SkipWhenEmpty;
import org.gradle.api.tasks.TaskAction;
import org.gradle.work.FileChange;
import org.gradle.work.InputChanges;
public class ChangedFileReportTask extends DefaultTask
{
private final Collection<String> _needCheckinFiles = new ArrayList<>();
private FileCollection _idlFiles = getProject().files();
private FileCollection _snapshotFiles = getProject().files();
public ChangedFileReportTask()
{
//with Gradle 6.0, Declaring an incremental task without outputs is not allowed.
getOutputs().upToDateWhen(Specs.satisfyNone());
}
// DataHub Note - updated for InputChanges
@TaskAction
public void checkFilesForChanges(InputChanges inputChanges)
{
getLogger().lifecycle("Checking idl and snapshot files for changes...");
getLogger().info("idlFiles: " + _idlFiles.getAsPath());
getLogger().info("snapshotFiles: " + _snapshotFiles.getAsPath());
Set<String> filesRemoved = new HashSet<>();
Set<String> filesAdded = new HashSet<>();
Set<String> filesChanged = new HashSet<>();
if (inputChanges.isIncremental())
{
Consumer<FileChange> handleChange = change ->
{
switch (change.getChangeType()) {
case ADDED:
filesAdded.add(change.getFile().getAbsolutePath());
break;
case REMOVED:
filesRemoved.add(change.getFile().getAbsolutePath());
break;
case MODIFIED:
filesChanged.add(change.getFile().getAbsolutePath());
break;
}
};
inputChanges.getFileChanges(_idlFiles).forEach(handleChange);
inputChanges.getFileChanges(_snapshotFiles).forEach(handleChange);
if (!filesRemoved.isEmpty())
{
String files = joinByComma(filesRemoved);
_needCheckinFiles.add(files);
getLogger().lifecycle(
"The following files have been removed, be sure to remove them from source control: {}", files);
}
if (!filesAdded.isEmpty())
{
String files = joinByComma(filesAdded);
_needCheckinFiles.add(files);
getLogger().lifecycle("The following files have been added, be sure to add them to source control: {}", files);
}
if (!filesChanged.isEmpty())
{
String files = joinByComma(filesChanged);
_needCheckinFiles.add(files);
getLogger().lifecycle(
"The following files have been changed, be sure to commit the changes to source control: {}", files);
}
}
}
private String joinByComma(Set<String> files)
{
return files.stream().collect(Collectors.joining(", "));
}
@InputFiles
@SkipWhenEmpty
public FileCollection getSnapshotFiles()
{
return _snapshotFiles;
}
public void setSnapshotFiles(FileCollection snapshotFiles)
{
_snapshotFiles = snapshotFiles;
}
@InputFiles
@SkipWhenEmpty
public FileCollection getIdlFiles()
{
return _idlFiles;
}
public void setIdlFiles(FileCollection idlFiles)
{
_idlFiles = idlFiles;
}
@Internal
public Collection<String> getNeedCheckinFiles()
{
return _needCheckinFiles;
}
}