Skip to content

Commit

Permalink
Modernize Jenkins builds (#71)
Browse files Browse the repository at this point in the history
* Dependency maintenance

* Fix javadoc generating

Signed-off-by: justusbunsi <[email protected]>

* Prevent scm link warning about git protocol

Signed-off-by: justusbunsi <[email protected]>

---------

Signed-off-by: justusbunsi <[email protected]>
Co-authored-by: Michael Kriese <[email protected]>
  • Loading branch information
justusbunsi and viceice authored Jun 19, 2024
1 parent 904c2db commit 480576b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
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.1</version>
<version>1.8</version>
</extension>
</extensions>
8 changes: 6 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
See the documentation for more options:
https://github.com/jenkins-infra/pipeline-library/
*/
buildPlugin(
useContainerAgent: true,
configurations: [
[platform: 'linux', jdk: 8],
[platform: 'windows', jdk: 8],
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
])
16 changes: 7 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.29</version>
<version>4.82</version>
<relativePath />
</parent>

Expand All @@ -14,7 +14,6 @@
<packaging>hpi</packaging>

<name>Gitea Plugin</name>
<description>SCM API implementation for Gitea</description>
<url>https://github.com/jenkinsci/gitea-plugin/blob/master/docs/README.md</url>
<licenses>
<license>
Expand All @@ -24,7 +23,7 @@
</licenses>

<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<connection>https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>${scmTag}</tag>
Expand All @@ -33,10 +32,9 @@
<properties>
<revision>1.4.8</revision>
<changelist>-SNAPSHOT</changelist>
<java.level>8</java.level>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
<jenkins.version>2.289.1</jenkins.version>
<jenkins.version>2.426.3</jenkins.version>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.failOnError>true</spotbugs.failOnError>
<spotbugs.threshold>Medium</spotbugs.threshold>
Expand All @@ -46,8 +44,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.289.x</artifactId>
<version>987.v4ade2e49fe70</version>
<artifactId>bom-2.426.x</artifactId>
<version>3105.v672692894683</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -57,12 +55,12 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>handy-uri-templates-2-api</artifactId>
<version>2.1.8-1.0</version>
<version>2.1.8-30.v7e777411b_148</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>authentication-tokens</artifactId>
<version>1.4</version>
<version>1.113.v81215a_241826</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugin/gitea/package-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

/**
* <h1>Jenkins SCM API implementation for <a href="https://gitea.io/">Gitea</a></h1>.
* <h2>Jenkins SCM API implementation for <a href="https://gitea.com/">Gitea</a></h2>.
*
* The primary entry points for the implementation are:
*
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/index.jelly
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?jelly escape-by-default='true'?>
<div>
SCM API implementation for Gitea
</div>

0 comments on commit 480576b

Please sign in to comment.