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/25 04:23:55 UTC
[karaf] branch master updated: [KARAF-5988]add javax.annotation api
when using JDK11
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 ca4c64d [KARAF-5988]add javax.annotation api when using JDK11
new b0790cd Merge branch 'master' of github.com:apache/karaf
ca4c64d is described below
commit ca4c64dec30766858ada664cef8c9e52944c5ac8
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Oct 25 12:22:10 2018 +0800
[KARAF-5988]add javax.annotation api when using JDK11
---
assemblies/features/base/pom.xml | 10 ++++++++++
assemblies/features/enterprise-legacy/pom.xml | 24 ------------------------
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
index a67e5e2..cb74dde 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -48,6 +48,11 @@
<version>1.2.0</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax.annotation.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
<version>1.2.0</version>
@@ -213,6 +218,11 @@
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
diff --git a/assemblies/features/enterprise-legacy/pom.xml b/assemblies/features/enterprise-legacy/pom.xml
index 52758ac..17036a0 100644
--- a/assemblies/features/enterprise-legacy/pom.xml
+++ b/assemblies/features/enterprise-legacy/pom.xml
@@ -208,30 +208,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>verify</id>
- <phase>process-resources</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>mvn:org.apache.karaf.features/framework/${project.version}/xml/features</descriptor>
- <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
- </descriptors>
- <distribution>org.apache.karaf.features:framework</distribution>
- <javase>1.8</javase>
- <framework>
- <feature>framework</feature>
- </framework>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>