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

bump jenkins and pom version, add incrementals #59

Merged
merged 13 commits into from
Jul 26, 2022
Merged

bump jenkins and pom version, add incrementals #59

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
829dbc7
bump jenkins and pom version, add incrementals
jetersen Jul 22, 2022
3501502
bump test dependencies
jetersen Jul 22, 2022
7559099
remove exclusion
jetersen Jul 22, 2022
4afa8c1
bump jenkins version
jetersen Jul 22, 2022
c92bc56
downgrade beer 😢
jetersen Jul 22, 2022
ad13073
damn copy paste
jetersen Jul 22, 2022
baa1c92
bump jenkins version to 2.319.3
jetersen Jul 22, 2022
112560e
Update pom.xml
jetersen Jul 22, 2022
bffcad7
use bom and make credentials not use hpi type
jetersen Jul 22, 2022
7a88018
Update Jenkinsfile
jetersen Jul 22, 2022
c7845bb
use property to avoid clobbering exclusion in downstream
jetersen Jul 25, 2022
e093605
bump pom
jetersen Jul 26, 2022
72f2058
add CD workflow
jetersen Jul 26, 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
7 changes: 7 additions & 0 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.4</version>
</extension>
</extensions>
2 changes: 2 additions & 0 deletions .mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildPlugin(configurations: [
[ platform: "windows", jdk: "8", jenkins: null ],

// More recent LTS, only Linux
[ platform: "linux", jdk: "8", jenkins: '2.263.1', javaLevel: "8" ],
[ platform: "linux", jdk: "8", jenkins: '2.346.2', javaLevel: "8" ],
jetersen marked this conversation as resolved.
Show resolved Hide resolved

// Checking JDK 11
[ platform: "linux", jdk: "11", jenkins: null ]
Expand Down
30 changes: 13 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
<version>4.15</version>
<version>4.43.1</version>
<relativePath />
</parent>
<artifactId>variant</artifactId>
<version>1.5-SNAPSHOT</version>
<version>${revision}${changelist}</version>
Copy link
Member

Choose a reason for hiding this comment

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

Or we could go straight to CD, if the maintainer (whoever that is) approves.

Copy link
Member

Choose a reason for hiding this comment

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

Or we could go straight to CD, if the maintainer (whoever that is) approves.

@batmat

Copy link
Member Author

Choose a reason for hiding this comment

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

already created PR for it: jenkins-infra/repository-permissions-updater#2669

<packaging>hpi</packaging>

<name>Variant Plugin</name>
Expand All @@ -24,10 +24,10 @@
</license>
</licenses>
<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>http://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag>
<connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
jetersen marked this conversation as resolved.
Show resolved Hide resolved
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
<url>http://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
</scm>
<repositories>
<repository>
Expand All @@ -45,25 +45,19 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>beer</artifactId>
<version>1.2</version>
<version>1.3</version>
<optional>true</optional>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.3.14</version>
<version>1087.1089.v2f1b_9a_b_040e4</version>
<type>hpi</type>
Copy link
Member

Choose a reason for hiding this comment

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

It turns out that I also need this fix (the removal of <type>hpi</type> for my project, so I wish you a speedy merge and release!

<scope>test</scope>
<exclusions>
<exclusion> <!-- coming from the core anyway -->
<groupId>org.jenkins-ci</groupId>
<artifactId>symbol-annotation</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -77,7 +71,9 @@
</plugins>
</build>
<properties>
<jenkins.version>2.249.1</jenkins.version>
<java.level>8</java.level>
<revision>1.5</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<jenkins.version>2.319.3</jenkins.version>
</properties>
</project>