8000 Merge pull request #113 from lanwen/plugin-pom · github-cloud/github-plugin@4cf308e · GitHub
[go: up one dir, main page]
Skip to content
< 8000 /div>

Commit 4cf308e

Browse files
lanwenlanwen
committed
Merge pull request jenkinsci#113 from lanwen/plugin-pom
Use new-styled parent pom for plugins
2 parents 9c980d6 + a33285a commit 4cf308e

File tree

6 files changed

+22
-33
lines changed

6 files changed

+22
-33
lines changed

‎pom.xml

Lines changed: 18 additions & 30 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.6</version>
99
</parent>
1010

1111
<groupId>com.coravy.hudson.plugins.github</groupId>
@@ -40,46 +40,35 @@
4040
<url>https://github.com/jenkinsci/github-plugin</url>
4141
<tag>HEAD</tag>
4242
</scm>
43-
4443
<issueManagement>
4544
<system>JIRA</system>
4645
<url>https://issues.jenkins-ci.org/browse/JENKINS/component/15896</url>
4746
</issueManagement>
4847

4948
<properties>
50-
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
51-
<maven-release-plugin.version>2.5.1</maven-release-plugin.version>
49+
<jenkins.version>1.580</jenkins.version>
50+
<jenkins-test-harness.version>1.580</jenkins-test-harness.version>
51+
<release.skipTests>false</release.skipTests>
52+
<maven.javadoc.skip>true</maven.javadoc.skip>
5253
<findbugs-maven-plugin.version>3.0.2</findbugs-maven-plugin.version>
54+
<concurrency>1</concurrency>
55+
<java.level>7</java.level>
5356
</properties>
5457

5558
<repositories>
5659
<repository>
5760
<id>repo.jenkins-ci.org</id>
58-
<name>Jenkins Repository</name>
59-
<url>http://repo.jenkins-ci.org/public/</url>
60-
</repository>
61-
<repository>
62-
<id>jgit-repository</id>
63-
<name>Eclipse JGit Repository</name>
64-
<url>http://download.eclipse.org/jgit/maven</url>
61+
<url>https://repo.jenkins-ci.org/public/</url>
6562
</repository>
6663
</repositories>
64+
6765
<pluginRepositories>
6866
<pluginRepository>
6967
<id>repo.jenkins-ci.org</id>
70-
<url>http://repo.jenkins-ci.org/public/</url>
68+
<url>https://repo.jenkins-ci.org/public/</url>
7169
</pluginRepository>
7270
</pluginRepositories>
7371

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>
8372
<dependencies>
8473
<dependency>
8574
<groupId>org.apache.commons</groupId>
@@ -90,7 +79,7 @@
9079
<dependency>
9180
<groupId>org.slf4j</groupId>
9281
<artifactId>slf4j-jdk14</artifactId>
93-
<version>1.7.7</version>
82+
<version>${slf4jVersion}</version>
9483
</dependency>
9584

9685
<dependency>
@@ -222,18 +211,17 @@
222211
</exclusions>
223212
</dependency>
224213

214+
<dependency>
215+
<groupId>xml-apis</groupId>
216+
<artifactId>xml-apis</artifactId>
217+
<version>1.4.01</version>
218+
<scope>test</scope>
219+
</dependency>
220+
225221
</dependencies>
226222

227223
<build>
228224
<plugins>
229-
<plugin>
230-
<artifactId>maven-compiler-plugin</artifactId>
231-
<configuration>
232-
<source>1.7</source>
233-
<target>1.7</target>
234-
</configuration>
235-
</plugin>
236-
237225
<plugin>
238226
<groupId>nl.geodienstencentrum.maven& 67E6 lt;/groupId>
239227
<artifactId>sass-maven-plugin</artifactId>

‎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