Skip to content

Commit 47a32ba

Browse files
Switching to jdk1.8
1 parent 17725aa commit 47a32ba

9 files changed

Lines changed: 27 additions & 19 deletions

File tree

docs/installationguide/sources/src/main/resources/en-US/Chapter-Download_Install.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The major functional modules of the &THIS.APPLICATION; are:
7373
<para>&THIS.PLATFORM; &THIS.APPLICATION; is an open source project and you have the freedom to build from source. Building from source means you can stay on top with the latest features. Whilst aspects of &THIS.PLATFORM; &THIS.APPLICATION; are quite
7474
complicated, you may find ways to become contributors.</para>
7575

76-
<para>You must have JDK1.7 installed. In addition you must have the following tools installed.</para>
76+
<para>You must have JDK1.8 installed. In addition you must have the following tools installed.</para>
7777
<table
7878
frame="all"
7979
pgwide="1">

docs/installationguide/sources/src/main/resources/en-US/Chapter-Post_Installation_Setup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ BUILD SUCCESSFUL
8989
<para>Pre-Requisites:</para>
9090
<substeps>
9191
<step>
92-
<para>You must have JDK 1.7 and lksctp library installed on your machine.
92+
<para>You must have JDK 1.8 and lksctp library installed on your machine.
9393
</para>
9494
</step>
9595
</substeps>
@@ -168,7 +168,7 @@ BUILD SUCCESSFUL
168168
<para>Pre-Requisites:</para>
169169
<substeps>
170170
<step>
171-
<para>You must have JDK 1.7 installed on your machine.
171+
<para>You must have JDK 1.8 installed on your machine.
172172
</para>
173173
</step>
174174
</substeps>

docs/userguide/sources/src/main/resources/en-US/Chapter-Running.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ The form has three sections:
573573

574574
SIMULATOR_HOME: /home/vinu/restcomm-jss7-6.1.3.GA/ss7/restcomm-ss7-simulator
575575

576-
JAVA: /usr/lib/jvm/jre-1.7.0-openjdk/bin/java
576+
JAVA: /usr/lib/jvm/jre-1.8.0-openjdk/bin/java
577577

578578
JAVA_OPTS: -Dprogram.name=run.sh -Djava.net.preferIPv4Stack=true -Xms256m -Xmx512m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
579579

m3ua/impl/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@
9292
<plugin>
9393
<artifactId>maven-compiler-plugin</artifactId>
9494
<groupId>org.apache.maven.plugins</groupId>
95-
<version>2.3</version>
95+
<version>3.0</version>
9696
<configuration>
97-
<source>1.7</source>
98-
<target>1.7</target>
97+
<source>1.8</source>
98+
<target>1.8</target>
9999
<compilerArgument>
100100
-XDignore.symbol.file=true
101101
</compilerArgument>

map/load/build.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<property name="packageprefix" value="org.restcomm.protocols.ss7.map.load" />
1111
<!-- <property name="packageprefix" value="org.restcomm.protocols.ss7.map.loadDialogic" /> -->
1212

13-
<property name="javac.source" value="1.7" />
13+
<property name="javac.source" value="1.8" />
1414
<property name="srcroot" value="${root}/src" />
1515

1616
<property name="assemble.dir" value="${ant.file.restcomm.release}/../target/load" />
@@ -90,11 +90,10 @@
9090

9191
<echo message="Java Version: ${java.version}" />
9292
<echo message="Java home: ${java.home}" />
93-
<fail message="Unsupported Java version: ${java.version}. Make sure that the version of the Java compiler is 1.7 (7.0) or greater.">
93+
<fail message="Unsupported Java version: ${java.version}. Make sure that the version of the Java compiler is 1.8 (8.0) or greater.">
9494
<condition>
9595
<not>
9696
<or>
97-
<contains string="${java.version}" substring="1.7" casesensitive="false" />
9897
<contains string="${java.version}" substring="1.8" casesensitive="false" />
9998
</or>
10099
</not>

pom.xml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<junit.version>3.8.1</junit.version>
3232
<testng.version>6.2</testng.version>
3333
<javolution.version>5.5.1</javolution.version>
34-
<compiler.plugin.version>2.0.2</compiler.plugin.version>
35-
<compile.source>1.7</compile.source>
34+
<compiler.plugin.version>3.0</compiler.plugin.version>
35+
<compile.source>1.8</compile.source>
3636
<!-- restcomm but not strictly ss7 -->
3737
<asn.version>2.2.0-143</asn.version>
3838
<stream.version>1.0.0.CR1</stream.version>
@@ -305,6 +305,15 @@
305305
<id>release</id>
306306
<modules />
307307
</profile>
308+
<profile>
309+
<id>disable-java8-doclint</id>
310+
<activation>
311+
<jdk>[1.8,)</jdk>
312+
</activation>
313+
<properties>
314+
<additionalparam>-Xdoclint:none</additionalparam>
315+
</properties>
316+
</profile>
308317
<profile>
309318
<id>docs</id>
310319
<modules>

service/wildfly/extension/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<plugins>
2222
<plugin>
2323
<artifactId>maven-compiler-plugin</artifactId>
24-
<version>2.3.1</version>
24+
<version>3.0</version>
2525
<configuration>
26-
<source>1.7</source>
27-
<target>1.7</target>
26+
<source>1.8</source>
27+
<target>1.8</target>
2828
</configuration>
2929
</plugin>
3030
<plugin>

service/wildfly/modules/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<plugins>
2222
<plugin>
2323
<artifactId>maven-compiler-plugin</artifactId>
24-
<version>2.3.1</version>
24+
<version>3.0</version>
2525
<configuration>
26-
<source>1.7</source>
27-
<target>1.7</target>
26+
<source>1.8</source>
27+
<target>1.8</target>
2828
</configuration>
2929
</plugin>
3030
<plugin>

test/tcap-benchmark/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<properties>
1919
<jmh.version>1.17.3</jmh.version>
20-
<javac.target>1.7</javac.target>
20+
<javac.target>1.8</javac.target>
2121
<uberjar.name>benchmarks</uberjar.name>
2222
</properties>
2323

0 commit comments

Comments
 (0)