Skip to content

Commit 864c156

Browse files
dbenndbenn
authored
Merge pull request #555 from AAVSO/551-investigate-moving-from-java-8-to-17-or-higher
551 investigate moving from java 8 to 17 or higher
2 parents d9830b2 + e52458e commit 864c156

21 files changed

Lines changed: 47 additions & 38 deletions

‎.github/workflows/daily-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Java
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: '8'
31+
java-version: '17'
3232
- name: Create plugin dir
3333
run:
3434
mkdir -p ~/vstar_plugins

‎.github/workflows/plugin-UT.yml‎

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

1818
strategy:
1919
matrix:
20-
java: [ '8', '11', '17', '21', '23' ]
20+
java: [ '17', '21', '23' ]
2121

2222
name: Java ${{ matrix.Java }} Plugin UTs
2323

‎.github/workflows/vstar-UT.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
java: [ '8', '11', '17', '21', '23' ]
19+
java: [ '17', '21', '23' ]
2020

2121
name: Java ${{ matrix.Java }} VStar UTs
2222

‎build-dev.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@
9595
<replace file="${ui_resources}/RevisionAccessor.java" token="@revision@" value="${svn_revision}" />
9696

9797
<!-- Compile source -->
98-
<javac compiler="modern" source="1.8" target="1.8" srcdir="${src}" destdir="${src_build}" includeantruntime="false">
98+
<javac compiler="modern" source="17" target="17" srcdir="${src}" destdir="${src_build}" includeantruntime="false">
9999
<classpath refid="build.classpath" />
100100
</javac>
101101
</target>
102102

103103
<target name="debug" depends="init, manifest" description="Compile the source">
104104
<!-- Compile source. -->
105-
<javac compiler="modern" source="1.8" target="1.8" srcdir="${src}" destdir="${src_build_debug}" debug="on" debuglevel="lines,vars,source" includeantruntime="false">
105+
<javac compiler="modern" source="17" target="17" srcdir="${src}" destdir="${src_build_debug}" debug="on" debuglevel="lines,vars,source" includeantruntime="false">
106106
<classpath refid="build.classpath" />
107107
</javac>
108108

@@ -186,7 +186,7 @@
186186
<!-- Unit test targets -->
187187

188188
<target name="compile_ut" depends="dist" description="Compile the test code">
189-
<javac compiler="modern" source="1.8" target="1.8" srcdir="${test}" destdir="${test_build}">
189+
<javac compiler="modern" source="17" target="17" srcdir="${test}" destdir="${test_build}">
190190
<classpath refid="test.classpath" />
191191
</javac>
192192
</target>
@@ -237,7 +237,7 @@
237237
<delete file="${basedir}/cobertura.ser" />
238238

239239
<!-- Compile source as debug. -->
240-
<javac compiler="modern" source="1.8" target="1.8" srcdir="${src}" destdir="${src_build_debug}" debug="on" debuglevel="lines,vars,source">
240+
<javac compiler="modern" source="17" target="17" srcdir="${src}" destdir="${src_build_debug}" debug="on" debuglevel="lines,vars,source">
241241
<classpath refid="build.classpath" />
242242
</javac>
243243

‎build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@
105105
<replace file="${ui_resources}/RevisionAccessor.java" token="@revision@" value="${git_revision}" />
106106
<replace file="${ui_resources}/RevisionAccessor.java" token="@build_time@" value="${BUILD_TIME}" />
107107
<!-- Compile source -->
108-
<javac compiler="modern" source="1.8" target="1.8" encoding="UTF-8" srcdir="${src}" destdir="${src_build}" includeantruntime="false" debug="on" debuglevel="lines,vars,source">
108+
<javac compiler="modern" source="17" target="17" encoding="UTF-8" srcdir="${src}" destdir="${src_build}" includeantruntime="false" debug="on" debuglevel="lines,vars,source">
109109
<classpath refid="build.classpath" />
110110
</javac>
111111
</target>
112112

113113
<target name="debug" depends="init,antlr4,manifest" description="Compile the source for debug">
114114
<!-- Compile source. -->
115-
<javac compiler="modern" source="1.8" target="1.8" srcdir="${src}" destdir="${src_build_debug}" debug="on" debuglevel="lines,vars,source">
115+
<javac compiler="modern" source="17" target="17" srcdir="${src}" destdir="${src_build_debug}" debug="on" debuglevel="lines,vars,source">
116116
<classpath refid="build.classpath" />
117117
</javac>
118118

