Merge develop into main
Various changes and additions.
Most notably the Start Script templating, but also many dependency updates and little fixes and refactorings.
Edited by Griefed
Merge request reports
Activity
assigned to @Griefed
added Bug Dependencies Enhancement Feature Refactor labels
changed milestone to %Version 3.x - Enhance!
requested review from @Griefed
added 2 commits
- 1297582c - Set comment on zip archive
- 715070cb - Merge branch 'develop' of https://git.griefed.de/Griefed/ServerPackCreator into develop
ServerPackHandlerTest > runServerPackTest() FAILED java.lang.IllegalArgumentException: File system element for parameter 'file' does not exist: '/builds/Griefed/ServerPackCreator/server-packs/fabric_tests_copy_server_pack.zip' at org.apache.commons.io.FileUtils.requireExists(FileUtils.java:2701) at org.apache.commons.io.FileUtils.sizeOfAsBigInteger(FileUtils.java:2860) at de.griefed.serverpackcreator.ServerPackHandler.run(ServerPackHandler.java:198) at de.griefed.serverpackcreator.ServerPackHandlerTest.runServerPackTest(ServerPackHandlerTest.java:211)
added 24 commits
- 16b9fa05 - chore(deps): bump griefed/baseimage-ubuntu-jdk-8 from 2.0.10 to 2.0.11
- 944bd339 - chore(deps): bump spring-boot-starter-web from 2.7.0 to 2.7.1
- 8d01f28c - chore(deps): bump core-js from 3.22.8 to 3.23.4 in /frontend
- 37af17de - chore(deps-dev): bump @types/node from 17.0.24 to 18.0.3 in /frontend
- d589fff1 - chore(deps): bump vue from 3.2.33 to 3.2.37 in /frontend
- 700f9b86 - chore(deps-dev): bump eslint-plugin-vue from 8.7.1 to 9.2.0 in /frontend
- 691be8c0 - chore(deps): bump log4j-web from 2.17.2 to 2.18.0
- 6018b76c - chore(deps): bump io.spring.dependency-management
- aaae449a - chore(deps): bump log4j-core from 2.17.2 to 2.18.0
- 08f0e62e - Merge pull request #384 from...
- 88031534 - Merge pull request #383 from...
- b423d6c7 - Merge pull request #382 from...
- fb50b1c3 - Merge pull request #385 from...
- e1dadf2e - Merge pull request #380 from Griefed/dependabot-npm_and_yarn-frontend-dependabot-vue-3.2.37
- 82bf2abf - Merge pull request #379 from Griefed/dependabot-npm_and_yarn-frontend-dependabot-types-node-18.0.3
- 439a6db4 - Merge pull request #377 from Griefed/dependabot-npm_and_yarn-frontend-dependabot-core-js-3.23.4
- 8132c830 - Merge pull request #376 from...
- 2b635b08 - chore(deps): bump log4j-jul from 2.17.2 to 2.18.0
- 607ad8d7 - Merge pull request #375 from...
- e4a61479 - chore(deps-dev): bump eslint from 8.18.0 to 8.19.0 in /frontend
- 741d6554 - Merge pull request #378 from Griefed/dependabot-npm_and_yarn-frontend-dependabot-eslint-8.19.0
- 5c4a8265 - Merge branch 'dependabot' into...
- b36d8760 - Merge pull request #381 from...
- 5aa675e8 - Merge branch 'dependabot' of https://github.com/Griefed/ServerPackCreator into develop
Toggle commit listenabled an automatic merge when the pipeline for 30c9033a succeeds
mentioned in commit d3ee454a
Please register or sign in to reply