Compare commits

...

38 commits

Author SHA1 Message Date
a3a90c17ca Update dependency uikit to v3
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2025-01-03 21:43:32 +00:00
5ffc647e64
Fix NPM version string; needs to be semver 🙄 2025-01-03 22:34:30 +01:00
ef572aa7f8
Update repository and download URLs 2025-01-03 22:34:24 +01:00
6c54afad92 Merge pull request 'Replace dependency npm-run-all with npm-run-all2 5.0.0' (#464) from renovate/npm-run-all-replacement into main
Reviewed-on: #464
2025-01-03 21:31:11 +00:00
8df5414e6e
Merge remote-tracking branch 'origin/main' into renovate/npm-run-all-replacement 2025-01-03 22:30:46 +01:00
ae550148d4 Merge pull request 'Update dependency browserify to v17.0.1' (#465) from renovate/browserify-17.x into main
Reviewed-on: #465
2025-01-03 21:22:11 +00:00
ff30bc43a3
Merge remote-tracking branch 'origin/main' into renovate/browserify-17.x 2025-01-03 22:20:44 +01:00
bdcaf06d8d Merge pull request 'Update dependency codemirror to v5.65.18' (#466) from renovate/codemirror-5.x into main
Reviewed-on: #466
2025-01-03 21:19:16 +00:00
9f5e19bfcf
Merge remote-tracking branch 'origin/main' into renovate/codemirror-5.x 2025-01-03 22:18:53 +01:00
318fd04ff7 Merge pull request 'Update dependency jsdoc to v4.0.4' (#467) from renovate/jsdoc-4.x into main
Reviewed-on: #467
2025-01-03 21:12:56 +00:00
f723404f96
Merge branch 'main' into renovate/jsdoc-4.x 2025-01-03 22:08:38 +01:00
6114af4cc6 Merge pull request 'Update dependency less to v4.2.1' (#468) from renovate/less-4.x into main
Reviewed-on: #468
2025-01-03 21:05:01 +00:00
9b5fe093b0 Merge branch 'main' into renovate/less-4.x 2025-01-03 21:04:45 +00:00
c336fc1f97 Merge pull request 'Update dependency alpinejs to v3.14.8' (#469) from renovate/alpinejs-3.x into main
Reviewed-on: #469
2025-01-03 20:52:28 +00:00
38b0667d2b Merge branch 'main' into renovate/alpinejs-3.x 2025-01-03 20:52:16 +00:00
9c9f8317b2 Merge pull request 'Update dependency generate-license-file to v3.6.0' (#470) from renovate/generate-license-file-3.x into main
Reviewed-on: #470
2025-01-03 20:44:25 +00:00
9ad65bbae5 Merge branch 'main' into renovate/generate-license-file-3.x 2025-01-03 20:44:16 +00:00
ffe73e0e5a Update dependency less to v4.2.1
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2025-01-03 20:43:26 +00:00
f258bbc81f Update dependency browserify to v17.0.1
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2025-01-03 20:43:15 +00:00
72286377df Replace dependency npm-run-all with npm-run-all2 5.0.0 2025-01-03 20:43:09 +00:00
dee6227989 Merge pull request 'Update dependency less-plugin-clean-css to v1.6.0' (#472) from renovate/less-plugin-clean-css-1.x into main
Reviewed-on: #472
2025-01-03 20:41:12 +00:00
29bf38aab2 Merge branch 'main' into renovate/less-plugin-clean-css-1.x 2025-01-03 20:41:04 +00:00
b6004b3a31
Update CommonMark packages to v0.24.0 2025-01-03 21:31:13 +01:00
a53ff1b03c
Update dependency org.jsoup:jsoup to v1.18.3 2025-01-03 21:31:13 +01:00
95aa91f33b
Update plugin com.github.jk1.dependency-license-report to v2.9 2025-01-03 21:28:39 +01:00
583f27f95d
Update plugin com.github.node-gradle.node to v7.1.0 2025-01-03 21:28:39 +01:00
4df9ce571a Merge pull request 'Update dependency gradle to v8.12' (#471) from renovate/gradle-8.x into main
Reviewed-on: #471
2025-01-03 19:31:36 +00:00
c9f7ce7b1a Merge branch 'main' into renovate/gradle-8.x 2025-01-03 18:48:37 +00:00
41f3d384c5
Merge remote-tracking branch 'remotes/origin/main' into origin/main 2025-01-03 19:35:24 +01:00
d25965a116 Enable manual trigger of Renovate workflow 2025-01-03 18:26:40 +00:00
45603d8794 Update Renovate workflow according to changes in antville/helma 2025-01-03 15:36:42 +00:00
3aeb363485 Update dependency alpinejs to v3.14.8
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2024-12-26 15:43:05 +00:00
02d566809c Update dependency gradle to v8.12 2024-12-20 16:43:27 +00:00
c7386c4ef2 Update dependency less-plugin-clean-css to v1.6.0
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2024-12-08 19:44:10 +00:00
31e86e0af9 Update dependency generate-license-file to v3.6.0
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2024-12-08 19:44:02 +00:00
8e38572d31 Update dependency jsdoc to v4.0.4
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2024-12-08 19:43:29 +00:00
fcb6b286f3 Update dependency codemirror to v5.65.18
All checks were successful
renovate/stability-days Updates have met minimum release age requirement
2024-12-08 19:43:20 +00:00
16448dab95
Add EditorConfig for *.skin files 2024-09-21 13:45:39 +02:00
13 changed files with 972 additions and 1857 deletions

View file

@ -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

View file

@ -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

View file

@ -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') {

View file

@ -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');

View file

@ -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(

View file

@ -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

Binary file not shown.

View file

@ -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
View file

@ -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
View file

@ -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

File diff suppressed because it is too large Load diff

View file

@ -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 owners 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 owners 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"
} }

View file

@ -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"