Merge pull request #7 from FarmGeek4Life/waffle-update

[JENKINS-58207] Update Waffle and JNA to work with Jenkins 2.181+

Author: FarmGeek4Life

pom.xml

@@ -3,14 +3,16 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>3.40</version><!-- which version of Jenkins plugin pom is this plugin built against? -->
+    <version>3.50</version><!-- which version of Jenkins plugin pom is this plugin built against? -->
     <relativePath />
   </parent>
 
   <properties>
-    <jenkins.version>2.150.2</jenkins.version>
+    <jenkins.version>2.181</jenkins.version>
     <java.level>8</java.level>
-    <waffle.version>1.9.0</waffle.version>
+    <waffle.version>2.0.0</waffle.version>
+    <jna.version>5.3.1</jna.version>
+    <slf4j.version>2.0.0-alpha0</slf4j.version><!-- Upgraded over jenkins requirement because of Waffle -->
   </properties>
 
   <artifactId>NegotiateSSO</artifactId>
@@ -54,6 +56,31 @@
       <artifactId>waffle-jna</artifactId>
       <version>${waffle.version}</version>
     </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>${jna.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna-platform</artifactId>
+      <version>${jna.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

src/main/java/com/github/farmgeek4life/jenkins/negotiatesso/NegSecUserSeedFilter.java

@@ -105,12 +105,6 @@ private void authenticateJenkins(WindowsPrincipal principal, HttpServletRequest
      */
     @SuppressRestrictedWarnings(UserSeedProperty.class)
     private void populateUserSeed(HttpServletRequest httpRequest, String username) {
-        VersionNumber current = Jenkins.getVersion();
-        if (current == null || current.isNewerThan(new VersionNumber("2.150.99")) && current.isOlderThan(new VersionNumber("2.160"))) {
-            // We have to depend on API introduced in 2.150.2 and 1.160 hence we need to skip this for ["2.151", "2.159"]
-            return;
-        }
-
         // Adapted from hudson.security.AuthenticationProcessingFilter2
         if (!UserSeedProperty.DISABLE_USER_SEED) {
             User user = User.getById(username, true);