You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2016/04/12 15:17:50 UTC
aries-rsa git commit: [ARIES-1528] Use karaf 4 maven plugin to
validate the features descriptor
Repository: aries-rsa
Updated Branches:
refs/heads/master 976012a50 -> 63f5aed5f
[ARIES-1528] Use karaf 4 maven plugin to validate the features descriptor
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/63f5aed5
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/63f5aed5
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/63f5aed5
Branch: refs/heads/master
Commit: 63f5aed5fae2ec2975337dd1e2212827467e93ed
Parents: 976012a
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Apr 12 15:05:01 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Apr 12 15:15:10 2016 +0200
----------------------------------------------------------------------
features/pom.xml | 86 +++++++++++++++++++++++++++
features/src/main/resources/features.xml | 1 +
2 files changed, 87 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/63f5aed5/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 12cbbaa..8aa8700 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -26,8 +26,63 @@
<properties>
<topDirectoryLocation>../..</topDirectoryLocation>
+ <karaf.version>4.0.4</karaf.version>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>standard</artifactId>
+ <version>${karaf.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.rsa</groupId>
+ <artifactId>org.apache.aries.rsa.topology-manager</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.rsa.discovery</groupId>
+ <artifactId>org.apache.aries.rsa.discovery.local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.rsa.discovery</groupId>
+ <artifactId>org.apache.aries.rsa.discovery.zookeeper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.rsa.provider</groupId>
+ <artifactId>org.apache.aries.rsa.provider.tcp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.rsa.provider</groupId>
+ <artifactId>org.apache.aries.rsa.provider.fastbin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
@@ -55,6 +110,37 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ <startLevel>30</startLevel>
+ </configuration>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <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>file:${project.build.directory}/classes/features.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.7</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ <features>
+ <feature>aries-rsa-*</feature>
+ </features>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/63f5aed5/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index ba9bc93..bf55d79 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -2,6 +2,7 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name="aries-rsa-${project.version}">
<feature name="aries-rsa-core" version="${project.version}">
+ <feature>eventadmin</feature>
<bundle>mvn:org.apache.aries.rsa/org.apache.aries.rsa.spi/${project.version}</bundle>
<bundle>mvn:org.apache.aries.rsa/org.apache.aries.rsa.core/${project.version}</bundle>
<bundle>mvn:org.apache.aries.rsa/org.apache.aries.rsa.topology-manager/${project.version}</bundle>