Compare commits
38 commits
5e7e9928af
...
a3a90c17ca
Author | SHA1 | Date | |
---|---|---|---|
a3a90c17ca | |||
5ffc647e64 | |||
ef572aa7f8 | |||
6c54afad92 | |||
8df5414e6e | |||
ae550148d4 | |||
ff30bc43a3 | |||
bdcaf06d8d | |||
9f5e19bfcf | |||
318fd04ff7 | |||
f723404f96 | |||
6114af4cc6 | |||
9b5fe093b0 | |||
c336fc1f97 | |||
38b0667d2b | |||
9c9f8317b2 | |||
9ad65bbae5 | |||
ffe73e0e5a | |||
f258bbc81f | |||
72286377df | |||
dee6227989 | |||
29bf38aab2 | |||
b6004b3a31 | |||
a53ff1b03c | |||
95aa91f33b | |||
583f27f95d | |||
4df9ce571a | |||
c9f7ce7b1a | |||
41f3d384c5 | |||
d25965a116 | |||
45603d8794 | |||
3aeb363485 | |||
02d566809c | |||
c7386c4ef2 | |||
31e86e0af9 | |||
8e38572d31 | |||
fcb6b286f3 | |||
16448dab95 |
13 changed files with 972 additions and 1857 deletions
|
@ -10,8 +10,8 @@ end_of_line = lf
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.{java,skin}]
|
||||||
|
indent_size = 3
|
||||||
|
|
||||||
[*.md]
|
[*.md]
|
||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
|
|
||||||
[*.{java}]
|
|
||||||
indent_size = 3
|
|
||||||
|
|
17
.github/workflows/renovate.yml
vendored
17
.github/workflows/renovate.yml
vendored
|
@ -1,10 +1,9 @@
|
||||||
name: Run Renovate
|
name: Run Renovate
|
||||||
|
|
||||||
#on: workflow_dispatch
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "42 * * * *"
|
- cron: "42 * * * *"
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
renovate:
|
renovate:
|
||||||
|
@ -14,28 +13,28 @@ jobs:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Run Renovate
|
- name: Run Renovate
|
||||||
run: npx renovate
|
# See <https://docs.renovatebot.com/troubleshooting/#log-debug-levels>
|
||||||
|
# debug | info | warn | error | fatal
|
||||||
|
run: LOG_LEVEL=info npx renovate
|
||||||
env:
|
env:
|
||||||
# Renovate is using this token to retrieve release notes
|
# Renovate is using this token to retrieve release notes
|
||||||
GITHUB_COM_TOKEN: ${{ secrets.renovate_github_com_token }}
|
GITHUB_COM_TOKEN: ${{ secrets.renovate_github_com_token }}
|
||||||
# See <https://docs.renovatebot.com/troubleshooting/#log-debug-levels>
|
|
||||||
LOG_LEVEL: info # debug | info | warn | error | fatal
|
|
||||||
RENOVATE_AUTODISCOVER: 'true'
|
|
||||||
RENOVATE_CONFIG_FILE: renovate.json
|
RENOVATE_CONFIG_FILE: renovate.json
|
||||||
RENOVATE_ENDPOINT: ${{ github.api_url }}
|
RENOVATE_ENDPOINT: ${{ github.api_url }}
|
||||||
RENOVATE_GIT_AUTHOR: Renovate Bot <mail+renovate@antville.org>
|
RENOVATE_GIT_AUTHOR: Renovate Bot <mail+renovate@antville.org>
|
||||||
#RENOVATE_GIT_IGNORED_AUTHORS:
|
|
||||||
# - 29139614+renovate[bot]@users.noreply.github.com
|
|
||||||
RENOVATE_IGNORE_PR_AUTHOR: 'true'
|
RENOVATE_IGNORE_PR_AUTHOR: 'true'
|
||||||
RENOVATE_LOG_FILE: renovate-log.ndjson
|
RENOVATE_LOG_FILE: renovate-log.ndjson
|
||||||
RENOVATE_LOG_FILE_LEVEL: debug
|
RENOVATE_LOG_FILE_LEVEL: debug
|
||||||
RENOVATE_PLATFORM: gitea
|
RENOVATE_PLATFORM: gitea
|
||||||
|
RENOVATE_REPOSITORIES: ${{ github.repository }}
|
||||||
RENOVATE_REPOSITORY_CACHE: 'enabled'
|
RENOVATE_REPOSITORY_CACHE: 'enabled'
|
||||||
# github.token is not working here, it lacks some permissions required by Renovate
|
# github.token is not working here, it lacks some permissions required by Renovate
|
||||||
RENOVATE_TOKEN: ${{ secrets.renovate_token }} #${{ github.token }}
|
RENOVATE_TOKEN: ${{ secrets.renovate_token }}
|
||||||
|
|
||||||
- name: Save log file
|
- name: Save log file
|
||||||
|
# FIXME: v4 of this action causes an error on Forgejo (“You must configure a GitHub token”)
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
|
if: always()
|
||||||
with:
|
with:
|
||||||
name: renovate-log.ndjson
|
name: renovate-log.ndjson
|
||||||
path: renovate-log.ndjson
|
path: renovate-log.ndjson
|
||||||
|
|
12
build.gradle
12
build.gradle
|
@ -1,7 +1,7 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'base'
|
id 'base'
|
||||||
id 'java'
|
id 'java'
|
||||||
id 'com.github.node-gradle.node' version '7.0.1'
|
id 'com.github.node-gradle.node' version '7.1.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.build.dependsOn 'assemble'
|
tasks.build.dependsOn 'assemble'
|
||||||
|
@ -43,11 +43,11 @@ allprojects {
|
||||||
version = distVersion()
|
version = distVersion()
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'org.commonmark:commonmark:0.21.0'
|
implementation 'org.commonmark:commonmark:0.24.0'
|
||||||
implementation 'org.commonmark:commonmark-ext-autolink:0.21.0'
|
implementation 'org.commonmark:commonmark-ext-autolink:0.24.0'
|
||||||
implementation 'org.commonmark:commonmark-ext-gfm-strikethrough:0.21.0'
|
implementation 'org.commonmark:commonmark-ext-gfm-strikethrough:0.24.0'
|
||||||
implementation 'org.commonmark:commonmark-ext-gfm-tables:0.21.0'
|
implementation 'org.commonmark:commonmark-ext-gfm-tables:0.24.0'
|
||||||
implementation 'org.jsoup:jsoup:1.17.2'
|
implementation 'org.jsoup:jsoup:1.18.3'
|
||||||
implementation 'rome:rome:1.0'
|
implementation 'rome:rome:1.0'
|
||||||
|
|
||||||
implementation('org.lesscss:lesscss:1.7.0.1.1') {
|
implementation('org.lesscss:lesscss:1.7.0.1.1') {
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
String.ELLIPSIS = '…';
|
String.ELLIPSIS = '…';
|
||||||
|
|
||||||
app.addRepository(app.dir + '/../lib/jdom-1.0.jar');
|
app.addRepository(app.dir + '/../lib/jdom-1.0.jar');
|
||||||
app.addRepository(app.dir + '/../lib/jsoup-1.17.2.jar');
|
app.addRepository(app.dir + '/../lib/jsoup-1.18.3.jar');
|
||||||
app.addRepository(app.dir + '/../lib/lesscss-1.7.0.1.1.jar');
|
app.addRepository(app.dir + '/../lib/lesscss-1.7.0.1.1.jar');
|
||||||
app.addRepository(app.dir + '/../lib/rome-1.0.jar');
|
app.addRepository(app.dir + '/../lib/rome-1.0.jar');
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
app.addRepository(app.dir + '/../lib/autolink-0.10.0.jar');
|
app.addRepository(app.dir + '/../lib/autolink-0.11.0.jar');
|
||||||
app.addRepository(app.dir + '/../lib/commonmark-0.21.0.jar');
|
app.addRepository(app.dir + '/../lib/commonmark-0.24.0.jar');
|
||||||
app.addRepository(app.dir + '/../lib/commonmark-ext-autolink-0.21.0.jar');
|
app.addRepository(app.dir + '/../lib/commonmark-ext-autolink-0.24.0.jar');
|
||||||
app.addRepository(app.dir + '/../lib/commonmark-ext-gfm-strikethrough-0.21.0.jar');
|
app.addRepository(app.dir + '/../lib/commonmark-ext-gfm-strikethrough-0.24.0.jar');
|
||||||
app.addRepository(app.dir + '/../lib/commonmark-ext-gfm-tables-0.21.0.jar');
|
app.addRepository(app.dir + '/../lib/commonmark-ext-gfm-tables-0.24.0.jar');
|
||||||
|
|
||||||
var renderMarkdown = (function() {
|
var renderMarkdown = (function() {
|
||||||
const commonMark = new JavaImporter(
|
const commonMark = new JavaImporter(
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
antville.repo.url = https://github.com/antville/antville.git
|
antville.repo.url = https://code.host.antville.org/github.com/antville/antville.git
|
||||||
helma.download.url = https://github.com/antville/helma/releases/download/v20240530%F0%9F%90%9C/helma-20240530.tgz
|
helma.download.url = https://code.host.antville.org/antville/helma/releases/download/25.1.3/helma-25.1.3.tgz
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|
6
gradlew
vendored
6
gradlew
vendored
|
@ -15,6 +15,8 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
|
@ -55,7 +57,7 @@
|
||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
@ -84,7 +86,7 @@ done
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
|
|
2
gradlew.bat
vendored
2
gradlew.bat
vendored
|
@ -13,6 +13,8 @@
|
||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
2746
package-lock.json
generated
2746
package-lock.json
generated
File diff suppressed because it is too large
Load diff
20
package.json
20
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "antville",
|
"name": "antville",
|
||||||
"version": "1.6",
|
"version": "1.6.0",
|
||||||
"description": "Antville is an open source project aimed at the development of a high performance, feature rich weblog hosting software. It can easily host up to several thousands of sites (the number of weblogs is rather limited by the installation owner’s choice and server power than by software limitations).",
|
"description": "Antville is an open source project aimed at the development of a high performance, feature rich weblog hosting software. It can easily host up to several thousands of sites (the number of weblogs is rather limited by the installation owner’s choice and server power than by software limitations).",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"directories": {
|
"directories": {
|
||||||
|
@ -31,20 +31,20 @@
|
||||||
"author": "The Antville People",
|
"author": "The Antville People",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"alpinejs": "3.13.3",
|
"alpinejs": "3.14.8",
|
||||||
"codemirror": "5.65.16",
|
"codemirror": "5.65.18",
|
||||||
"jquery": "3.7.1",
|
"jquery": "3.7.1",
|
||||||
"jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4",
|
"jquery-collagePlus": "github:antville/jquery-collagePlus#0.3.4",
|
||||||
"js-md5": "0.8.3",
|
"js-md5": "0.8.3",
|
||||||
"uikit": "2.27.4"
|
"uikit": "3.21.16"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"browserify": "17.0.0",
|
"browserify": "17.0.1",
|
||||||
"generate-license-file": "3.0.1",
|
"generate-license-file": "3.6.0",
|
||||||
"jsdoc": "4.0.2",
|
"jsdoc": "4.0.4",
|
||||||
"less": "4.2.0",
|
"less": "4.2.1",
|
||||||
"less-plugin-clean-css": "1.5.1",
|
"less-plugin-clean-css": "1.6.0",
|
||||||
"npm-run-all": "4.1.5",
|
"npm-run-all2": "5.0.0",
|
||||||
"onchange": "7.1.0",
|
"onchange": "7.1.0",
|
||||||
"uglifyify": "5.0.2"
|
"uglifyify": "5.0.2"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.github.jk1.dependency-license-report' version '2.5'
|
id 'com.github.jk1.dependency-license-report' version '2.9'
|
||||||
}
|
}
|
||||||
|
|
||||||
def helmaInstallDir = "${rootProject.buildDir}/install/antclick"
|
def helmaInstallDir = "${rootProject.buildDir}/install/antclick"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue