From 29e41020d895df46375c979ae3f7ab870dc83f21 Mon Sep 17 00:00:00 2001
From: btyanagawamg <yanagawamg@pm.nttdata.co.jp>
Date: Fri, 10 Jan 2020 11:13:12 +0900
Subject: [PATCH 1/2] Exclude javax.activation:activation and add
 com.sun.activation:javax.activation 1.2.0 #945

---
 terasoluna-gfw-parent/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/terasoluna-gfw-parent/pom.xml b/terasoluna-gfw-parent/pom.xml
index e2b1435cf..1f864654e 100644
--- a/terasoluna-gfw-parent/pom.xml
+++ b/terasoluna-gfw-parent/pom.xml
@@ -458,6 +458,17 @@
         <groupId>com.sun.mail</groupId>
         <artifactId>javax.mail</artifactId>
         <version>${javax-mail.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.activation</groupId>
+        <artifactId>javax.activation</artifactId>
+        <version>1.2.0</version>
       </dependency>
       <dependency>
         <groupId>javax.el</groupId>

From d09941ab9ba67327dd976c0c6c59fe64e05f3225 Mon Sep 17 00:00:00 2001
From: btyanagawamg <yanagawamg@pm.nttdata.co.jp>
Date: Fri, 10 Jan 2020 16:31:32 +0900
Subject: [PATCH 2/2] change to use properties #945

---
 terasoluna-gfw-parent/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/terasoluna-gfw-parent/pom.xml b/terasoluna-gfw-parent/pom.xml
index 1f864654e..f2fd388bf 100644
--- a/terasoluna-gfw-parent/pom.xml
+++ b/terasoluna-gfw-parent/pom.xml
@@ -468,7 +468,7 @@
       <dependency>
         <groupId>com.sun.activation</groupId>
         <artifactId>javax.activation</artifactId>
-        <version>1.2.0</version>
+        <version>${javax-activation.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.el</groupId>
@@ -558,6 +558,7 @@
     <tiles.version>3.0.8</tiles.version>
     <!-- == Other JavaEE/SE APIs == -->
     <javax-mail.version>1.6.2</javax-mail.version>
+    <javax-activation.version>1.2.0</javax-activation.version>
     <javax-el.version>3.0.1-b06</javax-el.version>
     <javax-inject.version>1</javax-inject.version>
     <javax-jsp.version>2.3.3</javax-jsp.version>