Skip to content

Commit

Permalink
Merge pull request #7 from Hillelmed/feature/updatetojava17
Browse files Browse the repository at this point in the history
Feature/updatetojava17
  • Loading branch information
Hillelmed authored Apr 8, 2024
2 parents 1b906f2 + a76aae5 commit 2e72972
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 19 deletions.
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at Chris.Dancy@pega.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hillel95med@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.cdancy/jenkins-rest/badge.png)](https://maven-badges.herokuapp.com/maven-central/io.github.cdancy/jenkins-rest)
[![Stack Overflow](https://img.shields.io/badge/stack%20overflow-jenkins–rest-4183C4.svg)](https://stackoverflow.com/questions/tagged/jenkins+rest)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.hillelmed/jenkins-client-java/badge.png)](https://maven-badges.herokuapp.com/maven-central/io.github.hillelmed/jenkins-client-java)
[![Stack Overflow](https://img.shields.io/badge/stack%20overflow-jenkins–rest-4183C4.svg)](https://stackoverflow.com/questions/tagged/jenkins+client+java)

# jenkins-client-java

Expand Down
19 changes: 9 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jacoco {
}

dependencies {
implementation 'org.jetbrains:annotations:24.1.0'
ext.autoValueVersion = '2.0.0'
ext.autoServiceVersion = '2.0.0'

Expand Down Expand Up @@ -44,6 +43,15 @@ ext.javadocPath = compatibilityVersion.isJava8() ? '' : 'en/java/'
ext.sourceCompatibility = compatibilityVersion
ext.targetCompatibility = compatibilityVersion

tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
jacoco.excludes = ['jdk.internal.*']
}
tasks.withType(JavaCompile).configureEach {
options.compilerArgs.add("-parameters")
options.compilerArgs += ["-Xlint:-options"]
}

test {
useTestNG()
forkEvery = 1
Expand All @@ -61,15 +69,6 @@ jar {
}
}

tasks.withType(JavaCompile).configureEach {
options.compilerArgs.add("-parameters")
options.compilerArgs += ["-Xlint:-options"]
}

tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
jacoco.excludes = ['jdk.internal.*']
}

tasks.register('mockTest', Test) {
group = "Verification"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package io.github.hillelmed.jenkins.client.domain.common;

import lombok.*;
import org.jetbrains.annotations.*;


@Data
@AllArgsConstructor
@NoArgsConstructor
public class IntegerResponse {

@NotNull
private Integer values;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import io.github.hillelmed.jenkins.client.domain.crumb.*;
import io.github.hillelmed.jenkins.client.exception.*;
import lombok.*;
import org.jetbrains.annotations.*;
import org.springframework.http.*;
import org.springframework.web.reactive.function.client.*;

Expand All @@ -20,7 +19,7 @@ public class JenkinsAuthenticationFilter implements ExchangeFilterFunction {

// key = Crumb, value = true if exception is ResourceNotFoundException false otherwise
@Override
public @NotNull reactor.core.publisher.Mono<ClientResponse> filter(@NotNull ClientRequest request, @NotNull ExchangeFunction next) {
public reactor.core.publisher.Mono<ClientResponse> filter(ClientRequest request, ExchangeFunction next) {
ClientRequest.Builder builder = ClientRequest.from(request);

// Password and API Token are both Basic authentication (there is no Bearer authentication in Jenkins)
Expand Down

0 comments on commit 2e72972

Please sign in to comment.