You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/04/19 05:34:50 UTC
[karaf-decanter] branch master updated: [KARAF-6678] Add feature
verify
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/master by this push:
new 19af0a6 [KARAF-6678] Add feature verify
new e67b63e Merge pull request #152 from jbonofre/KARAF-6678
19af0a6 is described below
commit 19af0a676377cb445d8a889b214acd38ff78b9cc
Author: jbonofre <jb...@apache.org>
AuthorDate: Thu Apr 16 14:56:41 2020 +0200
[KARAF-6678] Add feature verify
---
appender/mongodb/pom.xml | 14 ++++++++-
assembly/pom.xml | 59 ++++++++++++++++++++++++-----------
assembly/src/main/feature/feature.xml | 17 +++++-----
3 files changed, 61 insertions(+), 29 deletions(-)
diff --git a/appender/mongodb/pom.xml b/appender/mongodb/pom.xml
index 53c4b70..5d6a7ea 100644
--- a/appender/mongodb/pom.xml
+++ b/appender/mongodb/pom.xml
@@ -60,6 +60,12 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
!io.netty*,
+ !com.github.luben.zstd,
+ !com.mongodb.crypt.capi,
+ !javax.annotation,
+ !javax.annotation.meta,
+ !jnr.unixsocket,
+ !org.xerial.snappy,
org.slf4j;resolution:=optional,
org.slf4j.impl;resolution:=optional,
javax.crypto*;resolution:=optional,
@@ -72,8 +78,14 @@
org.apache.karaf.decanter.appender.mongodb,
org.apache.karaf.decanter.appender.utils,
com.mongodb*,
+ com.mongodb.crypt.capi,
org.bson*,
- io.netty*
+ io.netty*,
+ com.github.luben.zstd,
+ javax.annotation,
+ javax.annotation.meta,
+ jnr.unixsocket,
+ org.xerial.snappy
</Private-Package>
<_dsannotations>*</_dsannotations>
</instructions>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 59bfa59..ba3ff2a 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -33,6 +33,16 @@
<packaging>pom</packaging>
<name>Apache Karaf :: Decanter :: Assembly</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
@@ -44,25 +54,6 @@
</resource>
</resources>
<plugins>
- <!-- In order to generate features.xml compliant with all Karaf versions, including Karaf 2 -->
- <!-- We don't use the karaf-maven-plugin and prefer the "old style" with the resource plugin
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>3.0.3</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>features-generate-descriptor</goal>
- </goals>
- <configuration>
- <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -84,6 +75,36 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>file:${project.build.directory}/classes/feature.xml</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.8</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ <features>
+ <feature>decanter*</feature>
+ </features>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 5ad11e7..bb8e852 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -18,13 +18,7 @@
-->
<features name="karaf-decanter-${project.version}" 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.0.0 http://karaf.apache.org/xmlns/features/v1.0.0">
- <feature name="decanter" version="${project.version}" description="Meta feature installing elasticsearch, kibana, jmx collector, log collector Decanter features">
- <feature version="${elasticsearch22.version}">elasticsearch</feature>
- <feature version="${kibana4.version}">kibana</feature>
- <feature version="${project.version}">decanter-appender-elasticsearch</feature>
- <feature version="${project.version}">decanter-collector-log</feature>
- <feature version="${project.version}">decanter-collector-jmx</feature>
- </feature>
+ <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
<feature name="decanter-common" version="${project.version}" description="Karaf Decanter API">
<config name="org.apache.felix.eventadmin.impl.EventAdmin" append="true">
@@ -49,7 +43,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-collector-dropwizard" version="${project.version}" description="Karaf Decanter Dropwizard Metrics Collector">
<feature>decanter-common</feature>
<feature>scheduler</feature>
- <bundle dependency="true">mvn:io.dropwizard.metrics/metrics-core/4.0.0</bundle>
+ <bundle dependency="true">mvn:io.dropwizard.metrics/metrics-core/4.1.5</bundle>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.dropwizard/${project.version}</bundle>
</feature>
@@ -98,6 +92,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-collector-camel" version="${project.version}" description="Karaf Decanter Camel Collector">
<feature>decanter-common</feature>
+ <feature>camel-core</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.camel/${project.version}</bundle>
</feature>
@@ -193,6 +188,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-collector-jdbc-core" version="${project.version}" description="Karaf Decanter JDBC Collector core">
<feature>decanter-common</feature>
<feature>scheduler</feature>
+ <feature>jdbc</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.jdbc/${project.version}</bundle>
</feature>
@@ -231,6 +227,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-appender-jdbc-core" version="${project.version}" description="Karaf Decanter JDBC Appender core">
<feature>decanter-common</feature>
+ <feature>jdbc</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.jdbc/${project.version}</bundle>
</feature>
@@ -252,6 +249,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-appender-camel-core" version="${project.version}" description="Karaf Decanter Camel Appender core">
<feature>decanter-common</feature>
+ <feature>camel-core</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.camel/${project.version}</bundle>
</feature>
@@ -373,7 +371,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-appender-dropwizard" version="${project.version}" description="Karaf Decanter Dropwizard Metrics Appender">
<feature>decanter-common</feature>
- <bundle dependency="true">mvn:io.dropwizard.metrics/metrics-core/4.0.0</bundle>
+ <bundle dependency="true">mvn:io.dropwizard.metrics/metrics-core/4.1.5</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.dropwizard/${project.version}</bundle>
</feature>
@@ -430,6 +428,7 @@ org.apache.felix.eventadmin.IgnoreTimeout=org.apache.karaf.decanter.
<feature name="decanter-alerting-camel-core" version="${project.version}" description="Karaf Decanter alerting Camel alerter core">
<feature version="${project.version}">decanter-alerting</feature>
+ <feature>camel-core</feature>
<bundle>mvn:org.apache.karaf.decanter.alerting/org.apache.karaf.decanter.alerting.camel/${project.version}</bundle>
</feature>