홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
f2548cba 1 parent 195cb389

switch to Java 8 

Change-Id: Iaf2b47ce7cfad7fcd5b57c8ec79e0d3e6e66ca73
Inline Side-by-side
Showing 4 changed files with 10 additions and 10 deletions
...@@ -361,8 +361,8 @@ ...@@ -361,8 +361,8 @@
361 <!-- https://jira.codehaus.org/browse/MCOMPILER-205 --> 361 <!-- https://jira.codehaus.org/browse/MCOMPILER-205 -->
362 <version>2.5.1</version> 362 <version>2.5.1</version>
363 <configuration> 363 <configuration>
364 - <source>1.7</source> 364 + <source>1.8</source>
365 - <target>1.7</target> 365 + <target>1.8</target>
366 </configuration> 366 </configuration>
367 </plugin> 367 </plugin>
368 368
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
407 <plugin> 407 <plugin>
408 <groupId>org.apache.felix</groupId> 408 <groupId>org.apache.felix</groupId>
409 <artifactId>maven-scr-plugin</artifactId> 409 <artifactId>maven-scr-plugin</artifactId>
410 - <version>1.15.0</version> 410 + <version>1.20.0</version>
411 <executions> 411 <executions>
412 <execution> 412 <execution>
413 <id>generate-scr-srcdescriptor</id> 413 <id>generate-scr-srcdescriptor</id>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 # Starts ONOS Apache Karaf container 3 # Starts ONOS Apache Karaf container
4 # ----------------------------------------------------------------------------- 4 # -----------------------------------------------------------------------------
5 5
6 -export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk-amd64/} 6 +#export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk-amd64/}
7 export JAVA_OPTS="${JAVA_OPTS:--Xms256M -Xmx2048M}" 7 export JAVA_OPTS="${JAVA_OPTS:--Xms256M -Xmx2048M}"
8 8
9 cd /opt/onos 9 cd /opt/onos
......
...@@ -11,8 +11,8 @@ kill timeout 60 ...@@ -11,8 +11,8 @@ kill timeout 60
11 respawn 11 respawn
12 12
13 env LANG=en_US.UTF-8 13 env LANG=en_US.UTF-8
14 -env JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 14 +#env JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
15 -env NEW_JAVA_HOME=/usr/lib/jvm/java-8-oracle/ 15 +#env NEW_JAVA_HOME=/usr/lib/jvm/java-8-oracle/
16 16
17 pre-stop script 17 pre-stop script
18 /opt/onos/bin/onos halt 2>/opt/onos/var/stderr.log 18 /opt/onos/bin/onos halt 2>/opt/onos/var/stderr.log
......
...@@ -101,9 +101,9 @@ public class TestUtilsTest { ...@@ -101,9 +101,9 @@ public class TestUtilsTest {
101 @Test 101 @Test
102 public void testSetGetPrivateField() throws TestUtilsException { 102 public void testSetGetPrivateField() throws TestUtilsException {
103 103
104 - assertEquals(42, TestUtils.getField(test, "privateField")); 104 + assertEquals(42, (int) TestUtils.getField(test, "privateField"));
105 TestUtils.setField(test, "privateField", 0xDEAD); 105 TestUtils.setField(test, "privateField", 0xDEAD);
106 - assertEquals(0xDEAD, TestUtils.getField(test, "privateField")); 106 + assertEquals(0xDEAD, (int) TestUtils.getField(test, "privateField"));
107 } 107 }
108 108
109 /** 109 /**
...@@ -114,9 +114,9 @@ public class TestUtilsTest { ...@@ -114,9 +114,9 @@ public class TestUtilsTest {
114 @Test 114 @Test
115 public void testSetGetProtectedField() throws TestUtilsException { 115 public void testSetGetProtectedField() throws TestUtilsException {
116 116
117 - assertEquals(2501, TestUtils.getField(test, "protectedField")); 117 + assertEquals(2501, (int) TestUtils.getField(test, "protectedField"));
118 TestUtils.setField(test, "protectedField", 0xBEEF); 118 TestUtils.setField(test, "protectedField", 0xBEEF);
119 - assertEquals(0xBEEF, TestUtils.getField(test, "protectedField")); 119 + assertEquals(0xBEEF, (int) TestUtils.getField(test, "protectedField"));
120 } 120 }
121 121
122 /** 122 /**
......