You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by rm...@apache.org on 2020/09/23 13:40:49 UTC
[aries-cdi] branch master updated: [ARIES-2004] basic karaf feature
for aries cdi owb
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
The following commit(s) were added to refs/heads/master by this push:
new 44d1d55 [ARIES-2004] basic karaf feature for aries cdi owb
44d1d55 is described below
commit 44d1d553d1fe878ff93195ac06e7e72a38c31927
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Wed Sep 23 15:40:34 2020 +0200
[ARIES-2004] basic karaf feature for aries cdi owb
---
karaf/pom.xml | 90 ++++++++++++++++++++++++++++++++++++
karaf/src/main/resources/feature.xml | 74 +++++++++++++++++++++++++++++
pom.xml | 7 ++-
3 files changed, 170 insertions(+), 1 deletion(-)
diff --git a/karaf/pom.xml b/karaf/pom.xml
new file mode 100644
index 0000000..ae5a841
--- /dev/null
+++ b/karaf/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>org.apache.aries.cdi</artifactId>
+ <groupId>org.apache.aries.cdi</groupId>
+ <version>1.1.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>aries-cdi-feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Aries CDI - Karaf Feature</name>
+ <description>Apache Aries CDI - Karaf Feature</description>
+
+ <properties>
+ <bnd.baseline.skip>true</bnd.baseline.skip>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <archive combine.self="override" />
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/feature.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/karaf/src/main/resources/feature.xml b/karaf/src/main/resources/feature.xml
new file mode 100644
index 0000000..a706c16
--- /dev/null
+++ b/karaf/src/main/resources/feature.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<!--
+NOTE: this is a raw feature for java 11 where javax.annotation is taken from thJVM (until Karaf >= 4.3 drops it)
+
+Minimal Karaf version: 4.0.3.RC1
+Minimal Java version: 11
+Karaf distribution configuration requirement:
+- etc/config.properties (to make javax.annotation taken from the JVM only) + avoid to deploy geronimo-annotation_specs_1.3
+ > org.osgi.framework.system.capabilities = ${eecap-${java.specification.version}},${${karaf.framework}-capabilities},${karaf-capabilities},"osgi.contract;osgi.contract=JavaAnnotation;version:List<Version>="1.3,1.2,1.1,1.0"
+-->
+<features name="telstar-gate-stack"
+ xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.4.0">
+ <feature name="spi-loader" version="1.3.0">
+ <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.0</bundle>
+ </feature>
+ <feature name="javax.annotation" version="1.3">
+ <!-- reuse jvm one for now, just ensure to patch karaf to add JavaAnnotation capability -->
+ </feature>
+ <feature name="cdi-spec" version="2.0">
+ <feature>javax.annotation</feature>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.2</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-interceptor_1.2_spec/1.2</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.1</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jcdi_2.0_spec/1.2</bundle>
+ </feature>
+ <feature name="osgi-namespace">
+ <bundle>mvn:org.osgi/org.osgi.namespace.service/1.0.0</bundle>
+ <bundle>mvn:org.osgi/org.osgi.namespace.implementation/1.0.0</bundle>
+ <bundle>mvn:org.osgi/org.osgi.namespace.extender/1.0.1</bundle>
+ </feature>
+ <feature name="osgi-util">
+ <bundle>mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
+ <bundle>mvn:org.osgi/org.osgi.util.promise/1.1.0</bundle>
+ </feature>
+ <feature name="osgi-cdi">
+ <feature>cdi-spec</feature>
+ <feature>osgi-namespace</feature>
+ <feature>osgi-util</feature>
+ <bundle>mvn:org.osgi/org.osgi.service.cdi/1.0.0</bundle>
+ </feature>
+ <feature name="osgi-cdi-owb">
+ <feature>osgi-cdi</feature>
+ <bundle>mvn:org.apache.xbean/xbean-bundleutils/4.17</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-asm8-shaded/4.17</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-finder-shaded/4.17</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-spi/2.0.17</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-impl/2.0.17</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-web/2.0.17</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-el22/2.0.17</bundle>
+ <bundle>mvn:org.apache.felix/org.apache.felix.converter/1.0.12</bundle>
+ <bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.spi/${project.version}</bundle>
+ <bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.owb/${project.version}</bundle>
+ <bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.extra/${project.version}</bundle>
+ <bundle start="true">mvn:org.apache.aries.cdi/org.apache.aries.cdi.extension.spi/${project.version}</bundle>
+ <bundle start="true">mvn:org.apache.aries.cdi/org.apache.aries.cdi.extender/${project.version}</bundle>
+ </feature>
+</features>
diff --git a/pom.xml b/pom.xml
index 11ba142..005fb34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
+ <bnd.baseline.skip>false</bnd.baseline.skip>
<!-- Versions -->
<bnd.version>5.1.0</bnd.version>
@@ -133,7 +134,8 @@
<module>cdi-weld</module>
<module>cdi-bom</module>
<module>cdi-executable</module>
- </modules>
+ <module>karaf</module>
+ </modules>
<dependencyManagement>
<dependencies>
@@ -462,6 +464,9 @@
<goals>
<goal>baseline</goal>
</goals>
+ <configuration>
+ <skip>${bnd.baseline.skip}</skip>
+ </configuration>
</execution>
</executions>
</plugin>