diff --git a/build.gradle b/build.gradle index cca8011..90cbe6f 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,6 @@ ext { } subprojects { - apply from: rootProject.file('gradle/ide/idea.gradle') apply from: rootProject.file('gradle/repositories/maven.gradle') apply from: rootProject.file('gradle/compile/java.gradle') apply from: rootProject.file('gradle/test/junit5.gradle') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6aba25..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/net-path/src/main/java/org/xbib/net/path/structure/PathMatcher.java b/net-path/src/main/java/org/xbib/net/path/structure/PathMatcher.java index 89ab3a1..903086f 100644 --- a/net-path/src/main/java/org/xbib/net/path/structure/PathMatcher.java +++ b/net-path/src/main/java/org/xbib/net/path/structure/PathMatcher.java @@ -33,6 +33,7 @@ public class PathMatcher extends Path { Parameter.builder().domain(Parameter.Domain.PATH).enableSort()); } + @SuppressWarnings("this-scapes") public PathMatcher(String pathSpec, String pathSeparator, boolean trimTokens, diff --git a/net/src/main/java/org/xbib/net/SecurityRealm.java b/net/src/main/java/org/xbib/net/SecurityRealm.java index 8408dbb..e097f0d 100644 --- a/net/src/main/java/org/xbib/net/SecurityRealm.java +++ b/net/src/main/java/org/xbib/net/SecurityRealm.java @@ -1,21 +1,15 @@ package org.xbib.net; -public abstract class SecurityRealm { +public interface SecurityRealm { - public SecurityRealm() { - } + String getName(); - /** - * @return unique name of this realm, e.g. "ldap" - */ - public abstract String getName(); + void init(); - /** - * Invoked during server startup and can be used to initialize internal state. - */ - public void init() { - } + Authenticator getAuthenticator(); - public abstract Authenticator getAuthenticator(); + UsersProvider getUsersProvider(); + + GroupsProvider getGroupsProvider(); }