Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Jenkins version to 2.426.3 #346

Merged
merged 7 commits into from
Jul 9, 2024
Merged

Bump Jenkins version to 2.426.3 #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
760f08a
Bump Jenkins version to 2.426.3
michael-doubez Jul 3, 2024
f40becc
Exclude error_prone annotations dep
michael-doubez Jul 3, 2024
1fd119c
Update pom.xml
michael-doubez Jul 3, 2024
f3b2731
Apply spotless
michael-doubez Jul 8, 2024
ed52821
Exclude guava
michael-doubez Jul 8, 2024
ee652bd
Make compatible with jetty 12
michael-doubez Jul 8, 2024
31c64a9
apply spotless
michael-doubez Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,27 @@
<revision>4</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/oic-auth-plugin</gitHubRepo>
<jenkins.version>2.361.4</jenkins.version>
<jenkins.version>2.426.3</jenkins.version>
<spotless.check.skip>false</spotless.check.skip>
<spotbugs.failOnError>true</spotbugs.failOnError>
<spotbugs.effort>Max</spotbugs.effort>
<configuration-as-code.version>1569.vb_72405b_80249</configuration-as-code.version>
<configuration-as-code.version>1810.v9b_c30a_249a_4c</configuration-as-code.version>
</properties>
<dependencies>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>1.44.2</version>
<exclusions>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
Expand All @@ -67,6 +77,12 @@
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
<version>1.36.0</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.burt</groupId>
Expand All @@ -90,7 +106,6 @@
<version>${configuration-as-code.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down
11 changes: 5 additions & 6 deletions src/test/java/org/jenkinsci/plugins/oic/EscapeHatchCrumbExclusionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Request;
import org.junit.Test;

import static org.junit.Assert.assertFalse;
Expand All @@ -19,8 +18,8 @@ public class EscapeHatchCrumbExclusionTest {

private FilterChain chain = null;

private Request newRequestWithPath(String requestPath) {
return new Request(null, null) {
private MockHttpServletRequest newRequestWithPath(String requestPath) {
return new MockHttpServletRequest() {
@Override
public String getPathInfo() {
return requestPath;
Expand All @@ -30,13 +29,13 @@ public String getPathInfo() {

@Test
public void process_WithNullPath() throws IOException, ServletException {
Request request = new Request(null, null);
MockHttpServletRequest request = newRequestWithPath("");
assertFalse(crumb.process(request, response, chain));
}

@Test
public void process_WithWrongPath() throws IOException, ServletException {
Request request = newRequestWithPath("fictionalPath");
MockHttpServletRequest request = newRequestWithPath("fictionalPath");
assertFalse(crumb.process(request, response, chain));
}

Expand All @@ -49,7 +48,7 @@ public void doFilter(ServletRequest arg0, ServletResponse arg1) throws IOExcepti
}
};

Request request = newRequestWithPath("/securityRealm/escapeHatch");
MockHttpServletRequest request = newRequestWithPath("/securityRealm/escapeHatch");
assertTrue(crumb.process(request, response, chain));
}
}
Loading