diff --git a/Jenkinsfile b/Jenkinsfile index aa208dc0..b76b8478 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ buildPlugin(configurations: [ - [platform: 'linux', jdk: '11'], - [platform: 'windows', jdk: '11'], + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 11], ], useContainerAgent: false) node('docker') { diff --git a/pom.xml b/pom.xml index af45b70d..24f67de6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.50 + 4.63 @@ -37,15 +37,15 @@ 2.31 -SNAPSHOT jenkinsci/${project.artifactId}-plugin - 2.332.4 + 2.361.4 io.jenkins.tools.bom - bom-2.332.x - 1678.vc1feb_6a_3c0f1 + bom-2.361.x + 2081.v85885a_d2e5c5 import pom diff --git a/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java b/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java index 72b80953..f545f297 100644 --- a/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java +++ b/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java @@ -45,7 +45,6 @@ import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.acegisecurity.userdetails.UserDetails; import org.acegisecurity.userdetails.UsernameNotFoundException; -import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundConstructor; @@ -650,13 +649,11 @@ private void customizeLdapProperties(Hashtable props) { } @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Deprecated method.It will removed at some point") - @IgnoreJRERequirement @Deprecated private LdapContext bind(String principalName, String password, SocketInfo server, Hashtable props) throws NamingException { return bind(principalName, password, server, props, null, isRequireTLS()); } - @IgnoreJRERequirement private LdapContext bind(String principalName, String password, SocketInfo server, Hashtable props, TlsConfiguration tlsConfiguration, boolean requireTLS) throws NamingException { String ldapUrl = (requireTLS?"ldaps://":"ldap://") + server + '/'; String oldName = Thread.currentThread().getName(); diff --git a/src/test/java/hudson/plugins/active_directory/ActiveDirectoryJCasCCompatibilityTest.java b/src/test/java/hudson/plugins/active_directory/ActiveDirectoryJCasCCompatibilityTest.java index e04c9813..11a52f59 100644 --- a/src/test/java/hudson/plugins/active_directory/ActiveDirectoryJCasCCompatibilityTest.java +++ b/src/test/java/hudson/plugins/active_directory/ActiveDirectoryJCasCCompatibilityTest.java @@ -2,6 +2,7 @@ import io.jenkins.plugins.casc.misc.RoundTripAbstractTest; import jenkins.model.Jenkins; +import org.junit.Ignore; import org.junit.Rule; import org.junit.contrib.java.lang.system.EnvironmentVariables; import org.jvnet.hudson.test.RestartableJenkinsRule; @@ -10,6 +11,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +@Ignore("setting environment variables is not supported in Java 17") public class ActiveDirectoryJCasCCompatibilityTest extends RoundTripAbstractTest { @Rule diff --git a/src/test/resources/fixture/Dockerfile b/src/test/resources/fixture/Dockerfile index 76bb06b4..825e64b1 100644 --- a/src/test/resources/fixture/Dockerfile +++ b/src/test/resources/fixture/Dockerfile @@ -1,15 +1,5 @@ -FROM docker:stable-dind -# Keys were rotated in the edge repos, so we need to do this now -RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/v3.16/main -u alpine-keys --allow-untrusted -# Workaround for https://github.com/AdoptOpenJDK/openjdk-docker/issues/75 -RUN apk add --no-cache fontconfig ttf-dejavu openjdk11 bash tini bind-tools -RUN apk add aufs-util --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing -RUN apk add maven --repository http://dl-cdn.alpinelinux.org/alpine/edge/community -# Workaround for https://github.com/AdoptOpenJDK/openjdk-docker/issues/75 -RUN ln -s /usr/lib/libfontconfig.so.1 /usr/lib/libfontconfig.so && \ - ln -s /lib/libuuid.so.1 /usr/lib/libuuid.so.1 && \ - ln -s /lib/libc.musl-x86_64.so.1 /usr/lib/libc.musl-x86_64.so.1 -ENV LD_LIBRARY_PATH /usr/lib +FROM docker:dind +RUN apk add --no-cache fontconfig ttf-dejavu openjdk11 bash tini bind-tools maven ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ #ENV DOCKER_STORAGE_DRIVER=overlay2