Skip to content

Commit 5bed201

Browse files
committed
o Upgraded to Jenkins Version 1.644 which
results in upgrade to Java 7 o Needed to add a supplemental dependency xml-apis:xml-apis:1.4.01 to fix issues during the run of the integration tests.
1 parent 296bff1 commit 5bed201

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
<properties>
4646
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4747
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
48-
<maven.compiler.source>1.6</maven.compiler.source>
49-
<maven.compiler.target>1.6</maven.compiler.target>
48+
<maven.compiler.source>1.7</maven.compiler.source>
49+
<maven.compiler.target>1.7</maven.compiler.target>
5050

5151
<!-- Version of Jenkins to use for Integration Tests -->
52-
<jenkins-version>1.593</jenkins-version>
52+
<jenkins-version>1.644</jenkins-version>
5353
<junit.version>4.11</junit.version>
5454
<mockito-core.version>1.9.5</mockito-core.version>
5555
<commons-io.version>2.4</commons-io.version>
@@ -178,6 +178,12 @@
178178
<version>1.7.1</version>
179179
<scope>test</scope>
180180
</dependency>
181+
182+
<dependency>
183+
<groupId>xml-apis</groupId>
184+
<artifactId>xml-apis</artifactId>
185+
<version>1.4.01</version>
186+
</dependency>
181187
</dependencies>
182188

183189
<build>

src/test/java/com/offbytwo/jenkins/integration/ComputerSetIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void shouldGetTotalExecutors() throws JAXBException, IOException, Documen
2525
assertThat(computerSet).isNotNull();
2626
assertThat(computerSet.getBusyExecutors()).isEqualTo(0);
2727
assertThat(computerSet.getTotalExecutors()).isEqualTo(ji.getNumExecutors());
28-
assertThat(computerSet.getDisplayName()).isEqualTo("nodes");
28+
assertThat(computerSet.getDisplayName()).isEqualTo("Nodes");
2929
}
3030

3131
@Test

0 commit comments

Comments
 (0)