Skip to content

[WIP] Add Jenkinsfile, facelift and fix build #2

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
stopalopa merged 4 commits into from
Jun 12, 2019
Merged

[WIP] Add Jenkinsfile, facelift and fix build #2

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
aaf7564
Java 11 readiness: use recommended build configurations
batmat Jun 6, 2019
aa4ede4
Facelift tool: artifactId names and inheriting Jenkins org pom
batmat Jun 6, 2019
3ad52ed
Add first dummy test for CI Surefire check
batmat Jun 8, 2019
0a6fc22
Add source encoding specification to remove warning
batmat Jun 8, 2019
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
1 change: 1 addition & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
buildPlugin(configurations: buildPlugin.recommendedConfigurations())
Copy link
Copy Markdown

@kwhetstone kwhetstone Jun 11, 2019

Choose a reason for hiding this comment

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

Since this is not a plugin, this might not work. I'm ok with adding a Jenkinsfile with the tests.

Copy link
Copy Markdown
Contributor

@stopalopa stopalopa Jun 12, 2019

Choose a reason for hiding this comment

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

Sorry, I was fixing the merge conflicts and ended up merging everything. If this is going to be a problem, I can take it out.

15 changes: 11 additions & 4 deletions plugin-management-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>plugin-manager</artifactId>
<groupId>jenkins</groupId>
<groupId>io.jenkins.plugin-management</groupId>
Copy link
Copy Markdown

@kwhetstone kwhetstone Jun 11, 2019

Choose a reason for hiding this comment

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

+1 and for PR3, the package names can renamed during that cleanup

<artifactId>jenkins-plugin-management-parent-pom</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>plugin-management-cli</artifactId>
<artifactId>jenkins-plugin-management-cli</artifactId>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>


</project>
</project>
8 changes: 8 additions & 0 deletions plugin-management-cli/src/test/java/SomeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import org.junit.Test;

public class SomeTest {
@Test
public void some() {

}
}
8 changes: 4 additions & 4 deletions plugin-management-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>plugin-manager</artifactId>
<groupId>jenkins</groupId>
<groupId>io.jenkins.plugin-management</groupId>
<artifactId>jenkins-plugin-management-parent-pom</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>plugin-management-library</artifactId>
<artifactId>jenkins-plugin-management-library</artifactId>


</project>
</project>
15 changes: 11 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>jenkins</groupId>
<artifactId>plugin-management</artifactId>
<parent>
<groupId>org.jenkins-ci</groupId>
<artifactId>jenkins</artifactId>
<version>1.51</version>
</parent>
<packaging>pom</packaging>
<groupId>io.jenkins.plugin-management</groupId>
<artifactId>jenkins-plugin-management-parent-pom</artifactId>
Copy link
Copy Markdown

@kwhetstone kwhetstone Jun 11, 2019

Choose a reason for hiding this comment

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

Maybe the new artifact id should match the repository name jenkins-plugin-installation-manager

Copy link
Copy Markdown
Contributor

@stopalopa stopalopa Jun 12, 2019

Choose a reason for hiding this comment

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

I already merged this. I also thought that the artifactId had to match the repository name, but for the custom war packager it also does not match: https://github.com/jenkinsci/custom-war-packager/blob/master/pom.xml

<version>1.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>plugin-management-cli</module>
<module>plugin-management-library</module>
</modules>


</project>
</project>