-
Notifications
You must be signed in to change notification settings - Fork 0
/
diff
159 lines (153 loc) · 5.59 KB
/
diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
diff --git a/pom.xml b/pom.xml
index d61e7fa..6febe2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>plugin</artifactId>
- <version>1.444</version>
- </parent>
+ <groupId>org.eclipse.hudson.plugins</groupId>
+ <artifactId>hudson-plugin-parent</artifactId>
+ <version>3.0.0</version>
+ <relativePath/>
+ </parent>
+ <groupId>org.hudsonci.plugins</groupId>
<artifactId>xvnc</artifactId>
<packaging>hpi</packaging>
- <name>Jenkins Xvnc plugin</name>
- <version>1.13</version>
- <url>http://wiki.jenkins-ci.org/display/JENKINS/Xvnc+Plugin</url>
+ <name>Hudson Xvnc plugin</name>
+ <description>Hudson Xvnc plugin</description>
+ <version>1.13-h-1-SNAPSHOT</version>
+ <url>http://wiki.hudson-ci.org/display/HUDSON/Xvnc+Plugin</url>
<developers>
<developer>
<id>levsa</id>
@@ -19,9 +23,9 @@
</developer>
</developers>
<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>
+ <connection>scm:git:git://github.com/hudson3-plugins/xvnc-plugin.git</connection>
+ <developerConnection>scm:git:[email protected]:hudson3-plugins/xvnc-plugin.git</developerConnection>
+ <url>https://github.com/hudson3-plugins/xvnc-plugin</url>
<tag>HEAD</tag>
</scm>
<build>
@@ -71,17 +75,13 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>
- org.jenkins-ci.tools
- </groupId>
- <artifactId>
- maven-hpi-plugin
- </artifactId>
+ <groupId>org.eclipse.hudson.tools</groupId>
+ <artifactId>maven-hpi-plugin</artifactId>
<versionRange>
[1.74,)
</versionRange>
@@ -95,7 +95,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -114,7 +114,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -133,7 +133,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -144,12 +144,7 @@
</pluginManagement>
</build>
- <repositories>
- <repository>
- <id>repo.jenkins-ci.org</id>
- <url>http://repo.jenkins-ci.org/public/</url>
- </repository>
- </repositories>
+
<pluginRepositories>
<pluginRepository>
@@ -157,4 +152,14 @@
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
-</project>
+<licenses>
+ <license>
+ <name>The MIT license</name>
+ <url>http://opensource.org/licenses/MIT</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <properties>
+ <hudsonTags>buildwrapper</hudsonTags>
+ </properties>
+</project>
diff --git a/src/main/java/hudson/plugins/xvnc/Xvnc.java b/src/main/java/hudson/plugins/xvnc/Xvnc.java
index 429bf5b..169fb46 100644
--- a/src/main/java/hudson/plugins/xvnc/Xvnc.java
+++ b/src/main/java/hudson/plugins/xvnc/Xvnc.java
@@ -21,7 +21,7 @@ import java.io.PrintStream;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
-import jenkins.model.Jenkins;
+import hudson.model.Hudson;
import net.sf.json.JSONObject;
import org.kohsuke.stapler.DataBoundConstructor;
@@ -58,7 +58,7 @@ public class Xvnc extends BuildWrapper {
DescriptorImpl DESCRIPTOR = Hudson.getInstance().getDescriptorByType(DescriptorImpl.class);
// skip xvnc execution
- if (build.getBuiltOn().getAssignedLabels().contains(Jenkins.getInstance().getLabelAtom("noxvnc"))
+ if (build.getBuiltOn().getAssignedLabels().contains(Hudson.getInstance().getLabelAtom("noxvnc"))
|| build.getBuiltOn().getNodeProperties().get(NodePropertyImpl.class) != null) {
return new Environment(){};
}
diff --git a/src/test/java/hudson/plugins/xvnc/DisplayAllocatorTest.java b/src/test/java/hudson/plugins/xvnc/DisplayAllocatorTest.java
index ac647eb..4925444 100644
--- a/src/test/java/hudson/plugins/xvnc/DisplayAllocatorTest.java
+++ b/src/test/java/hudson/plugins/xvnc/DisplayAllocatorTest.java
@@ -1,7 +1,7 @@
package hudson.plugins.xvnc;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.not;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.fail;
import static org.junit.Assert.assertThat;