Skip to content

Standardized & simplified & updated build & test infrastructure #307

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

Merged
timja merged 7 commits into from
Apr 19, 2023
Merged

Standardized & simplified & updated build & test infrastructure #307

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f891239
Sketch of standardized POM
jglick Dec 16, 2022
0d40360
Deleting some junk
jglick Dec 16, 2022
3ef9b44
Deleting tests using nonstandard and bloated harnesses that would nee…
jglick Dec 16, 2022
1e7631b
Merge branch 'master' into bumps
timja Apr 14, 2023
b745cf8
Update to latest
timja Apr 19, 2023
4e1bc61
Cleanup dependencies
timja Apr 19, 2023
a6d3079
Merge branch 'master' into bumps
timja Apr 19, 2023
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
5 changes: 3 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
def configurations = [
[ platform: "linux", jdk: "11" ],
[ platform: "windows", jdk: "11" ]
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
]

buildPlugin(failFast: false, configurations: configurations,
useContainerAgent: true,
checkstyle: [qualityGates: [[threshold: 1, type: 'NEW', unstable: true]]],
pmd: [qualityGates: [[threshold: 1, type: 'NEW', unstable: true]]] )
125 changes: 29 additions & 96 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jvnet.hudson.plugins</groupId>
<artifactId>analysis-pom</artifactId>
<version>5.17.0</version>
<relativePath />
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.53</version>
<relativePath/>
</parent>

<groupId>io.jenkins.plugins</groupId>
Expand All @@ -15,28 +15,19 @@
<packaging>hpi</packaging>

<name>GitHub Checks plugin</name>
<description>Allows users to publish GitHub checks</description>

<properties>
<java.level>8</java.level>
<revision>1.0.20</revision>
<changelist>-SNAPSHOT</changelist>

<jenkins.version>2.361.4</jenkins.version>
<useBeta>true</useBeta>

<!-- Jenkins Plug-in Dependencies Versions -->
<checks-api.version>1.7.2</checks-api.version>
<plugin-util-api.version>2.9.0</plugin-util-api.version>
<github-branch-source.version>2.9.3</github-branch-source.version>

<!-- Test Library Dependencies Versions -->
<jetty.version>9.4.49.v20220914</jetty.version>
<jackson.version>2.14.0</jackson.version>
<wiremock.version>2.33.2</wiremock.version>
<guava.version>29.0-jre</guava.version>
<asm.version>9.2</asm.version>
<json-unit-core.version>2.32.0</json-unit-core.version>
<http-client.version>4.5.13</http-client.version>
<archunit.version>0.23.1</archunit.version>
</properties>

<licenses>
Expand All @@ -57,42 +48,34 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>${jetty.version}</version>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.361.x</artifactId>
<version>1750.v0071fa_4c4a_e3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency> <!-- TODO pending https://github.com/jenkinsci/github-branch-source-plugin/pull/624 -->
Copy link
Member

@timja timja Apr 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

released in https://github.com/jenkinsci/github-branch-source-plugin/releases/tag/1701.v00cc8184df93 AFAICT

<groupId>com.coravy.hudson.plugins.github</groupId>
<artifactId>github</artifactId>
<version>1.35.0</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>plugin-util-api</artifactId>
<version>${plugin-util-api.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>plugin-util-api</artifactId>
<version>${plugin-util-api.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<!-- Jenkins Plugin Dependencies -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>checks-api</artifactId>
<version>${checks-api.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>github-branch-source</artifactId>
<version>${github-branch-source.version}</version>
<version>1696.v3a_7603564d04</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>github-api</artifactId>
<version>1.117</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -106,7 +89,7 @@
<!-- Test Dependencies -->
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<artifactId>wiremock-jre8-standalone</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -128,46 +111,9 @@
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -183,22 +129,26 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.23.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit5</artifactId>
<version>${archunit.version}</version>
<scope>test</scope>
</dependency>
<!-- stage -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-stage-step</artifactId>
<version>2.5</version>
<scope>test</scope>
</dependency>
<!-- node -->
Expand All @@ -207,25 +157,8 @@
<artifactId>workflow-durable-task-step</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.assertj</groupId>
<artifactId>assertj-assertions-generator-maven-plugin</artifactId>
<configuration>
<packages combine.children="append">
<package>io.jenkins.plugins.checks.github</package>
<package>io.jenkins.plugins.checks.github.status</package>
</packages>
<entryPointClassPackage>io.jenkins.plugins.checks.github.assertions</entryPointClassPackage>
</configuration>
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<div>
This plugin provide GitHub Checks API for other plugins.
Allows users to publish GitHub checks.
</div>
33 changes: 0 additions & 33 deletions src/test/java/io/jenkins/plugins/checks/ArchitectureTest.java
View file
Open in desktop

This file was deleted.

Loading