Skip to content

Commit d1e0516

Browse files
committed
CLOUDSTACK-9710: Switch to using JDK 1.8
- Switches Travis to use jdk1.8 - Changes java-version to 1.8 - Change jdk/maven version to 1.8 - Excludes failing network plugin F5 due to incompatible dependency issue Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 0db4471 commit d1e0516

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

.java-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7
1+
1.8

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sudo: required
1818
dist: trusty
1919
language: java
2020
jdk:
21-
- oraclejdk7
21+
- oraclejdk8
2222
python:
2323
- "2.7"
2424
cache:

client/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@
987987
</dependency>
988988
</dependencies>
989989
</profile>
990+
<!--
990991
<profile>
991992
<id>f5</id>
992993
<activation>
@@ -1002,6 +1003,7 @@
10021003
</dependency>
10031004
</dependencies>
10041005
</profile>
1006+
-->
10051007
<profile>
10061008
<id>srx</id>
10071009
<activation>

plugins/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@
149149
<module>file-systems/netapp</module>
150150
</modules>
151151
</profile>
152+
<!--
152153
<profile>
153154
<id>f5</id>
154155
<activation>
@@ -160,6 +161,7 @@
160161
<module>network-elements/f5</module>
161162
</modules>
162163
</profile>
164+
-->
163165
<profile>
164166
<id>srx</id>
165167
<activation>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</issueManagement>
4646

4747
<properties>
48-
<cs.jdk.version>1.7</cs.jdk.version>
48+
<cs.jdk.version>1.8</cs.jdk.version>
4949
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5050
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5151

0 commit comments

Comments
 (0)