From c4a0c0562f1818fe4b147a08f54ee7e74f8c66aa Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 2 May 2024 12:24:20 -0400 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=20=20Apache-velocity=20=E9=A1=B9=E7=9B=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {apache-velocity => apache/apache-velocity}/README.md | 0 {apache-velocity => apache/apache-velocity}/pom.xml | 6 +++--- .../java/com/baeldung/apache/velocity/model/Product.java | 0 .../baeldung/apache/velocity/service/ProductService.java | 0 .../com/baeldung/apache/velocity/servlet/LayoutServlet.java | 0 .../baeldung/apache/velocity/servlet/ProductServlet.java | 0 .../apache-velocity}/src/main/resources/logback.xml | 0 .../src/main/webapp/WEB-INF/velocity.properties | 0 .../apache-velocity}/src/main/webapp/WEB-INF/web.xml | 0 .../apache-velocity}/src/main/webapp/fragments/footer.vm | 0 .../apache-velocity}/src/main/webapp/fragments/header.vm | 0 .../apache-velocity}/src/main/webapp/layout/Default.vm | 0 .../apache-velocity}/src/main/webapp/templates/index.vm | 0 .../src/main/webapp/templates/layoutdemo.vm | 0 .../apache/velocity/servlet/LayoutServletLiveTest.java | 0 .../apache/velocity/servlet/ProductServletLiveTest.java | 0 apache/pom.xml | 1 + 17 files changed, 4 insertions(+), 3 deletions(-) rename {apache-velocity => apache/apache-velocity}/README.md (100%) rename {apache-velocity => apache/apache-velocity}/pom.xml (94%) rename {apache-velocity => apache/apache-velocity}/src/main/java/com/baeldung/apache/velocity/model/Product.java (100%) rename {apache-velocity => apache/apache-velocity}/src/main/java/com/baeldung/apache/velocity/service/ProductService.java (100%) rename {apache-velocity => apache/apache-velocity}/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java (100%) rename {apache-velocity => apache/apache-velocity}/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java (100%) rename {apache-velocity => apache/apache-velocity}/src/main/resources/logback.xml (100%) rename {apache-velocity => apache/apache-velocity}/src/main/webapp/WEB-INF/velocity.properties (100%) rename {apache-velocity => apache/apache-velocity}/src/main/webapp/WEB-INF/web.xml (100%) rename {apache-velocity => apache/apache-velocity}/src/main/webapp/fragments/footer.vm (100%) rename {apache-velocity => apache/apache-velocity}/src/main/webapp/fragments/header.vm (100%) rename {apache-velocity => apache/apache-velocity}/src/main/webapp/layout/Default.vm (100%) rename {apache-velocity => apache/apache-velocity}/src/main/webapp/templates/index.vm (100%) rename {apache-velocity => apache/apache-velocity}/src/main/webapp/templates/layoutdemo.vm (100%) rename {apache-velocity => apache/apache-velocity}/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java (100%) rename {apache-velocity => apache/apache-velocity}/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java (100%) diff --git a/apache-velocity/README.md b/apache/apache-velocity/README.md similarity index 100% rename from apache-velocity/README.md rename to apache/apache-velocity/README.md diff --git a/apache-velocity/pom.xml b/apache/apache-velocity/pom.xml similarity index 94% rename from apache-velocity/pom.xml rename to apache/apache-velocity/pom.xml index 5dd56a1d68..4954d97c2a 100644 --- a/apache-velocity/pom.xml +++ b/apache/apache-velocity/pom.xml @@ -9,9 +9,9 @@ apache-velocity - com.baeldung - parent-modules - 1.0.0-SNAPSHOT + com.ossez.apache + apache + 0.0.2-SNAPSHOT diff --git a/apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java b/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java similarity index 100% rename from apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java rename to apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java diff --git a/apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java b/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java similarity index 100% rename from apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java rename to apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java diff --git a/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java b/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java similarity index 100% rename from apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java rename to apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java diff --git a/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java b/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java similarity index 100% rename from apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java rename to apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java diff --git a/apache-velocity/src/main/resources/logback.xml b/apache/apache-velocity/src/main/resources/logback.xml similarity index 100% rename from apache-velocity/src/main/resources/logback.xml rename to apache/apache-velocity/src/main/resources/logback.xml diff --git a/apache-velocity/src/main/webapp/WEB-INF/velocity.properties b/apache/apache-velocity/src/main/webapp/WEB-INF/velocity.properties similarity index 100% rename from apache-velocity/src/main/webapp/WEB-INF/velocity.properties rename to apache/apache-velocity/src/main/webapp/WEB-INF/velocity.properties diff --git a/apache-velocity/src/main/webapp/WEB-INF/web.xml b/apache/apache-velocity/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from apache-velocity/src/main/webapp/WEB-INF/web.xml rename to apache/apache-velocity/src/main/webapp/WEB-INF/web.xml diff --git a/apache-velocity/src/main/webapp/fragments/footer.vm b/apache/apache-velocity/src/main/webapp/fragments/footer.vm similarity index 100% rename from apache-velocity/src/main/webapp/fragments/footer.vm rename to apache/apache-velocity/src/main/webapp/fragments/footer.vm diff --git a/apache-velocity/src/main/webapp/fragments/header.vm b/apache/apache-velocity/src/main/webapp/fragments/header.vm similarity index 100% rename from apache-velocity/src/main/webapp/fragments/header.vm rename to apache/apache-velocity/src/main/webapp/fragments/header.vm diff --git a/apache-velocity/src/main/webapp/layout/Default.vm b/apache/apache-velocity/src/main/webapp/layout/Default.vm similarity index 100% rename from apache-velocity/src/main/webapp/layout/Default.vm rename to apache/apache-velocity/src/main/webapp/layout/Default.vm diff --git a/apache-velocity/src/main/webapp/templates/index.vm b/apache/apache-velocity/src/main/webapp/templates/index.vm similarity index 100% rename from apache-velocity/src/main/webapp/templates/index.vm rename to apache/apache-velocity/src/main/webapp/templates/index.vm diff --git a/apache-velocity/src/main/webapp/templates/layoutdemo.vm b/apache/apache-velocity/src/main/webapp/templates/layoutdemo.vm similarity index 100% rename from apache-velocity/src/main/webapp/templates/layoutdemo.vm rename to apache/apache-velocity/src/main/webapp/templates/layoutdemo.vm diff --git a/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java b/apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java similarity index 100% rename from apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java rename to apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java diff --git a/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java b/apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java similarity index 100% rename from apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java rename to apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java diff --git a/apache/pom.xml b/apache/pom.xml index 6282eb98e5..6c6d44384b 100644 --- a/apache/pom.xml +++ b/apache/pom.xml @@ -16,6 +16,7 @@ apache-httpclient + apache-velocity From b68f72562c5aa2a197b1efe9f56fe571fcad3f4a Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 2 May 2024 12:24:41 -0400 Subject: [PATCH 2/5] =?UTF-8?q?IDEA=20=E4=BB=A3=E7=A0=81=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=B7=9F=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 1 + .idea/encodings.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index d1117e714c..03242e9037 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -21,6 +21,7 @@ + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index ffb87cefe3..85bcf86ab4 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,6 +3,8 @@ + + From d798a38eed684aed25d1ed561c5f58fc90b9ce94 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 2 May 2024 12:26:53 -0400 Subject: [PATCH 3/5] =?UTF-8?q?velocity=20=E6=98=AF=20Apache=20=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E9=A1=B9=E7=9B=AE=EF=BC=8C=E8=99=BD=E7=84=B6=E6=88=91?= =?UTF-8?q?=E4=BB=AC=E7=8E=B0=E5=9C=A8=E8=BF=98=E5=9C=A8=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E7=94=A8=E7=9A=84=E9=A2=91=E7=8E=87=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E4=B8=8D=E9=AB=98=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{baeldung => ossez}/apache/velocity/model/Product.java | 2 +- .../apache/velocity/service/ProductService.java | 4 ++-- .../apache/velocity/servlet/LayoutServlet.java | 6 +++--- .../apache/velocity/servlet/ProductServlet.java | 6 +++--- apache/apache-velocity/src/main/webapp/WEB-INF/web.xml | 4 ++-- .../apache/velocity/servlet/LayoutServletLiveTest.java | 2 +- .../apache/velocity/servlet/ProductServletLiveTest.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename apache/apache-velocity/src/main/java/com/{baeldung => ossez}/apache/velocity/model/Product.java (91%) rename apache/apache-velocity/src/main/java/com/{baeldung => ossez}/apache/velocity/service/ProductService.java (83%) rename apache/apache-velocity/src/main/java/com/{baeldung => ossez}/apache/velocity/servlet/LayoutServlet.java (86%) rename apache/apache-velocity/src/main/java/com/{baeldung => ossez}/apache/velocity/servlet/ProductServlet.java (85%) rename apache/apache-velocity/src/test/java/com/{baeldung => ossez}/apache/velocity/servlet/LayoutServletLiveTest.java (93%) rename apache/apache-velocity/src/test/java/com/{baeldung => ossez}/apache/velocity/servlet/ProductServletLiveTest.java (93%) diff --git a/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/model/Product.java similarity index 91% rename from apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java rename to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/model/Product.java index c215223181..0ef386c6e4 100644 --- a/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/model/Product.java +++ b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/model/Product.java @@ -1,4 +1,4 @@ -package com.baeldung.apache.velocity.model; +package com.ossez.apache.velocity.model; public class Product { diff --git a/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/service/ProductService.java similarity index 83% rename from apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java rename to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/service/ProductService.java index 0a623d4d65..07f2e53152 100644 --- a/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/service/ProductService.java +++ b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/service/ProductService.java @@ -1,6 +1,6 @@ -package com.baeldung.apache.velocity.service; +package com.ossez.apache.velocity.service; -import com.baeldung.apache.velocity.model.Product; +import com.ossez.apache.velocity.model.Product; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/LayoutServlet.java similarity index 86% rename from apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java rename to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/LayoutServlet.java index d4208a3880..282e2dd08b 100644 --- a/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/LayoutServlet.java +++ b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/LayoutServlet.java @@ -1,7 +1,7 @@ -package com.baeldung.apache.velocity.servlet; +package com.ossez.apache.velocity.servlet; -import com.baeldung.apache.velocity.model.Product; -import com.baeldung.apache.velocity.service.ProductService; +import com.ossez.apache.velocity.model.Product; +import com.ossez.apache.velocity.service.ProductService; import org.apache.velocity.Template; import org.apache.velocity.context.Context; import org.apache.velocity.tools.view.VelocityLayoutServlet; diff --git a/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/ProductServlet.java similarity index 85% rename from apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java rename to apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/ProductServlet.java index 60c9169fce..40fb7a82e8 100644 --- a/apache/apache-velocity/src/main/java/com/baeldung/apache/velocity/servlet/ProductServlet.java +++ b/apache/apache-velocity/src/main/java/com/ossez/apache/velocity/servlet/ProductServlet.java @@ -1,7 +1,7 @@ -package com.baeldung.apache.velocity.servlet; +package com.ossez.apache.velocity.servlet; -import com.baeldung.apache.velocity.model.Product; -import com.baeldung.apache.velocity.service.ProductService; +import com.ossez.apache.velocity.model.Product; +import com.ossez.apache.velocity.service.ProductService; import org.apache.velocity.Template; import org.apache.velocity.context.Context; import org.apache.velocity.tools.view.VelocityViewServlet; diff --git a/apache/apache-velocity/src/main/webapp/WEB-INF/web.xml b/apache/apache-velocity/src/main/webapp/WEB-INF/web.xml index 95b41b36dd..1e89f41865 100644 --- a/apache/apache-velocity/src/main/webapp/WEB-INF/web.xml +++ b/apache/apache-velocity/src/main/webapp/WEB-INF/web.xml @@ -6,12 +6,12 @@ apache-velocity ProductServlet - com.baeldung.apache.velocity.servlet.ProductServlet + com.ossez.apache.velocity.servlet.ProductServlet LayoutServlet - com.baeldung.apache.velocity.servlet.LayoutServlet + com.ossez.apache.velocity.servlet.LayoutServlet velocityLayout diff --git a/apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java b/apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/LayoutServletLiveTest.java similarity index 93% rename from apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java rename to apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/LayoutServletLiveTest.java index f1f166b119..09cb37d2ed 100644 --- a/apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/LayoutServletLiveTest.java +++ b/apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/LayoutServletLiveTest.java @@ -1,4 +1,4 @@ -package com.baeldung.apache.velocity.servlet; +package com.ossez.apache.velocity.servlet; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; diff --git a/apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java b/apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/ProductServletLiveTest.java similarity index 93% rename from apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java rename to apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/ProductServletLiveTest.java index 397e575d4d..169cd7c6fe 100644 --- a/apache/apache-velocity/src/test/java/com/baeldung/apache/velocity/servlet/ProductServletLiveTest.java +++ b/apache/apache-velocity/src/test/java/com/ossez/apache/velocity/servlet/ProductServletLiveTest.java @@ -1,4 +1,4 @@ -package com.baeldung.apache.velocity.servlet; +package com.ossez.apache.velocity.servlet; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; From 2451c271588bab9fa15458cee867b5e3018be4c1 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 2 May 2024 13:34:32 -0400 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=9A=84=E7=89=88=E6=9C=AC=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=BF=87=E4=BD=8E=E5=AF=BC=E8=87=B4=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8b5a3b708..f10a8054e5 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 1.4 2.11.0 - 3.0.0 + 31.1-jre @@ -129,6 +129,7 @@ 3.0.0-M8 3.10.1 3.6.3 + 3.1.0 From 1bad34f3dbdf0dab626d035c1b245e42d86b2440 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Thu, 2 May 2024 17:10:13 -0400 Subject: [PATCH 5/5] update the version for maven plugin --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f10a8054e5..35d77b6f28 100644 --- a/pom.xml +++ b/pom.xml @@ -126,10 +126,10 @@ 3.3.1 - 3.0.0-M8 - 3.10.1 + 3.2.5 + 3.13.0 3.6.3 - 3.1.0 + 3.4.0