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

Refresh plugin #64

Merged
merged 4 commits into from
Jun 15, 2022
Merged

Refresh plugin #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e537ad
Update Jenkinsfile
basil Jun 15, 2022
2dddb5b
Update plugin parent POM and BOM
basil Jun 15, 2022
9dd1cd5
EOL JSR305
basil Jun 15, 2022
ab5727c
Update pom.xml
basil Jun 15, 2022
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
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.0-beta-7</version>
<version>1.3</version>
</extension>
</extensions>
8 changes: 4 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env groovy

/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
buildPlugin(useAci: false, configurations: [
[ platform: "linux", jdk: "8" ],
[ platform: "windows", jdk: "8" ],
[ platform: "linux", jdk: "11", jenkins: "2.222.3" ]
buildPlugin(useContainerAgent: true, configurations: [
[ platform: 'linux', jdk: '8' ],
[ platform: 'linux', jdk: '11' ],
[ platform: 'windows', jdk: '11' ],
])
91 changes: 50 additions & 41 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.33</version>
<version>4.40</version>
<relativePath />
</parent>

<groupId>hudson.plugins.sloccount</groupId>
<artifactId>sloccount</artifactId>
<packaging>hpi</packaging>
<name>Jenkins SLOCCount Plug-in</name>
<version>${revision}${changelist}</version>
<url>http://wiki.jenkins-ci.org/display/JENKINS/SLOCCount+Plugin</url>
<description>This plug-in generates the trend report for SLOCCount,
an open source program which counts the number of lines of codes in over
25 different languages, including C/C++, Ada, COBOL, Fortran, SQL, Ruby,
Python, etc... </description>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<description>This plug-in generates the trend report for SLOCCount, an open source program which counts the number of lines of codes in over 25 different languages, including C/C++, Ada, COBOL, Fortran, SQL, Ruby, Python, etc...</description>

<developers>
<developer>
Expand Down Expand Up @@ -47,48 +46,58 @@
</contributors>

<properties>
<revision>1.26</revision>
<changelist>-SNAPSHOT</changelist>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jenkins.version>1.625.3</jenkins.version>
<java.level>7</java.level>
<revision>1.26</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.289.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.289.x</artifactId>
<version>1409.v7659b_c072f18</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>dashboard-view</artifactId>
<version>2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>2.6</version>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jaxb</artifactId>
<version>2.3.6-1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>1.15</version>
</dependency>

<!-- dependencies on Jenkins Pipeline plugins for tests-->
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>1.15</version>
<scope>test</scope>
<!-- dependencies on Jenkins Pipeline plugins for tests-->
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<version>2.0</version>
<scope>test</scope>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand All @@ -106,10 +115,10 @@
</pluginRepositories>

<scm>
<connection>scm:git:git://github.com/jenkinsci/sloccount-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/sloccount-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/sloccount-plugin</url>
<tag>{scmTag}</tag>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>

</project>
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/sloccount/SloccountPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.io.Serializable;
import java.util.List;
import java.io.File;
import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;

import org.kohsuke.stapler.DataBoundConstructor;

Expand Down Expand Up @@ -66,7 +66,7 @@ protected boolean canContinue(final Result result) {
}

@Override
public void perform(@Nonnull Run<?, ?> build, @Nonnull FilePath workspace, @Nonnull Launcher launcher, @Nonnull TaskListener listener) {
public void perform(@NonNull Run<?, ?> build, @NonNull FilePath workspace, @NonNull Launcher launcher, @NonNull TaskListener listener) {
PrintStream logger = listener.getLogger();

if (!canContinue(build.getResult())) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/jenkins/plugins/sloccount/steps/SloccountPublisherStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.io.IOException;
import java.util.Set;
import java.io.Serializable;
import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;
import org.jenkinsci.plugins.workflow.steps.StepContext;

import org.jenkinsci.plugins.workflow.steps.StepExecution;
Expand Down Expand Up @@ -116,7 +116,7 @@ public Set<? extends Class<?>> getRequiredContext() {
}


@Nonnull
@NonNull
@Override
public String getDisplayName() {
return "Publish Sloccount reports";
Expand Down