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

Jump to bottom

bump to maven 3.8.1 #148

Merged
merged 3 commits into from
May 13, 2021
Merged

bump to maven 3.8.1 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6477c7
bump to maven 3.8.1
car-roll May 12, 2021
76d4827
guice 4.2.1 requires bump in guava
car-roll May 12, 2021
82d634e
bump core to support maven 3.8.1
car-roll May 12, 2021
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
20 changes: 15 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.57</version>
<version>4.18</version>
</parent>

<artifactId>jacoco</artifactId>
Expand All @@ -42,8 +42,8 @@ THE SOFTWARE.
<properties>
<java.level>8</java.level>
<jacoco.version>0.8.7</jacoco.version>
<jenkins.version>2.164.3</jenkins.version>
<maven.version>3.5.2</maven.version>
<jenkins.version>2.263.4</jenkins.version>
<maven.version>3.8.1</maven.version>
<powermock.version>2.0.7</powermock.version>
<!-- Do not fail if tests are run without argLine -->
<argLine />
Expand Down Expand Up @@ -173,7 +173,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -210,6 +210,16 @@ THE SOFTWARE.
<artifactId>maven-plugin</artifactId>
<version>3.7</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.2.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1-jre</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -296,7 +306,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
</dependency>
<!-- Somehow we need org.w3c.dom.ElementTraversal, but do not get it from any of the dependencies
do not update to 2.x as it will not contain the class any more! -->
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/hudson/plugins/jacoco/JacocoHealthReportDeltaThresholds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ public JacocoHealthReportDeltaThresholds() {

// Constructor used for bounding user-configured string threshold values to corresponding big decimal thresholds
public JacocoHealthReportDeltaThresholds(String deltaInstruction, String deltaBranch, String deltaComplexity, String deltaLine, String deltaMethod, String deltaClass){
this.deltaInstruction = deltaInstruction!=null ? Float.valueOf(deltaInstruction) : 0f;
this.deltaBranch = deltaBranch!=null ? Float.valueOf(deltaBranch) : 0f;
this.deltaComplexity = deltaComplexity!=null ? Float.valueOf(deltaComplexity) : 0f;
this.deltaLine = deltaLine!=null ? Float.valueOf(deltaLine) : 0f;
this.deltaMethod = deltaMethod!=null ? Float.valueOf(deltaMethod) : 0f;
this.deltaClass = deltaClass!=null ? Float.valueOf(deltaClass): 0f;
this.deltaInstruction = deltaInstruction!=null ? Float.parseFloat(deltaInstruction) : 0f;
this.deltaBranch = deltaBranch!=null ? Float.parseFloat(deltaBranch) : 0f;
this.deltaComplexity = deltaComplexity!=null ? Float.parseFloat(deltaComplexity) : 0f;
this.deltaLine = deltaLine!=null ? Float.parseFloat(deltaLine) : 0f;
this.deltaMethod = deltaMethod!=null ? Float.parseFloat(deltaMethod) : 0f;
this.deltaClass = deltaClass!=null ? Float.parseFloat(deltaClass): 0f;
this.ensureValid(); // Validate threshold values while creating new object to encapsulate these
}

Expand Down