Merge remote-tracking branch 'origin/release-6u1' into v6-master

nablarch · Mar 15, 2024 · df15a24 · df15a24
2 parents 4b41887 + 3eb2c0d
commit df15a24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.nablarch.example</groupId>
   <artifactId>nablarch-example-rest</artifactId>
-  <version>6</version>
+  <version>6u1</version>
   <packaging>war</packaging>
 
   <properties>
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>com.nablarch.profile</groupId>
         <artifactId>nablarch-bom</artifactId>
-        <version>6</version>
+        <version>6u1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -64,6 +64,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>2.0.11</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/src/main/java/com/nablarch/example/action/ProjectAction.java b/src/main/java/com/nablarch/example/action/ProjectAction.java
@@ -11,7 +11,7 @@
 import nablarch.common.dao.UniversalDao;
 import nablarch.core.beans.BeanUtil;
 import nablarch.core.validation.ee.ValidatorUtil;
-import nablarch.fw.web.HttpRequest;
+import nablarch.fw.jaxrs.JaxRsHttpRequest;
 import nablarch.fw.web.HttpResponse;
 
 import jakarta.validation.Valid;
@@ -42,7 +42,7 @@ public class ProjectAction {
      */
     @GET
     @Produces(MediaType.APPLICATION_JSON)
-    public List<ProjectResponseDto> find(HttpRequest req) {
+    public List<ProjectResponseDto> find(JaxRsHttpRequest req) {
 
         // リクエストパラメータをBeanに変換
         ProjectSearchForm form = BeanUtil.createAndCopy(ProjectSearchForm.class, req.getParamMap());