Merge remote-tracking branch 'origin/1.x'

ao-apps · Jan 11, 2024 · 3c03b80 · 3c03b80
2 parents d67e876 + 2e5a430
commit 3c03b80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/book/pom.xml b/book/pom.xml
@@ -318,7 +318,7 @@ along with semanticcms-dia-taglib.  If not, see <https://www.gnu.org/licenses/>.
       </dependency>
       <!-- javaee-web-api-bom: <groupId>javax.el</groupId><artifactId>javax.el-api</artifactId> -->
       <dependency>
-        <groupId>joda-time</groupId><artifactId>joda-time</artifactId><version>2.12.5</version>
+        <groupId>joda-time</groupId><artifactId>joda-time</artifactId><version>2.12.6</version>
       </dependency>
       <dependency>
         <groupId>com.semanticcms</groupId><artifactId>semanticcms-core-controller</artifactId><version>2.0.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>

diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 semanticcms-dia-taglib - Java API for embedding Dia-based diagrams in web pages in a JSP environment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024  AO Industries, Inc.
     support@aoindustries.com
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -414,7 +414,7 @@ along with semanticcms-dia-taglib.  If not, see <https://www.gnu.org/licenses/>.
         <groupId>org.apache.commons</groupId><artifactId>commons-lang3</artifactId><version>3.14.0</version>
       </dependency>
       <dependency>
-        <groupId>joda-time</groupId><artifactId>joda-time</artifactId><version>2.12.5</version>
+        <groupId>joda-time</groupId><artifactId>joda-time</artifactId><version>2.12.6</version>
       </dependency>
       <!-- javaee-web-api-bom: <groupId>org.apache.taglibs</groupId><artifactId>taglibs-standard-spec</artifactId> -->
       <dependency>