Browse Source

msa and packaging java 17 support

pull/8460/head
YevhenBondarenko 3 years ago
parent
commit
1849007610
  1. 2
      msa/monitoring/docker/Dockerfile
  2. 4
      msa/tb-node/docker/Dockerfile
  3. 2
      msa/tb/docker-cassandra/Dockerfile
  4. 2
      msa/tb/docker-postgres/Dockerfile
  5. 2
      msa/transport/coap/docker/Dockerfile
  6. 2
      msa/transport/http/docker/Dockerfile
  7. 2
      msa/transport/lwm2m/docker/Dockerfile
  8. 2
      msa/transport/mqtt/docker/Dockerfile
  9. 2
      msa/transport/snmp/docker/Dockerfile
  10. 2
      msa/vc-executor-docker/docker/Dockerfile
  11. 4
      packaging/java/build.gradle
  12. 6
      packaging/java/scripts/windows/install.bat
  13. 4
      pom.xml

2
msa/monitoring/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
COPY start-tb-monitoring.sh ${pkg.name}.deb /tmp/

4
msa/tb-node/docker/Dockerfile

@ -14,11 +14,11 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
COPY start-tb-node.sh ${pkg.name}.deb /tmp/
RUN echo 'networkaddress.cache.ttl=60' >> /etc/java-11-openjdk/security/java.security \
RUN echo 'networkaddress.cache.ttl=60' >> /etc/java-17-openjdk/security/java.security \
&& chmod a+x /tmp/*.sh \
&& mv /tmp/start-tb-node.sh /usr/bin && \
(yes | dpkg -i /tmp/${pkg.name}.deb) && \

2
msa/tb/docker-cassandra/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
ENV PG_MAJOR=12

2
msa/tb/docker-postgres/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
ENV PG_MAJOR 12

2
msa/transport/coap/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/

2
msa/transport/http/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/

2
msa/transport/lwm2m/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
COPY start-tb-lwm2m-transport.sh ${pkg.name}.deb /tmp/

2
msa/transport/mqtt/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/

2
msa/transport/snmp/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
COPY start-tb-snmp-transport.sh ${pkg.name}.deb /tmp/

2
msa/vc-executor-docker/docker/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk11:bullseye-slim
FROM thingsboard/openjdk17:bullseye-slim
COPY start-tb-vc-executor.sh ${pkg.name}.deb /tmp/

4
packaging/java/build.gradle

@ -92,7 +92,7 @@ buildRpm {
archiveVersion = projectVersion.replace('-', '')
archiveFileName = "${pkgName}.rpm"
requires("java-11")
requires("java-17")
from("${buildDir}/conf") {
include "${pkgName}.conf"
@ -131,7 +131,7 @@ buildDeb {
archiveFileName = "${pkgName}.deb"
requires("openjdk-11-jre").or("java11-runtime").or("oracle-java11-installer").or("openjdk-11-jre-headless")
requires("openjdk-17-jre").or("java17-runtime").or("oracle-java17-installer").or("openjdk-17-jre-headless")
from("${buildDir}/conf") {
include "${pkgName}.conf"

6
packaging/java/scripts/windows/install.bat

@ -11,7 +11,7 @@ if %jver% NEQ 110 GOTO JAVA_NOT_INSTALLED
:JAVA_INSTALLED
@ECHO Java 11 found!
@ECHO Java 17 found!
@ECHO Installing thingsboard ...
SET loadDemo=false
@ -50,8 +50,8 @@ POPD
GOTO END
:JAVA_NOT_INSTALLED
@ECHO Java 11 is not installed. Only Java 11 is supported
@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 11. Then retry installation.
@ECHO Java 17 is not installed. Only Java 17 is supported
@ECHO Please go to https://adoptopenjdk.net/index.html and install Java 17. Then retry installation.
PAUSE
GOTO END

4
pom.xml

@ -605,7 +605,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>17</release>
<compilerArgs>
@ -650,7 +650,7 @@
<plugin>
<groupId>org.thingsboard</groupId>
<artifactId>gradle-maven-plugin</artifactId>
<version>1.0.11</version>
<version>1.0.12</version>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>

Loading…
Cancel
Save