Skip to content

Commit 4b687c2

Browse files
authored
Merge pull request #5 from jglick/split-JENKINS-57023
[JENKINS-57023] Remove deprecated global library functionality
2 parents e633085 + 1073537 commit 4b687c2

23 files changed

+66
-943
lines changed

CHANGELOG.md

Lines changed: 0 additions & 197 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
# Pipeline Shared Libraries
1+
# Pipeline Groovy Libraries
22

33
When you have multiple Pipeline jobs, you often want to share some parts of the Pipeline scripts between them to keep Pipeline scripts [DRY](http://en.wikipedia.org/wiki/Don't_repeat_yourself).
44
A very common use case is that you have many projects that are built in the similar way.
55

6-
This plugin adds that functionality by allowing you to create “shared library script” SCM repositories.
7-
It can be used in two modes:
8-
9-
- A legacy mode in which there is a single Git repository hosted by Jenkins itself, to which you may push changes
10-
- A more general mode in which you may define libraries hosted by any SCM in a location of your choice.
6+
This plugin adds that functionality by allowing you to create “library script” SCM repositories.
7+
You may define libraries hosted by any SCM in a location of your choice.
118

129
Comprehensive user documentation can be found [in the Pipeline chapter of the User Handbook](https://jenkins.io/doc/book/pipeline/shared-libraries/).

pom.xml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
<version>4.40</version>
3232
<relativePath />
3333
</parent>
34-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
35-
<artifactId>workflow-cps-global-lib</artifactId>
34+
<groupId>io.jenkins.plugins</groupId>
35+
<artifactId>pipeline-groovy-lib</artifactId>
3636
<version>${changelist}</version>
3737
<packaging>hpi</packaging>
38-
<name>Pipeline: Shared Groovy Libraries</name>
39-
<url>https://github.com/jenkinsci/workflow-cps-global-lib-plugin</url>
38+
<name>Pipeline: Groovy Libraries</name>
39+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
4040
<licenses>
4141
<license>
4242
<name>MIT License</name>
@@ -64,7 +64,6 @@
6464
<properties>
6565
<changelist>999999-SNAPSHOT</changelist>
6666
<jenkins.version>2.303.1</jenkins.version>
67-
<java.level>8</java.level>
6867
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
6968
</properties>
7069
<dependencyManagement>
@@ -93,15 +92,19 @@
9392
</dependency>
9493
<dependency>
9594
<groupId>org.jenkins-ci.plugins.workflow</groupId>
96-
<artifactId>workflow-cps</artifactId>
95+
<artifactId>workflow-scm-step</artifactId>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.jenkins-ci.plugins</groupId>
99+
<artifactId>structs</artifactId>
97100
</dependency>
98101
<dependency>
99102
<groupId>org.jenkins-ci.plugins.workflow</groupId>
100-
<artifactId>workflow-step-api</artifactId>
103+
<artifactId>workflow-cps</artifactId>
101104
</dependency>
102105
<dependency>
103-
<groupId>org.jenkins-ci.plugins</groupId>
104-
<artifactId>git-server</artifactId>
106+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
107+
<artifactId>workflow-step-api</artifactId>
105108
</dependency>
106109
<dependency>
107110
<groupId>org.jenkins-ci.plugins</groupId>
@@ -115,14 +118,6 @@
115118
<groupId>org.jenkins-ci.plugins</groupId>
116119
<artifactId>script-security</artifactId>
117120
</dependency>
118-
<dependency>
119-
<groupId>org.jenkins-ci.plugins</groupId>
120-
<artifactId>credentials</artifactId>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
124-
<artifactId>workflow-support</artifactId>
125-
</dependency>
126121

127122
<dependency>
128123
<groupId>org.jenkins-ci.plugins</groupId>

src/main/java/org/jenkinsci/plugins/workflow/cps/global/GroovyShellDecoratorImpl.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/main/java/org/jenkinsci/plugins/workflow/cps/global/UserDefinedGlobalVariable.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ public class UserDefinedGlobalVariable extends GlobalVariable {
2626
private final File help;
2727
private final String name;
2828

29-
/*package*/ UserDefinedGlobalVariable(WorkflowLibRepository repo, String name) {
30-
this(name, new File(repo.workspace, PREFIX + "/" + name + ".txt"));
31-
}
32-
3329
public UserDefinedGlobalVariable(String name, File help) {
3430
this.name = name;
3531
this.help = help;
@@ -96,5 +92,4 @@ public int hashCode() {
9692
return name.hashCode();
9793
}
9894

99-
/*package*/ static final String PREFIX = "vars";
10095
}

src/main/java/org/jenkinsci/plugins/workflow/cps/global/UserDefinedGlobalVariableList.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)