Skip to content

Commit

Permalink
Revert "Update to Gradle 8.8 (#13584)" (#14175)
Browse files Browse the repository at this point in the history
This reverts commit f2ed7d6.

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
  • Loading branch information
reta authored Jun 11, 2024
1 parent cc98dbe commit 45e73c4
Show file tree
Hide file tree
Showing 27 changed files with 60 additions and 428 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -199,28 +199,7 @@ private JavaVersion determineJavaVersion(String description, File javaHome, Java
}

private JvmInstallationMetadata getJavaInstallation(File javaHome) {
InstallationLocation location = null;

try {
try {
// The InstallationLocation(File, String) is used by Gradle pre-8.8
location = (InstallationLocation) MethodHandles.publicLookup()
.findConstructor(InstallationLocation.class, MethodType.methodType(void.class, File.class, String.class))
.invokeExact(javaHome, "Java home");
} catch (Throwable ex) {
// The InstallationLocation::userDefined is used by Gradle post-8.7
location = (InstallationLocation) MethodHandles.publicLookup()
.findStatic(
InstallationLocation.class,
"userDefined",
MethodType.methodType(InstallationLocation.class, File.class, String.class)
)
.invokeExact(javaHome, "Java home");

}
} catch (Throwable ex) {
throw new IllegalStateException("Unable to find suitable InstallationLocation constructor / factory method", ex);
}
final InstallationLocation location = new InstallationLocation(javaHome, "Java home");

try {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ private void configureGeneralTaskDefaults(Project project) {
project.getTasks().withType(AbstractCopyTask.class).configureEach(t -> {
t.dependsOn(project.getTasks().withType(EmptyDirTask.class));
t.setIncludeEmptyDirs(true);
t.dirPermissions(perms -> perms.unix(0755));
t.filePermissions(perms -> perms.unix(0644));
t.setDirMode(0755);
t.setFileMode(0644);
});

// common config across all archives
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.ProjectDependency;
import org.gradle.api.internal.artifacts.ivyservice.LenientConfigurationInternal;
import org.gradle.api.internal.artifacts.ivyservice.ResolvedFilesCollectingVisitor;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.tasks.TaskProvider;

Expand All @@ -55,13 +53,9 @@ public TaskProvider<? extends Task> createTask(Project project) {
Configuration runtimeClasspath = project.getConfigurations().getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
Configuration compileOnly = project.getConfigurations()
.getByName(CompileOnlyResolvePlugin.RESOLVEABLE_COMPILE_ONLY_CONFIGURATION_NAME);

final ResolvedFilesCollectingVisitor visitor = new ResolvedFilesCollectingVisitor();
final LenientConfigurationInternal configuration = (LenientConfigurationInternal) runtimeClasspath.getResolvedConfiguration()
.getLenientConfiguration();
configuration.select(dependency -> dependency instanceof ProjectDependency == false).visitArtifacts(visitor, false);

t.setDependencies(project.files(visitor.getFiles()).minus(compileOnly));
t.setDependencies(
runtimeClasspath.fileCollection(dependency -> dependency instanceof ProjectDependency == false).minus(compileOnly)
);
});

// we also create the updateShas helper task that is associated with dependencyLicenses
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.file.FileCollection;
import org.gradle.api.file.FileTree;
import org.gradle.api.internal.artifacts.ivyservice.LenientConfigurationInternal;
import org.gradle.api.internal.artifacts.ivyservice.ResolvedFilesCollectingVisitor;
import org.gradle.api.provider.Property;
import org.gradle.api.specs.Spec;
import org.gradle.api.tasks.CacheableTask;
Expand Down Expand Up @@ -205,12 +203,11 @@ public Set<File> getJarsToScan() {
// or dependencies added as `files(...)`, we can't be sure if those are third party or not.
// err on the side of scanning these to make sure we don't miss anything
Spec<Dependency> reallyThirdParty = dep -> dep.getGroup() != null && dep.getGroup().startsWith("org.opensearch") == false;

Set<File> jars = getFiles(getRuntimeConfiguration(), reallyThirdParty);
Set<File> compileOnlyConfiguration = getFiles(
getProject().getConfigurations().getByName(CompileOnlyResolvePlugin.RESOLVEABLE_COMPILE_ONLY_CONFIGURATION_NAME),
reallyThirdParty
);
Set<File> jars = getRuntimeConfiguration().getResolvedConfiguration().getFiles(reallyThirdParty);
Set<File> compileOnlyConfiguration = getProject().getConfigurations()
.getByName(CompileOnlyResolvePlugin.RESOLVEABLE_COMPILE_ONLY_CONFIGURATION_NAME)
.getResolvedConfiguration()
.getFiles(reallyThirdParty);
// don't scan provided dependencies that we already scanned, e.x. don't scan cores dependencies for every plugin
if (compileOnlyConfiguration != null) {
jars.removeAll(compileOnlyConfiguration);
Expand Down Expand Up @@ -289,14 +286,6 @@ public void runThirdPartyAudit() throws IOException {
Files.write(getSuccessMarker().toPath(), new byte[] {});
}

private Set<File> getFiles(Configuration configuration, Spec<Dependency> spec) {
final ResolvedFilesCollectingVisitor visitor = new ResolvedFilesCollectingVisitor();
final LenientConfigurationInternal cfg = (LenientConfigurationInternal) configuration.getResolvedConfiguration()
.getLenientConfiguration();
cfg.select(spec).visitArtifacts(visitor, false);
return visitor.getFiles();
}

private void logForbiddenAPIsOutput(String forbiddenApisOutput) {
getLogger().error("Forbidden APIs output:\n{}==end of forbidden APIs==", forbiddenApisOutput);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ private void visitSymbolicLink(final FileCopyDetailsInternal details) {
visitedSymbolicLinks.add(details.getFile());
final TarArchiveEntry entry = new TarArchiveEntry(details.getRelativePath().getPathString(), TarConstants.LF_SYMLINK);
entry.setModTime(getModTime(details));
entry.setMode(UnixStat.LINK_FLAG | details.getPermissions().toUnixNumeric());
entry.setMode(UnixStat.LINK_FLAG | details.getMode());
try {
entry.setLinkName(Files.readSymbolicLink(details.getFile().toPath()).toString());
tar.putArchiveEntry(entry);
Expand All @@ -197,7 +197,7 @@ private void visitSymbolicLink(final FileCopyDetailsInternal details) {
private void visitDirectory(final FileCopyDetailsInternal details) {
final TarArchiveEntry entry = new TarArchiveEntry(details.getRelativePath().getPathString() + "/");
entry.setModTime(getModTime(details));
entry.setMode(UnixStat.DIR_FLAG | details.getPermissions().toUnixNumeric());
entry.setMode(UnixStat.DIR_FLAG | details.getMode());
try {
tar.putArchiveEntry(entry);
tar.closeArchiveEntry();
Expand All @@ -209,7 +209,7 @@ private void visitDirectory(final FileCopyDetailsInternal details) {
private void visitFile(final FileCopyDetailsInternal details) {
final TarArchiveEntry entry = new TarArchiveEntry(details.getRelativePath().getPathString());
entry.setModTime(getModTime(details));
entry.setMode(UnixStat.FILE_FLAG | details.getPermissions().toUnixNumeric());
entry.setMode(UnixStat.FILE_FLAG | details.getMode());
entry.setSize(details.getSize());
try {
tar.putArchiveEntry(entry);
Expand Down
20 changes: 5 additions & 15 deletions distribution/archives/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,11 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
with libFiles()
}
into('config') {
dirPermissions {
unix 0750
}
filePermissions {
unix 0660
}
dirMode 0750
fileMode 0660
with configFiles(distributionType, java)
from {
dirPermissions {
unix 0750
}
dirMode 0750
jvmOptionsDir.getParent()
}
}
Expand All @@ -67,17 +61,13 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
}
into('') {
from {
dirPermissions {
unix 0755
}
dirMode 0755
logsDir.getParent()
}
}
into('') {
from {
dirPermissions {
unix 0755
}
dirMode 0755
pluginsDir.getParent()
}
}
Expand Down
12 changes: 6 additions & 6 deletions distribution/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
if (it.relativePath.segments[-2] == 'bin' || ((platform == 'darwin-x64' || platform == 'darwin-arm64') && it.relativePath.segments[-2] == 'MacOS')) {
// bin files, wherever they are within modules (eg platform specific) should be executable
// and MacOS is an alternative to bin on macOS
it.permissions(perm -> perm.unix(0755))
it.mode = 0755
} else {
it.permissions(perm -> perm.unix(0644))
it.mode = 0644
}
}
def buildModules = buildModulesTaskProvider
Expand Down Expand Up @@ -413,7 +413,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
from '../src/bin'
exclude '*.exe'
exclude '*.bat'
eachFile { it.permissions(perm -> perm.unix(0755)) }
eachFile { it.setMode(0755) }
MavenFilteringHack.filter(it, expansionsForDistribution(distributionType, java))
}
// windows files, only for zip
Expand All @@ -431,7 +431,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
}
// module provided bin files
with copySpec {
eachFile { it.permissions(perm -> perm.unix(0755)) }
eachFile { it.setMode(0755) }
from project(':distribution').buildBin
if (distributionType != 'zip') {
exclude '*.bat'
Expand Down Expand Up @@ -473,7 +473,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
}
eachFile { FileCopyDetails details ->
if (details.relativePath.segments[-2] == 'bin' || details.relativePath.segments[-1] == 'jspawnhelper') {
details.permissions(perm -> perm.unix(0755))
details.mode = 0755
}
if (details.name == 'src.zip') {
details.exclude()
Expand Down Expand Up @@ -501,7 +501,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
}
eachFile { FileCopyDetails details ->
if (details.relativePath.segments[-2] == 'bin' || details.relativePath.segments[-1] == 'jspawnhelper') {
details.permissions(perm -> perm.unix(0755))
details.mode = 0755
}
}
}
Expand Down
60 changes: 16 additions & 44 deletions distribution/packages/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,7 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
}
from(rootProject.projectDir) {
include 'README.md'
filePermissions {
unix 0644
}
fileMode 0644
}
into('lib') {
with libFiles()
Expand All @@ -185,9 +183,9 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
directory('/' + segments[0..i].join('/'), 0755)
}
if (segments[-2] == 'bin' || segments[-1] == 'jspawnhelper') {
fcp.permissions(perm -> perm.unix(0755))
fcp.mode = 0755
} else {
fcp.permissions(perm -> perm.unix(0644))
fcp.mode = 0644
}
}
}
Expand All @@ -197,9 +195,7 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
if (type == 'deb') {
into("/usr/share/doc/${packageName}") {
from "${packagingFiles}/copyright"
filePermissions {
unix 0644
}
fileMode 0644
}
} else {
assert type == 'rpm'
Expand All @@ -208,9 +204,7 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
include 'APACHE-LICENSE-2.0.txt'
rename { 'LICENSE.txt' }
}
filePermissions {
unix 0644
}
fileMode 0644
}
}

Expand All @@ -219,9 +213,7 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
configurationFile '/etc/opensearch/jvm.options'
configurationFile '/etc/opensearch/log4j2.properties'
from("${packagingFiles}") {
dirPermissions {
unix 0750
}
dirMode 0750
into('/etc')
permissionGroup 'opensearch'
includeEmptyDirs true
Expand All @@ -231,12 +223,8 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
}
from("${packagingFiles}/etc/opensearch") {
into('/etc/opensearch')
dirPermissions {
unix 0750
}
filePermissions{
unix 0660
}
dirMode 0750
fileMode 0660
permissionGroup 'opensearch'
includeEmptyDirs true
createDirectoryEntry true
Expand All @@ -247,46 +235,34 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
into(new File(envFile).getParent()) {
fileType CONFIG | NOREPLACE
permissionGroup 'opensearch'
filePermissions {
unix 0660
}
fileMode 0660
from "${packagingFiles}/env/opensearch"
}

// ========= systemd =========
into('/usr/lib/tmpfiles.d') {
from "${packagingFiles}/systemd/opensearch.conf"
filePermissions {
unix 0644
}
fileMode 0644
}
into('/usr/lib/systemd/system') {
fileType CONFIG | NOREPLACE
from "${packagingFiles}/systemd/opensearch.service"
filePermissions {
unix 0644
}
fileMode 0644
}
into('/usr/lib/sysctl.d') {
fileType CONFIG | NOREPLACE
from "${packagingFiles}/systemd/sysctl/opensearch.conf"
filePermissions {
unix 0644
}
fileMode 0644
}
into('/usr/share/opensearch/bin') {
from "${packagingFiles}/systemd/systemd-entrypoint"
filePermissions {
unix 0755
}
fileMode 0755
}

// ========= sysV init =========
configurationFile '/etc/init.d/opensearch'
into('/etc/init.d') {
filePermissions {
unix 0750
}
fileMode 0750
fileType CONFIG | NOREPLACE
from "${packagingFiles}/init.d/opensearch"
}
Expand All @@ -302,9 +278,7 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
createDirectoryEntry true
user u
permissionGroup g
dirPermissions {
unix mode
}
dirMode mode
}
}
copyEmptyDir('/var/log/opensearch', 'opensearch', 'opensearch', 0750)
Expand Down Expand Up @@ -367,9 +341,7 @@ Closure commonDebConfig(boolean jdk, String architecture) {

into('/usr/share/lintian/overrides') {
from('src/deb/lintian/opensearch')
filePermissions {
unix 0644
}
fileMode 0644
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0
Loading

0 comments on commit 45e73c4

Please sign in to comment.