Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-6u1' into v6-master
Browse files Browse the repository at this point in the history
  • Loading branch information
kankichi00 committed Mar 15, 2024
2 parents 1741cd7 + e821aeb commit 24fddf1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
13 changes: 9 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.nablarch.example</groupId>
<artifactId>nablarch-example-mom-sync-receive</artifactId>
<version>6</version>
<version>6u1</version>
<packaging>jar</packaging>

<properties>
Expand Down Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.nablarch.profile</groupId>
<artifactId>nablarch-bom</artifactId>
<version>6</version>
<version>6u1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -55,6 +55,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>

Expand All @@ -63,7 +68,7 @@
<dependency>
<groupId>com.nablarch.example</groupId>
<artifactId>nablarch-example-mom-testing-common</artifactId>
<version>6</version>
<version>6u1</version>
<scope>runtime</scope>
</dependency>

Expand Down Expand Up @@ -139,7 +144,7 @@
<artifactId>nablarch-fw-messaging-mom</artifactId>
</dependency>

<!-- WebSphere MQ用ライブラリ -->
<!-- IBM MQ用ライブラリ -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-server</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions src/test/resources/log.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ writer.nop.className=nablarch.test.core.log.NopLogWriter
writer.verifier.className=nablarch.test.core.log.LogVerifier

# 利用可能なロガー名順序
availableLoggersNamesOrder=SQL,ROOT
availableLoggersNamesOrder=SQL,ROO

#全てのロガー取得を対象に、DEBUGレベル以上を標準出力に出力する。
loggers.ROOT.nameRegex=.*
loggers.ROOT.level=DEBUG
loggers.ROOT.writerNames=stdout,verifier
loggers.ROO.nameRegex=.*
loggers.ROO.level=DEBUG
loggers.ROO.writerNames=stdout,verifier

#ロガー名に"SQL"を指定したロガー取得を対象に、DEBUGレベル以上を出力する。
loggers.SQL.nameRegex=SQL
Expand Down

0 comments on commit 24fddf1

Please sign in to comment.