Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
security:logging
gradle4_3_1
0003-Search-system-jar.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0003-Search-system-jar.patch of Package gradle4_3_1
From 6c195a384ceefaaa0a3a6baa5e9cfc2204b034b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de> Date: Mon, 2 Jan 2017 09:37:07 +0100 Subject: [PATCH 3/6] Search system jar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http://sources.debian.net/patches/gradle/3.2.1-1/search_system_jar.diff/ Description: Gradle searches its own directory for Java libraries ignoring /usr/share/java/. Somehow Gradle even fails to locate its home directory which is /usr/share/gradle/. This patch fixes these issues, and the large amount of symlinks in the binary packages may be possible to remove. Maintaining so many symlinks is too error prone. Author: Kai-Chung Yan (殷啟聰) --- .../internal/installation/CurrentGradleInstallationLocator.java | 8 +------- .../java/org/gradle/internal/installation/GradleInstallation.java | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/subprojects/core-api/src/main/java/org/gradle/internal/installation/CurrentGradleInstallationLocator.java b/subprojects/core-api/src/main/java/org/gradle/internal/installation/CurrentGradleInstallationLocator.java index 88d6b0be44d1..fe9086c5c291 100644 --- a/subprojects/core-api/src/main/java/org/gradle/internal/installation/CurrentGradleInstallationLocator.java +++ b/subprojects/core-api/src/main/java/org/gradle/internal/installation/CurrentGradleInstallationLocator.java @@ -51,13 +51,7 @@ abstract class CurrentGradleInstallationLocator { } private static File findDistDir(Class<?> clazz) { - File codeSource = ClasspathUtil.getClasspathForClass(clazz); - if (codeSource.isFile()) { - return determineDistRootDir(codeSource); - } else { - // Loaded from a classes dir - assume we're running from the ide or tests - return null; - } + return new File("/usr/share/gradle"); } /** diff --git a/subprojects/core-api/src/main/java/org/gradle/internal/installation/GradleInstallation.java b/subprojects/core-api/src/main/java/org/gradle/internal/installation/GradleInstallation.java index be3722a75994..b291431c7f5d 100644 --- a/subprojects/core-api/src/main/java/org/gradle/internal/installation/GradleInstallation.java +++ b/subprojects/core-api/src/main/java/org/gradle/internal/installation/GradleInstallation.java @@ -49,6 +49,7 @@ public class GradleInstallation { private static List<File> findLibDirs(File dir) { List<File> libDirAndSubdirs = new ArrayList<File>(); collectWithSubdirectories(new File(dir, "lib"), libDirAndSubdirs); + libDirAndSubdirs.add(new File("/usr/share/java")); return libDirAndSubdirs; } -- 2.14.3
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor