8000 Use new-styled parent pom for plugins · github-cloud/github-plugin@0719dc7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0719dc7

Browse files
lanwenlanwen
committed
Use new-styled parent pom for plugins
1 parent 9c980d6 commit 0719dc7

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

‎pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>1.580</version>
8+
<version>2.3</version>
99
</parent>
1010

1111
<groupId>com.coravy.hudson.plugins.github</groupId>
@@ -47,8 +47,10 @@
4747
</issueManagement>
4848

4949
<properties>
50-
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
51-
<maven-release-plugin.version>2.5.1</maven-release-plugin.version>
50+
<jenkins.version>1.580</jenkins.version>
51+
<jenkins-test-harness.version>1.580</jenkins-test-harness.version>
52+
<release.skipTests>false</release.skipTests>
53+
<maven.javadoc.skip>true</maven.javadoc.skip>
5254
<findbugs-maven-plugin.version>3.0.2</findbugs-maven-plugin.version>
5355
</properties>
5456

@@ -71,15 +73,6 @@
7173
</pluginRepository>
7274
</pluginRepositories>
7375

74-
<dependencyManagement>
75-
<dependencies>
76-
<dependency>
77-
<groupId>com.google.guava</groupId>
78-
<artifactId>guava</artifactId>
79-
<version>11.0.1</version>
80-
</dependency>
81-
</dependencies>
82-
</dependencyManagement>
8376
<dependencies>
8477
<dependency>
8578
<groupId>org.apache.commons</groupId>
@@ -90,7 +83,7 @@
9083
<dependency>
9184
<groupId>org.slf4j</groupId>
9285
<artifactId>slf4j-jdk14</artifactId>
93-
<version>1.7.7</version>
86+
<version>${slf4jVersion}</version>
9487
</dependency>
9588

9689
<dependency>
@@ -222,6 +215,13 @@
222215
</exclusions>
223216
</dependency>
224217

218+
<dependency>
219+
<groupId>xml-apis</groupId>
220+
<artifactId>xml-apis</artifactId>
221+
<version>1.4.01</version>
222+
<scope>test</scope>
223+
</dependency>
224+
225225
</dependencies>
226226

227227
<build>

‎src/main/resources/com/cloudbees/jenkins/GitHubPushTrigger/GitHubWebHookPollingAction/index.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2121
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
THE SOFTWARE.
2323
-->
24-
24+
<?jelly escape-by-default='true'?>
2525
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
2626
<l:layout>
2727
<st:include it="${it.owner}" page="sidepanel.jelly" />

‎src/main/resources/index.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?jelly escape-by-default='true'?>
12
<div>
23
This plugin integrates <a href="http://github.com/">GitHub</a> to Jenkins.
34
</div>

‎src/main/resources/org/jenkinsci/plugins/github/config/GitHubPluginConfig/help-overrideHookUrl.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?jelly escape-by-default='true'?>
12
<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
23
<l:ajax>
34
<div>

‎src/main/resources/org/jenkinsci/plugins/github/config/GitHubPluginConfig/help.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?jelly escape-by-default='true'?>
12
<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
23
<l:ajax>
34
<div>

‎src/test/java/com/cloudbees/jenkins/GlobalConfigSubmitTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public HtmlForm globalConfig() throws IOException, SAXException {
5050

5151
private JenkinsRule.WebClient configureWebClient() {
5252
JenkinsRule.WebClient client = jenkins.createWebClient();
53-
client.setThrowExceptionOnFailingStatusCode(false);
54-
client.setCssEnabled(false);
5553
client.setJavaScriptEnabled(true);
5654
return client;
5755
}

0 commit comments

Comments
 (0)
0