archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue #1083 - Update JSW to latest version to keep up with OS updates

Browse Source
This commit is contained in:
Robin Shen 2023-01-07 10:34:19 +08:00
parent 5db85fb8be
commit d0e76699b6
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
license.txt
View File

@ -1,6 +1,6 @@
The MIT License
Copyright (c) 2018-2022 onedev.io
Copyright (c) 2018-2023 onedev.io
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

4
server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java
View File

@ -29,7 +29,7 @@ public class RunContainerStep extends Step {
private static final long serialVersionUID = 1L;
private String image;
private String args;
private List<EnvVar> envVars = new ArrayList<>();
@ -75,7 +75,7 @@ public class RunContainerStep extends Step {
this.args = args;
}
@Editable(order=200, name="Working Directory", description="Optionally specify working directory of the container. "
@Editable(order=300, name="Working Directory", description="Optionally specify working directory of the container. "
+ "Leave empty to use default working directory of the container")
@SafePath
@Interpolative(variableSuggester="suggestVariables")

10
server-product/jsw/App.sh.in
View File

@ -1,7 +1,7 @@
#! /bin/sh
#
# Copyright (c) 1999, 2021 Tanuki Software, Ltd.
# Copyright (c) 1999, 2022 Tanuki Software, Ltd.
# http://www.tanukisoftware.com
# All rights reserved.
#
@ -12,7 +12,7 @@
#
# Java Service Wrapper sh script. Suitable for starting and stopping
# wrapped Java applications on UNIX platforms.
# Optimized for use with version 3.5.48-st of the Wrapper.
# Optimized for use with version 3.5.51-st of the Wrapper.
#
#-----------------------------------------------------------------------------
@ -1722,7 +1722,7 @@ launchinternal() {
if [ "X$pid" = "X" ]
then
# The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $APPNAMEPROP $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.48 $ADDITIONAL_PARA"
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $APPNAMEPROP $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.51 $ADDITIONAL_PARA"
eval "$COMMAND_LINE"
else
eval echo `gettext '$APP_LONG_NAME is already running.'`
@ -1797,7 +1797,7 @@ console() {
prepAdditionalParams "$@"
# The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" $APPNAMEPROP $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.48 $ADDITIONAL_PARA"
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" $APPNAMEPROP $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.51 $ADDITIONAL_PARA"
eval "$COMMAND_LINE"
COMMAND_EXIT_CODE=$?
if [ $COMMAND_EXIT_CODE -ne 0 ] ; then
@ -2235,7 +2235,7 @@ start() {
prepAdditionalParams "$@"
# The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $APPNAMEPROP $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.48 $ADDITIONAL_PARA"
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $APPNAMEPROP $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.51 $ADDITIONAL_PARA"
eval "$COMMAND_LINE"
startwait

4
server-product/jsw/AppCommand.bat.in
View File

@ -2,7 +2,7 @@
setlocal
rem
rem Copyright (c) 1999, 2021 Tanuki Software, Ltd.
rem Copyright (c) 1999, 2022 Tanuki Software, Ltd.
rem http://www.tanukisoftware.com
rem All rights reserved.
rem
@ -16,7 +16,7 @@ rem
rem -----------------------------------------------------------------------------
rem These settings can be modified to fit the needs of your application
rem Optimized for use with version 3.5.48-st of the Wrapper.
rem Optimized for use with version 3.5.51-st of the Wrapper.
rem The base name for the Wrapper binary.
set _WRAPPER_BASE=wrapper

12
server-product/jsw/agent-license.conf
View File

@ -1,13 +1,13 @@
#encoding=UTF-8
wrapper.license.type=DEV
wrapper.license.id=202201160000003
wrapper.license.id=202301070000002
wrapper.license.licensee=OneDev
wrapper.license.group=service wrapping
wrapper.license.dev_application=Service Wrapping
wrapper.license.features=64bit
wrapper.license.upgrade_term.begin_date=2020-11-09
wrapper.license.upgrade_term.end_date=2022-04-26
wrapper.license.key.1=40cc-310f-ff1e-9e67
wrapper.license.key.2=f060-e179-42b5-9017
wrapper.license.key.3=28e4-8279-3cfc-11bc
wrapper.license.key.4=467c-bff9-e17d-8617
wrapper.license.upgrade_term.end_date=2023-04-26
wrapper.license.key.1=738d-5fef-1202-50e7
wrapper.license.key.2=83dc-f00f-75b5-ec96
wrapper.license.key.3=6cbf-9de8-6d47-3f89
wrapper.license.key.4=a169-5d98-4bf8-e647

12
server-product/jsw/server-license.conf
View File

@ -1,13 +1,13 @@
#encoding=UTF-8
wrapper.license.type=DEV
wrapper.license.id=202201160000002
wrapper.license.id=202301070000001
wrapper.license.licensee=OneDev
wrapper.license.group=service wrapping
wrapper.license.dev_application=Service Wrapping
wrapper.license.features=64bit
wrapper.license.upgrade_term.begin_date=2020-11-09
wrapper.license.upgrade_term.end_date=2022-04-26
wrapper.license.key.1=0d78-a74a-22d9-f2da
wrapper.license.key.2=3dcd-2f84-5e27-55a8
wrapper.license.key.3=147a-1f06-d10e-9be7
wrapper.license.key.4=9f95-ec6b-c14f-8db8
wrapper.license.upgrade_term.end_date=2023-04-26
wrapper.license.key.1=1c59-d3d6-2ada-026a
wrapper.license.key.2=7eb6-f935-f3e7-29df
wrapper.license.key.3=a1ad-a6bd-ea47-fc5c
wrapper.license.key.4=9e9f-ec38-6890-d1ab

BIN
server-product/jsw/wrapper-delta-pack-3.5.48-st.zip
View File

Binary file not shown.

BIN
server-product/jsw/wrapper-delta-pack-3.5.51-st.zip Normal file
View File

Binary file not shown.

2
server-product/jsw/wrapper.conf
View File

@ -38,7 +38,7 @@ wrapper.restart.reload_configuration=TRUE
wrapper.single_invocation=TRUE
#********************************************************************
# Wrapper Java Properties. OneDev requires at least Java version 8
# Wrapper Java Properties. OneDev requires at least Java version 11
#********************************************************************
# Specify Java 11 or higher executable to be used. You may simply specify it
# as "java" if the one in system path is appropriate, or specify the full path