Skip to content

Commit 144818f

Browse files
fengxxfengxx
committed
update change log
1 parent 3ad8981 commit 144818f

File tree

5 files changed

+143
-117
lines changed

5 files changed

+143
-117
lines changed

‎doc/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### 1.10.0 (July 4, 2022)
2+
- SECURITY-2128 plugin logs unmasked credentials, thanks to [Pierson Yieh](https://github.com/pyieh)
3+
- JENKINS-68775 pipeline build step is considered a stage in splunk plugin, thanks to [Guilherme Mota](https://github.com/guilhermemotadock)
4+
- JENKINS-68440 null pointer exception in LabelMarkupText, thanks to [Kyle Cronin](https://github.com/cronik)
5+
16
### 1.9.9 (January 8, 2022)
27
- JENKINS-67492 fix xml entity not declared error when parsing console node
38
### 1.9.8 (December 18, 2021)

‎splunk-devops-extend/pom.xml‎

Lines changed: 133 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,133 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
5-
<parent>
6-
<groupId>com.splunk.splunkins</groupId>
7-
<artifactId>pom</artifactId>
8-
<version>1.10.0-SNAPSHOT</version>
9-
</parent>
10-
11-
<artifactId>splunk-devops-extend</artifactId>
12-
<packaging>hpi</packaging>
13-
14-
<name>Splunk Plugin Extension</name>
15-
<description>Support Extracting Pipeline Stage Node</description>
16-
<url>https://github.com/jenkinsci/splunk-devops-plugin/blob/master/doc/splunk-devops-extend-usage.md</url>
17-
<licenses>
18-
<license>
19-
<name>MIT License</name>
20-
<url>http://opensource.org/licenses/MIT</url>
21-
</license>
22-
</licenses>
23-
<developers>
24-
<developer>
25-
<id>fengxx</id>
26-
<name>Ted Xiao</name>
27-
<email>xiao.xj@outlook.com</email>
28-
</developer>
29-
</developers>
30-
<properties>
31-
<useBeta>true</useBeta>
32-
</properties>
33-
<dependencies>
34-
<dependency>
35-
<groupId>${project.groupId}</groupId>
36-
<artifactId>splunk-devops</artifactId>
37-
<version>${project.version}</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
41-
<artifactId>pipeline-rest-api</artifactId>
42-
<version>2.8</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>${project.groupId}</groupId>
46-
<artifactId>splunk-devops</artifactId>
47-
<version>${project.version}</version>
48-
<type>test-jar</type>
49-
<scope>test</scope>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
53-
<artifactId>workflow-durable-task-step</artifactId>
54-
<version>2.9</version>
55-
<scope>test</scope>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
59-
<artifactId>workflow-api</artifactId>
60-
<version>1165.v02c3db_a_6b_e36</version>
61-
<!--TaskListenerDecorator API beta feature-->
62-
</dependency>
63-
<dependency>
64-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
65-
<artifactId>workflow-job</artifactId>
66-
<version>2.41</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
70-
<artifactId>workflow-step-api</artifactId>
71-
<version>625.vd896b_f445a_f8</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
75-
<artifactId>workflow-cps</artifactId>
76-
<version>2648.2651.v230593e03e9f</version>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
80-
<artifactId>workflow-support</artifactId>
81-
<version>3.8</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
85-
<artifactId>workflow-basic-steps</artifactId>
86-
<version>2.24</version>
87-
<scope>test</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
91-
<artifactId>workflow-multibranch</artifactId>
92-
<version>711.vdfef37cda_816</version>
93-
<scope>test</scope>
94-
</dependency>
95-
<dependency>
96-
<!-- transit dependency of workflow-cps -->
97-
<groupId>org.jenkins-ci.ui</groupId>
98-
<artifactId>jquery-detached</artifactId>
99-
<version>1.2.1</version>
100-
<scope>test</scope>
101-
</dependency>
102-
<dependency>
103-
<groupId>org.jenkins-ci.plugins</groupId>
104-
<artifactId>junit</artifactId>
105-
<version>1.47</version>
106-
<scope>test</scope>
107-
</dependency>
108-
<dependency>
109-
<groupId>javax.mail</groupId>
110-
<artifactId>mail</artifactId>
111-
<version>1.4.4</version>
112-
<scope>test</scope>
113-
</dependency>
114-
</dependencies>
115-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>com.splunk.splunkins</groupId>
7+
<artifactId>pom</artifactId>
8+
<version>1.10.0-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>splunk-devops-extend</artifactId>
12+
<packaging>hpi</packaging>
13+
14+
<name>Splunk Plugin Extension</name>
15+
<description>Support Extracting Pipeline Stage Node</description>
16+
<url>https://github.com/jenkinsci/splunk-devops-plugin/blob/master/doc/splunk-devops-extend-usage.md</url>
17+
<licenses>
18+
<license>
19+
<name>MIT License</name>
20+
<url>http://opensource.org/licenses/MIT</url>
21+
</license>
22+
</licenses>
23+
<developers>
24+
<developer>
25+
<id>fengxx</id>
26+
<name>Ted Xiao</name>
27+
<email>xiao.xj@outlook.com</email>
28+
</developer>
29+
</developers>
30+
<properties>
31+
<useBeta>true</useBeta>
32+
</properties>
33+
<dependencies>
34+
<dependency>
35+
<groupId>${project.groupId}</groupId>
36+
<artifactId>splunk-devops</artifactId>
37+
<version>${project.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
41+
<artifactId>pipeline-rest-api</artifactId>
42+
<version>2.8</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>${project.groupId}</groupId>
46+
<artifactId>splunk-devops</artifactId>
47+
<version>${project.version}</version>
48+
<type>test-jar</type>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
53+
<artifactId>workflow-durable-task-step</artifactId>
54+
<version>2.39</version>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
59+
<artifactId>workflow-api</artifactId>
60+
<version>1165.v02c3db_a_6b_e36</version>
61+
<!--TaskListenerDecorator API beta feature-->
62+
</dependency>
63+
<dependency>
64+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
65+
<artifactId>workflow-job</artifactId>
66+
<version>2.41</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
70+
<artifactId>workflow-step-api</artifactId>
71+
<version>625.vd896b_f445a_f8</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
75+
<artifactId>workflow-cps</artifactId>
76+
<version>2648.2651.v230593e03e9f</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
80+
<artifactId>workflow-support</artifactId>
81+
<version>813.vb_d7c3d2984a_0</version>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
85+
<artifactId>workflow-basic-steps</artifactId>
86+
<version>2.24</version>
87+
<scope>test</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
91+
<artifactId>workflow-multibranch</artifactId>
92+
<version>711.vdfef37cda_816</version>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<!-- transit dependency of workflow-cps -->
97+
<groupId>org.jenkins-ci.ui</groupId>
98+
<artifactId>jquery-detached</artifactId>
99+
<version>1.2.1</version>
100+
<scope>test</scope>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.jenkins-ci.plugins</groupId>
104+
<artifactId>junit</artifactId>
105+
<version>1.47</version>
106+
<scope>test</scope>
107+
</dependency>
108+
<dependency>
109+
<groupId>javax.mail</groupId>
110+
<artifactId>mail</artifactId>
111+
<version>1.4.4</version>
112+
<scope>test</scope>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.jenkins-ci.plugins</groupId>
116+
<artifactId>structs</artifactId>
117+
<version>308.v852b473a2b8c</version>
118+
<scope>test</scope>
119+
</dependency>
120+
<dependency>
121+
<groupId>org.jenkins-ci.plugins</groupId>
122+
<artifactId>scm-api</artifactId>
123+
<version>608.vfa_f971c5a_a_e9</version>
124+
<scope>test</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.jenkins-ci.plugins</groupId>
128+
<artifactId>pipeline-build-step</artifactId>
129+
<version>2.18</version>
130+
<scope>test</scope>
131+
</dependency>
132+
</dependencies>
133+
</project>

‎splunk-devops-extend/src/test/java/com/splunk/splunkjenkins/StageStepNodesTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class StageStepNodesTest {
4040
" echo \"hello\"\n" +
4141
" stage('build c'){\n" +
4242
" echo \"hello\"\n" +
43+
" build job:'dummy-job', wait:false \n" +
4344
" }\n" +
4445
" }\n" +
4546
" }\n" +
@@ -71,6 +72,8 @@ public void testFlattenStageResult() throws Exception {
7172
long startTime = System.currentTimeMillis();
7273
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "nested-stage-job");
7374
p.setDefinition(new CpsFlowDefinition(nestedStage, true));
75+
WorkflowJob dummy = r.jenkins.createProject(WorkflowJob.class, "dummy-job");
76+
dummy.setDefinition(new CpsFlowDefinition("node{}", true));
7477
WorkflowRun b1 = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
7578
assertFalse(b1.isBuilding());
7679
r.assertLogContains("hello", b1);

‎splunk-devops/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<dependency>
203203
<groupId>org.jenkins-ci.plugins</groupId>
204204
<artifactId>script-security</artifactId>
205-
<version>[1.75,)</version>
205+
<version>1118.vba21ca2e3286</version>
206206
</dependency>
207207
<dependency>
208208
<groupId>${project.groupId}</groupId>

‎splunk-devops/src/test/java/com/splunk/splunkjenkins/listeners/LoggingQueueListenerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testQueueMessage() throws ExecutionException, InterruptedException,
4343
assertEquals(1, items.length);
4444
queueId = items[0].getId();
4545
// job waits for start since there is no node have the label
46-
Thread.sleep(TimeUnit.SECONDS.toMillis(3));
46+
Thread.sleep(TimeUnit.SECONDS.toMillis(15));
4747
j.jenkins.getQueue().clear();
4848
splQuery = "event_tag=queue queue_id=" + queueId + " type=dequeue_buildable "
4949
+ "buildable_time>3";

0 commit comments

Comments
 (0)