Merge pull request #952 from terasolunaorg/issues/945_exclude-javaxac…

…tivationactivation-and-add-comsunactivationjavaxactivation120 Exclude javax.activation:activation and add com.sun.activation:javax.activation 1.2.0 #945
terasolunaorg · Jan 10, 2020 · 007100e · 007100e
2 parents 10a6d6e + d09941a
commit 007100e
Showing 1 changed file with 12 additions and 0 deletions.
diff --git 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>${javax-activation.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.el</groupId>
@@ -547,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>