Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-5u25' into v5-main
Browse files Browse the repository at this point in the history
  • Loading branch information
kankichi00 committed Sep 27, 2024
2 parents 6c8a7ba + c9d5b11 commit aeb607c
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 14 deletions.
4 changes: 1 addition & 3 deletions nablarch-jackson-adaptor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<modelVersion>4.0.0</modelVersion>
<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-jackson-adaptor</artifactId>
<version>1.0.8</version>

<parent>
<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-jaxrs-adaptor</artifactId>
<version>1.0.9</version>
<version>1.1.0</version>
</parent>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@

import com.fasterxml.jackson.databind.ObjectMapper;

import nablarch.core.util.annotation.Published;
import nablarch.fw.jaxrs.BodyConverter;

/**
* Jackson2.xを使用してリクエスト/レスポンスの変換を行う{@link BodyConverter}実装クラス。
*
* @author Kiyohito Itoh
*/
@Published(tag = "architect")
public class Jackson2BodyConverter extends JacksonBodyConverterSupport {

/** {@link ObjectMapper} */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import nablarch.core.log.Logger;
import nablarch.core.log.LoggerManager;
import nablarch.core.util.annotation.Published;
import nablarch.fw.ExecutionContext;
import nablarch.fw.jaxrs.BodyConverterSupport;
import nablarch.fw.jaxrs.JaxRsContext;
Expand All @@ -16,12 +17,13 @@

/**
* Jackson用の{@link nablarch.fw.jaxrs.BodyConverter}の実装をサポートするクラス。
*
* <p>
* このConverterは、メディアタイプが{@code application/json}で始まっている場合に
* リクエスト/レスポンスを変換する。(大文字、小文字は問わない)
*
* @author Kiyohito Itoh
*/
@Published(tag = "architect")
public abstract class JacksonBodyConverterSupport extends BodyConverterSupport {

/** ロガー */
Expand Down
6 changes: 2 additions & 4 deletions nablarch-jersey-adaptor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,19 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-jersey-adaptor</artifactId>
<version>1.0.7</version>

<parent>
<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-jaxrs-adaptor</artifactId>
<version>1.0.9</version>
<version>1.1.0</version>
</parent>

<dependencies>
<dependency>
<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-jackson-adaptor</artifactId>
<version>1.0.8</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
6 changes: 2 additions & 4 deletions nablarch-resteasy-adaptor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,19 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-resteasy-adaptor</artifactId>
<version>1.0.8</version>

<parent>
<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-jaxrs-adaptor</artifactId>
<version>1.0.9</version>
<version>1.1.0</version>
</parent>

<dependencies>
<dependency>
<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-jackson-adaptor</artifactId>
<version>1.0.8</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.nablarch.integration</groupId>
<artifactId>nablarch-jaxrs-adaptor</artifactId>
<version>1.0.9</version>
<version>1.1.0</version>
<packaging>pom</packaging>

<scm>
Expand All @@ -18,7 +18,7 @@
<parent>
<groupId>com.nablarch</groupId>
<artifactId>nablarch-parent</artifactId>
<version>5u22</version>
<version>5u25</version>
<relativePath/>
</parent>

Expand Down

0 comments on commit aeb607c

Please sign in to comment.