From c2ad3a50ea174a0a3d3354ae0e90dd746b0dda93 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Thu, 7 Nov 2024 17:48:47 +0000 Subject: [PATCH 1/4] Updated for the 3.7.15 release. --- CHANGES | 2 +- Makefile | 4 ++-- pom.xml | 2 +- release-prepare/pom.xml | 2 +- vassal-app/pom.xml | 2 +- vassal-deprecation/pom.xml | 2 +- vassal-doc/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index d87e3abb5b..c63021e5f8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -3.7.15 - ??? +3.7.15 - 7 November 2024 * 13664: Upgraded bundled Java to 21.0.5 (32-bit Windows), 23.0.1 (all others) * 13558: Update logback configuration to prevent messages to console diff --git a/Makefile b/Makefile index 0190c6351f..c1744dcf63 100644 --- a/Makefile +++ b/Makefile @@ -51,9 +51,9 @@ VNUM:=3.7.15 # major-minor part of the version V_MAJ_MIN:=$(shell echo "$(VNUM)" | cut -f1,2 -d'.') -MAVEN_VERSION:=$(VNUM)-SNAPSHOT +#MAVEN_VERSION:=$(VNUM)-SNAPSHOT #MAVEN_VERSION:=$(VNUM)-beta5 -#MAVEN_VERSION:=$(VNUM) +MAVEN_VERSION:=$(VNUM) JARNAME:=vassal-app-$(MAVEN_VERSION) diff --git a/pom.xml b/pom.xml index 8c9dba2cda..4dbf04d1c3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.vassalengine vassal-parent - 3.7.15-SNAPSHOT + 3.7.15 pom Vassal Engine diff --git a/release-prepare/pom.xml b/release-prepare/pom.xml index 5cec9fb3aa..7604eaf543 100644 --- a/release-prepare/pom.xml +++ b/release-prepare/pom.xml @@ -5,7 +5,7 @@ org.vassalengine vassal-parent - 3.7.15-SNAPSHOT + 3.7.15 release-prepare diff --git a/vassal-app/pom.xml b/vassal-app/pom.xml index fdfd022671..30e73ad194 100644 --- a/vassal-app/pom.xml +++ b/vassal-app/pom.xml @@ -6,7 +6,7 @@ org.vassalengine vassal-parent - 3.7.15-SNAPSHOT + 3.7.15 vassal-app diff --git a/vassal-deprecation/pom.xml b/vassal-deprecation/pom.xml index cdc063ae76..03614b4e1b 100644 --- a/vassal-deprecation/pom.xml +++ b/vassal-deprecation/pom.xml @@ -5,7 +5,7 @@ org.vassalengine vassal-parent - 3.7.15-SNAPSHOT + 3.7.15 vassal-deprecation diff --git a/vassal-doc/pom.xml b/vassal-doc/pom.xml index 4391859c2b..ac1bf4b726 100644 --- a/vassal-doc/pom.xml +++ b/vassal-doc/pom.xml @@ -5,7 +5,7 @@ org.vassalengine vassal-parent - 3.7.15-SNAPSHOT + 3.7.15 vassal-doc From 21dc285756b8df8e0b3cac71f61655b9a804c289 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:22:27 +0000 Subject: [PATCH 2/4] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.1 to 3.5.2 Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4dbf04d1c3..daa756979f 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ maven-surefire-plugin - 3.5.1 + 3.5.2 maven-resources-plugin From fed42c34d85dbd0e3da8b3fb95b6fa046eaa3123 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:22:31 +0000 Subject: [PATCH 3/4] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.1 to 3.11.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.1...maven-javadoc-plugin-3.11.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index daa756979f..a9c8ca94ed 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ maven-javadoc-plugin - 3.10.1 + 3.11.1 com.github.spotbugs From d50491fa1104d678c46b5fed30e799ae8b6829a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:22:49 +0000 Subject: [PATCH 4/4] Bump net.bytebuddy:byte-buddy from 1.15.8 to 1.15.10 Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.15.8 to 1.15.10. - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.8...byte-buddy-1.15.10) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vassal-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vassal-app/pom.xml b/vassal-app/pom.xml index 30e73ad194..4a4d2d444e 100644 --- a/vassal-app/pom.xml +++ b/vassal-app/pom.xml @@ -192,7 +192,7 @@ net.bytebuddy byte-buddy - 1.15.8 + 1.15.10 test