Skip to content

Commit

Permalink
Merge pull request #76 from EricBerendsen/Java21
Browse files Browse the repository at this point in the history
Update version to 1.20-SNAPSHOT, Java to 21, opencsv to 5.9
  • Loading branch information
EricBerendsen authored Aug 10, 2024
2 parents 6e30644 + 31b9cc2 commit e8432ee
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: 21
- name: Cache Maven packages
uses: actions/cache@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion dvb.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ set JVM_FLAGS=
:: uncomment next line to set initial and maximum head size to 4 GByte
::set JVM_FLAGS=-Xmx4g -Xms4g

java -classpath .;.\lib\jfreechart-1.5.3.jar;.\lib\opencsv-5.7.1.jar;.\lib\jlayer-1.0.1.4.jar;.\lib\commons-text-1.9.jar;.\lib\commons-logging-1.2.jar;.\lib\commons-lang3-3.12.0.jar;.\lib\commons-collections4-4.4.jar;.\lib\commons-collections-3.2.2.jar;.\lib\commons-beanutils-1.9.4.jar;.\DVBinspector.jar %JVM_FLAGS% -Djava.util.logging.config.file=src/main/resources/logging.properties nl.digitalekabeltelevisie.main.DVBinspector
java -classpath .;.\lib\jfreechart-1.5.3.jar;.\lib\opencsv-5.9.jar;.\lib\jlayer-1.0.1.4.jar;.\lib\commons-text-1.9.jar;.\lib\commons-logging-1.2.jar;.\lib\commons-lang3-3.12.0.jar;.\lib\commons-collections4-4.4.jar;.\lib\commons-collections-3.2.2.jar;.\lib\commons-beanutils-1.9.4.jar;.\DVBinspector.jar %JVM_FLAGS% -Djava.util.logging.config.file=src/main/resources/logging.properties nl.digitalekabeltelevisie.main.DVBinspector
2 changes: 1 addition & 1 deletion dvb.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
java -classpath .:./lib/jfreechart-1.5.3.jar:./lib/opencsv-5.7.1.jar:./lib/jlayer-1.0.1.4.jar:./lib/commons-text-1.9.jar:./lib/commons-logging-1.2.jar:./lib/commons-lang3-3.12.0.jar:./lib/commons-collections4-4.4.jar:./lib/commons-collections-3.2.2.jar:./lib/commons-beanutils-1.9.4.jar:./DVBinspector.jar -Djava.util.logging.config.file=src/main/resources/logging.properties nl.digitalekabeltelevisie.main.DVBinspector
java -classpath .:./lib/jfreechart-1.5.3.jar:./lib/opencsv-5.9.jar:./lib/jlayer-1.0.1.4.jar:./lib/commons-text-1.9.jar:./lib/commons-logging-1.2.jar:./lib/commons-lang3-3.12.0.jar:./lib/commons-collections4-4.4.jar:./lib/commons-collections-3.2.2.jar:./lib/commons-beanutils-1.9.4.jar:./DVBinspector.jar -Djava.util.logging.config.file=src/main/resources/logging.properties nl.digitalekabeltelevisie.main.DVBinspector
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>nl.digitalekabeltelevisie</groupId>
<artifactId>DVBinspector</artifactId>
<packaging>jar</packaging>
<version>1.19.1</version>
<version>1.20.0-SNAPSHOT</version>
<description>DVB Inspector is an open-source DVB analyzer, written in java</description>
<name>DVBinspector</name>

Expand Down Expand Up @@ -41,7 +41,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<release>17</release>
<release>21</release>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
Expand Down Expand Up @@ -129,7 +129,7 @@
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.7.1</version>
<version>5.9</version>
</dependency>


Expand Down

0 comments on commit e8432ee

Please sign in to comment.