切换至spring boot 3

Zephery · Apr 11, 2023 · 32a5541 · 32a5541
1 parent 2bf89ee
commit 32a5541
Show file tree

Hide file tree

Showing 28 changed files with 39 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -96,6 +96,10 @@ API给java调用，可以点击[这里](http://www.wenzhihuai.com/weibonlp.html)
 
 </div>
 
+
+### 切换至spring boot 3.0
+https://stackoverflow.com/questions/4928271/how-to-install-jstl-the-absolute-uri-http-java-sun-com-jstl-core-cannot-be-r
+
 ### 更新日志
 
 **2016-3-21**：学完ssh，感觉不扎实，心想要整个自己的博客网站  

diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,6 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-servlet-api</artifactId>
-            <version>10.1.2</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/jakarta.servlet.jsp.jstl/jakarta.servlet.jsp.jstl-api -->
         <dependency>
@@ -66,9 +65,8 @@
             <version>4.0.0</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
         </dependency>
         <!-- https://mvnrepository.com/artifact/jakarta.servlet.jsp/jakarta.servlet.jsp-api -->
         <dependency>

diff --git a/src/main/resources/application-common.yml b/src/main/resources/application-common.yml
@@ -36,6 +36,4 @@ management:
         include: "*"
   metrics:
     tags:
-      application: ${spring.application.name}
-  prometheus:
-    push
+      application: ${spring.application.name}
diff --git a/src/main/webapp/aboutme.jsp b/src/main/webapp/aboutme.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="aboutmeactive" value="active"/>

diff --git a/src/main/webapp/blogdetail.jsp b/src/main/webapp/blogdetail.jsp
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <c:choose>
     <c:when test="${blog.category.cId==0}">

diff --git a/src/main/webapp/board.jsp b/src/main/webapp/board.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="boardactive" value="active"/>

diff --git a/src/main/webapp/checkcookie.jsp b/src/main/webapp/checkcookie.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <!DOCTYPE html>
 <html>

diff --git a/src/main/webapp/donate.jsp b/src/main/webapp/donate.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="donateactive" value="active"/>

diff --git a/src/main/webapp/elk.jsp b/src/main/webapp/elk.jsp
@@ -6,8 +6,8 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="logactive" value="active"/>

diff --git a/src/main/webapp/foot.jsp b/src/main/webapp/foot.jsp
@@ -8,7 +8,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <footer class="footer">
     <div class="footer-inner">

diff --git a/src/main/webapp/fortrip.jsp b/src/main/webapp/fortrip.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 
 <c:forEach var="image" items="${images}">

diff --git a/src/main/webapp/head.jsp b/src/main/webapp/head.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="https://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <!DOCTYPE html>
 <html>

diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="indexactive" value="active"/>

diff --git a/src/main/webapp/interest.jsp b/src/main/webapp/interest.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="interestactive" value="active"/>

diff --git a/src/main/webapp/life.jsp b/src/main/webapp/life.jsp
@@ -6,8 +6,8 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="lifeactive" value="active"/>

diff --git a/src/main/webapp/live.jsp b/src/main/webapp/live.jsp
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="liveactive" value="active"/>

diff --git a/src/main/webapp/log.jsp b/src/main/webapp/log.jsp
@@ -2,8 +2,8 @@
 由于不断采用新技术，此页面2017-11-24采用了websocket，之后应该没啥时间整理代码了，此外，网页加载时才连接websocket，所以会导致初始值result为空，此处在js中定义变量时声明为0.0。
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="logactive" value="active"/>

diff --git a/src/main/webapp/myreading.jsp b/src/main/webapp/myreading.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <style>
     .myreading td {

diff --git a/src/main/webapp/myresume.jsp b/src/main/webapp/myresume.jsp
@@ -6,8 +6,8 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="myresumeactive" value="active"/>

diff --git a/src/main/webapp/searchresult.jsp b/src/main/webapp/searchresult.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="indexactive" value="active"/>

diff --git a/src/main/webapp/sidebar.jsp b/src/main/webapp/sidebar.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <link href="http://image.wenzhihuai.com/newlypublished.css?ver=20171017" rel="stylesheet">
 <script>

diff --git a/src/main/webapp/tech.jsp b/src/main/webapp/tech.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="techactive" value="active"/>

diff --git a/src/main/webapp/test.jsp b/src/main/webapp/test.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <!DOCTYPE html>
 <html>

diff --git a/src/main/webapp/trip.jsp b/src/main/webapp/trip.jsp
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="tripactive" value="active"/>

diff --git a/src/main/webapp/websocket.jsp b/src/main/webapp/websocket.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <!DOCTYPE html>
 <html>

diff --git a/src/main/webapp/weibonlp.jsp b/src/main/webapp/weibonlp.jsp
@@ -6,7 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="interestactive" value="active"/>

diff --git a/src/main/webapp/wscharts.jsp b/src/main/webapp/wscharts.jsp
@@ -6,8 +6,8 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="c" uri="jakarta.tags.core" %>
+<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
 <%@ page isELIgnored="false" %>
 <jsp:include page="head.jsp">
     <jsp:param name="logactive" value="active"/>

diff --git a/src/main/webapp/zhoubao.jsp b/src/main/webapp/zhoubao.jsp
@@ -1,5 +1,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="c" uri="jakarta.tags.core" %>
 <%@ page isELIgnored="false" %>
 <!DOCTYPE html>
 <html lang="zh">