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

ao-apps · Apr 19, 2023 · 9ffde08 · 9ffde08
2 parents 79b4b2d + c1efadd
commit 9ffde08
Show file tree

Hide file tree

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

diff --git a/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view