You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2018/10/29 12:47:41 UTC

[karaf] branch master updated: [KARAF-5989]Error while sending email because of javax.activation

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 50ccdc9  [KARAF-5989]Error while sending email because of javax.activation
50ccdc9 is described below

commit 50ccdc93a1ff1e619f808e13f38fbacbb26213c0
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Oct 29 20:47:21 2018 +0800

    [KARAF-5989]Error while sending email because of javax.activation
---
 .../base/src/main/filtered-resources/resources/etc/jre.properties       | 1 -
 assemblies/features/enterprise-legacy/pom.xml                           | 2 +-
 assemblies/features/standard/pom.xml                                    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
index b15f428..a27f9c7 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
@@ -342,7 +342,6 @@ jre-1.7= \
 
 jre-1.8= \
  javax.accessibility, \
- javax.activation;version="1.1", \
  javax.activity, \
  javax.annotation;version="1.0", \
  javax.annotation.processing;version="1.0", \
diff --git a/assemblies/features/enterprise-legacy/pom.xml b/assemblies/features/enterprise-legacy/pom.xml
index 52758ac..e7748a0 100644
--- a/assemblies/features/enterprise-legacy/pom.xml
+++ b/assemblies/features/enterprise-legacy/pom.xml
@@ -223,7 +223,7 @@
                                 <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
-                            <javase>1.8</javase>
+                            <javase>9</javase>
                             <framework>
                                 <feature>framework</feature>
                             </framework>
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index 937ff91..ededa13 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -426,7 +426,7 @@
                                 <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
                             </descriptors>
                             <distribution>org.apache.karaf.features:framework</distribution>
-                            <javase>1.8</javase>
+                            <javase>9</javase>
                             <framework>
                                 <feature>framework</feature>
                             </framework>