Skip to content

Commit 11533a9

Browse files
Prepare first release
Merge pull request #1 from jenkinsci/prepare-first-release
2 parents e328b9c + 642e9f2 commit 11533a9

File tree

4 files changed

+48
-12
lines changed

4 files changed

+48
-12
lines changed

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Release Drafter
55
on:
66
push:
77
branches:
8-
- main
8+
- "main"
99
tags:
1010
- '*'
1111

Jenkinsfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Builds the plugin using https://github.com/jenkins-infra/pipeline-library
22
buildPlugin(useContainerAgent: true, configurations: [
33
// Test the minimum required Jenkins Version.
4-
[ platform: 'linux', jdk: '11', jenkins: null ],
5-
[ platform: 'windows', jdk: '11', jenkins: null ],
6-
[ platform: 'linux', jdk: '17', jenkins: null ],
7-
[ platform: 'windows', jdk: '17', jenkins: null ]
4+
[ platform: 'linux', jdk: '11'],
5+
[ platform: 'windows', jdk: '11'],
6+
[ platform: 'linux', jdk: '17']
87
])

README.adoc

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1+
[[apache-httpcomponents-client-5-api-plugin]]
12
= Apache HttpComponents Client 5.x API Plugin for Jenkins
3+
:toc: macro
4+
:toclevels: 3
5+
:toc-title:
6+
7+
image:https://ci.jenkins.io/job/Plugins/job/apache-httpcomponents-client-5-api-plugin/job/main/badge/icon[link="https://ci.jenkins.io/job/Plugins/job/apache-httpcomponents-client-5-api-plugin/job/main/"]
8+
image:https://github.com/jenkinsci/apache-httpcomponents-client-5-api-plugin/actions/workflows/jenkins-security-scan.yml/badge.svg[link="https://github.com/jenkinsci/apache-httpcomponents-client-5-api-plugin/actions/workflows/jenkins-security-scan.yml"]
9+
10+
image:https://img.shields.io/jenkins/plugin/i/apache-httpcomponents-client-5-api.svg?color=blue&label=installations[link="https://stats.jenkins.io/pluginversions/apache-httpcomponents-client-5-api.html"]
11+
image:https://img.shields.io/github/contributors/jenkinsci/apache-httpcomponents-client-5-api-plugin.svg?color=blue[link="https://github.com/jenkinsci/apache-httpcomponents-client-5-api-plugin/graphs/contributors"]
12+
image:https://img.shields.io/github/release/jenkinsci/apache-httpcomponents-client-5-api-plugin.svg?label=changelog[link="https://github.com/jenkinsci/apache-httpcomponents-client-5-api-plugin/releases/latest"]
13+
14+
This plugin bundles all the components of https://hc.apache.org/httpcomponents-client-5.2.x/index.html[Apache HttpComponents Client 5.x] except `httpclient5-win` because of the dependency on jna.
215

3-
This plugin bundles all the components of https://hc.apache.org/httpcomponents-client-5.2.x/index.html[Apache HttpComponents Client 5.2.x] except `httpclient5-win` because of the dependency on jna.
416
These components can be used by other plugins as a dependency.
517
It allows managing library updates independently of plugins.
618

@@ -10,7 +22,7 @@ It allows managing library updates independently of plugins.
1022

1123
Replace the dependency to `org.apache.httpcomponents.client5:httpclient5` with the dependency to `apache-httpcomponents-client-5-api`.
1224

13-
* Before:
25+
*Before:*
1426

1527
----
1628
<dependencies>
@@ -24,7 +36,7 @@ Replace the dependency to `org.apache.httpcomponents.client5:httpclient5` with t
2436
</dependencies>
2537
----
2638

27-
* After:
39+
*After:*
2840

2941
----
3042
<dependencies>
@@ -40,9 +52,9 @@ Replace the dependency to `org.apache.httpcomponents.client5:httpclient5` with t
4052

4153
=== Plugins using libraries depending on httpclient5
4254

43-
Add the dependency to `apache-httpcomponents-client-5-api` BEFORE any of dependencies to those libraries to force maven to use `httpclient5` declared by `apache-httpcomponents-client-5-api`.
55+
Add the dependency to `apache-httpcomponents-client-5-api` *before* any of dependencies to those libraries to force maven to use `httpclient5` declared by `apache-httpcomponents-client-5-api`.
4456

45-
* Before:
57+
*Before:*
4658

4759
----
4860
<dependencies>
@@ -59,7 +71,7 @@ Add the dependency to `apache-httpcomponents-client-5-api` BEFORE any of depende
5971
</dependencies>
6072
----
6173

62-
* After:
74+
*After:*
6375

6476
----
6577
<dependencies>
@@ -81,6 +93,12 @@ Add the dependency to `apache-httpcomponents-client-5-api` BEFORE any of depende
8193
</dependencies>
8294
----
8395

96+
== Versioning
97+
98+
Version follows the pattern of `<org.apache.httpcomponents version>-<plugin version>`.
99+
100+
This way it is clear what upstream dependency is offered and allows patch releases for the plugin itself if required.
101+
84102
== Release Notes
85103

86104
Release notes are recorded in https://github.com/jenkinsci/apache-httpcomponents-client-5-api-plugin/releases[GitHub Releases].

pom.xml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
</properties>
2626

2727
<name>Apache HttpComponents Client 5.x API Plugin</name>
28-
<description>Bundles Apache HttpComponents Client 5.x and allows it to be used by Jenkins plugins</description>
28+
<description>Bundles Apache HttpComponents Client ${revision} and allows it to be used by Jenkins plugins
29+
</description>
2930
<url>https://github.com/${gitHubRepo}</url>
3031

3132
<licenses>
@@ -71,16 +72,34 @@
7172
<groupId>org.apache.httpcomponents.client5</groupId>
7273
<artifactId>httpclient5</artifactId>
7374
<version>${httpclient.version}</version>
75+
<exclusions>
76+
<exclusion>
77+
<groupId>org.slf4j</groupId>
78+
<artifactId>slf4j-api</artifactId>
79+
</exclusion>
80+
</exclusions>
7481
</dependency>
7582
<dependency>
7683
<groupId>org.apache.httpcomponents.client5</groupId>
7784
<artifactId>httpclient5-cache</artifactId>
7885
<version>${httpclient.version}</version>
86+
<exclusions>
87+
<exclusion>
88+
<groupId>org.slf4j</groupId>
89+
<artifactId>slf4j-api</artifactId>
90+
</exclusion>
91+
</exclusions>
7992
</dependency>
8093
<dependency>
8194
<groupId>org.apache.httpcomponents.client5</groupId>
8295
<artifactId>httpclient5-fluent</artifactId>
8396
<version>${httpclient.version}</version>
97+
<exclusions>
98+
<exclusion>
99+
<groupId>org.slf4j</groupId>
100+
<artifactId>slf4j-api</artifactId>
101+
</exclusion>
102+
</exclusions>
84103
</dependency>
85104
</dependencies>
86105

0 commit comments

Comments
 (0)