@@ -327,7 +327,7 @@
327327
<!-- Unit test targets -->
328328

329329
<target name="compile_ut" depends="dist" description="Compile the test code">
330-
<javac compiler="modern" source="1.8" target="1.8" srcdir="${test}" destdir="${test_build}" debug="on" debuglevel="lines,vars,source">
330+
<javac compiler="modern" source="17" target="17" srcdir="${test}" destdir="${test_build}" debug="on" debuglevel="lines,vars,source">
331331
<classpath refid="test.classpath" />
332332
</javac>
333333
</target>

‎install-files/VStarSetup.iss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@ begin
274274
end;
275275
if not JavaFound then begin
276276
Message := Message +
277-
'\par\par Test for "javaw.exe" failed!\par It seems there is no Java Runtime Environment (JRE) installed on your machine.\par ' +
278-
'You can download JRE installer from the Java download site \par' +
279-
'{\field{\*\fldinst{HYPERLINK "https://www.java.com/download/"}}{\fldrslt{\ul\cf1 https://www.java.com/download/}}}';
277+
'\par\par Test for "javaw.exe" failed!\par It seems that Java is not installed on your machine.\par ' +
278+
'You can download and install Java from: \par' +
279+
'{\field{\*\fldinst{HYPERLINK "https://openjdk.org/"}}{\fldrslt{\ul\cf1 https://openjdk.org/}}}';
280280
end;
281281
Message := Message + '}';
282282
RichViewer.RTFText := Message;

‎plugin/build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
</path>
4141
<mkdir dir="${build}" />
4242
<!-- Compile the java code from ${src} into ${build} -->
43-
<javac compiler="modern" source="1.8" target="1.8" encoding="UTF-8" srcdir="${src_lib}" destdir="${build}" classpathref="libs" />
44-
<javac compiler="modern" source="1.8" target="1.8" encoding="UTF-8" srcdir="${src}" destdir="${build}" classpathref="libs" />
43+
<javac compiler="modern" source="17" target="17" encoding="UTF-8" srcdir="${src_lib}" destdir="${build}" classpathref="libs" />
44+
<javac compiler="modern" source="17" target="17" encoding="UTF-8" srcdir="${src}" destdir="${build}" classpathref="libs" />
4545
</target>
4646

4747
<target name="dist" depends="compile" description="generate the distribution">
@@ -121,7 +121,7 @@
121121
</path>
122122

123123
<target name="compile_ut" depends="dist" description="Compile the test code">
124-
<javac compiler="modern" source="1.8" target="1.8" srcdir="${test}" destdir="${test_build}">
124+
<javac compiler="modern" source="17" target="17" srcdir="${test}" destdir="${test_build}">
125125
<classpath refid="test.classpath" />
126126
</javac>
127127
</target>

‎plugin/plugin-dev/build-template.xml‎

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

6262
<!-- Compile the java code from ${src} into ${build} -->
6363
<mkdir dir="${build}" />
64-
<javac compiler="modern" source="1.8" target="1.8" srcdir="${plugin_src_dir}" destdir="${build}" classpathref="libs" />
64+
<javac compiler="modern" source="17" target="17" srcdir="${plugin_src_dir}" destdir="${build}" classpathref="libs" />
6565
</target>
6666

6767
<target name="jar" depends="compile" description="Generate the distribution jar">

‎src/org/aavso/tools/vstar/auth/AAVSOPostUserPassXMLAuthenticationSource.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
* This class authenticates an AAVSO user via an http POST method that makes use
4242
* of a VSX web service to obtain user information.
4343
*
44-
* @deprecated see Auth0JSONAutheticationSource
44+
* see Auth0JSONAutheticationSource
4545
*/
46+
@Deprecated
4647
public class AAVSOPostUserPassXMLAuthenticationSource implements IAuthenticationSource {
4748

4849
private static final String AUTH_URL = "https://www.aavso.org/apps/api-auth/";

‎src/org/aavso/tools/vstar/auth/VSXWebServiceMemberInfo.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
* This class adds AAVSO observer code and membership status to a LoginInfo
3636
* object.
3737
*
38-
* @deprecated see Auth0JSONAutheticationSource
38+
* See Auth0JSONAutheticationSource
3939
*/
40+
@Deprecated
4041
public class VSXWebServiceMemberInfo {
4142

4243
/**

0 commit comments

Comments
 (0)