You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ra...@apache.org on 2015/11/24 21:02:53 UTC
ignite git commit: IGNITE-1270 OSGify ignite-slf4j.
Repository: ignite
Updated Branches:
refs/heads/ignite-1270 65f221056 -> 4e4c01ab0
IGNITE-1270 OSGify ignite-slf4j.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4e4c01ab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4e4c01ab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4e4c01ab
Branch: refs/heads/ignite-1270
Commit: 4e4c01ab032dde3101d1159b93f7bd82101044cb
Parents: 65f2210
Author: Raul Kripalani <ra...@apache.org>
Authored: Tue Nov 24 20:02:38 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Tue Nov 24 20:02:38 2015 +0000
----------------------------------------------------------------------
.../osgi-karaf/src/main/resources/features.xml | 46 ++++++++++++--------
.../IgniteKarafFeaturesInstallationTest.java | 4 +-
modules/slf4j/pom.xml | 10 +++++
3 files changed, 39 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e4c01ab/modules/osgi-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-karaf/src/main/resources/features.xml b/modules/osgi-karaf/src/main/resources/features.xml
index 38b79b6..4dca39b 100644
--- a/modules/osgi-karaf/src/main/resources/features.xml
+++ b/modules/osgi-karaf/src/main/resources/features.xml
@@ -44,6 +44,7 @@
<feature>ignite-rest-http</feature>
<feature>ignite-scalar-2.11</feature>
<feature>ignite-schedule</feature>
+ <feature>ignite-slf4j</feature>
<feature>ignite-spring</feature>
<feature>ignite-ssh</feature>
<feature>ignite-twitter</feature>
@@ -163,17 +164,6 @@
<bundle start="true">mvn:org.apache.ignite/ignite-kafka/${project.version}</bundle>
</feature>
- <feature name="ignite-mqtt" version="${project.version}" description="Apache Ignite :: MQTT">
- <details>
- <![CDATA[The Apache Ignite MQTT module + dependencies.]]>
- </details>
- <feature prerequisite="true">wrap</feature>
- <bundle start="true" dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
- <bundle start="true" dependency="true">mvn:org.eclipse.paho/org.eclipse.paho.client.mqttv3/${paho.version}</bundle>
- <bundle start="true" dependency="true">wrap:mvn:com.github.rholder/guava-retrying/${guava.retrying.version}$Bundle-SymbolicName=guava-retrying&Bundle-SymbolicName=guava-retrying&Bundle-Version=${guava.retrying.version}</bundle>
- <bundle start="true">mvn:org.apache.ignite/ignite-mqtt/${project.version}</bundle>
- </feature>
-
<feature name="ignite-log4j" version="${project.version}" description="Apache Ignite :: log4j">
<details>
<![CDATA[The Apache Ignite log4j module + dependencies.
@@ -186,6 +176,17 @@
<bundle start="true">mvn:org.apache.ignite/ignite-log4j/${project.version}</bundle>
</feature>
+ <feature name="ignite-mqtt" version="${project.version}" description="Apache Ignite :: MQTT">
+ <details>
+ <![CDATA[The Apache Ignite MQTT module + dependencies.]]>
+ </details>
+ <feature prerequisite="true">wrap</feature>
+ <bundle start="true" dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
+ <bundle start="true" dependency="true">mvn:org.eclipse.paho/org.eclipse.paho.client.mqttv3/${paho.version}</bundle>
+ <bundle start="true" dependency="true">wrap:mvn:com.github.rholder/guava-retrying/${guava.retrying.version}$Bundle-SymbolicName=guava-retrying&Bundle-SymbolicName=guava-retrying&Bundle-Version=${guava.retrying.version}</bundle>
+ <bundle start="true">mvn:org.apache.ignite/ignite-mqtt/${project.version}</bundle>
+ </feature>
+
<feature name="ignite-rest-http" version="${project.version}" description="Apache Ignite :: REST HTTP">
<!-- NOTICE: XOM cannot be included by default due to an incompatible license;
please review its license model and install the dependency manually if you agree. -->
@@ -207,14 +208,6 @@
<bundle start="true">mvn:org.apache.ignite/ignite-rest-http/${project.version}</bundle>
</feature>
- <feature name="ignite-scalar-2.11" version="${project.version}" description="Apache Ignite :: Scala 2.11">
- <details>
- <![CDATA[The Apache Ignite Scala 2.11 integration module + dependencies. This module installs the Scala 2.11 library bundle.]]>
- </details>
- <bundle start="true" dependency="true">mvn:org.scala-lang/scala-library/${scala211.library.version}</bundle>
- <bundle start="true">mvn:org.apache.ignite/ignite-scalar/${project.version}</bundle>
- </feature>
-
<feature name="ignite-scalar-2.10" version="${project.version}" description="Apache Ignite :: Scala 2.10">
<details>
<![CDATA[The Apache Ignite Scala 2.11 integration module + dependencies. This module installs the Scala 2.10 library bundle.]]>
@@ -223,6 +216,14 @@
<bundle start="true">mvn:org.apache.ignite/ignite-scalar_2.10/${project.version}</bundle>
</feature>
+ <feature name="ignite-scalar-2.11" version="${project.version}" description="Apache Ignite :: Scala 2.11">
+ <details>
+ <![CDATA[The Apache Ignite Scala 2.11 integration module + dependencies. This module installs the Scala 2.11 library bundle.]]>
+ </details>
+ <bundle start="true" dependency="true">mvn:org.scala-lang/scala-library/${scala211.library.version}</bundle>
+ <bundle start="true">mvn:org.apache.ignite/ignite-scalar/${project.version}</bundle>
+ </feature>
+
<feature name="ignite-schedule" version="${project.version}" description="Apache Ignite :: Schedule">
<details>
<![CDATA[The Apache Ignite Schedule module + dependencies. This module is a fragment of ignite-core.]]>
@@ -232,6 +233,13 @@
<bundle start="true">mvn:org.apache.ignite/ignite-schedule/${project.version}</bundle>
</feature>
+ <feature name="ignite-slf4j" version="${project.version}" description="Apache Ignite :: slf4j">
+ <details>
+ <![CDATA[The Apache Ignite slf4j module.]]>
+ </details>
+ <bundle start="true">mvn:org.apache.ignite/ignite-slf4j/${project.version}</bundle>
+ </feature>
+
<feature name="ignite-spring" version="${project.version}" description="Apache Ignite :: Spring Support">
<details>
<![CDATA[The Apache Ignite Spring integration module + dependencies. This module is a fragment of ignite-core.
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e4c01ab/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
index 305aa2c..08d105a 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
public class IgniteKarafFeaturesInstallationTest extends AbstractIgniteKarafTest {
/** Number of features expected to exist. */
- private static final int EXPECTED_FEATURES = 24;
+ private static final int EXPECTED_FEATURES = 25;
private static final String CAMEL_REPO_URI = "mvn:org.apache.camel.karaf/apache-camel/" +
System.getProperty("camelVersion") + "/xml/features";
@@ -78,7 +78,7 @@ public class IgniteKarafFeaturesInstallationTest extends AbstractIgniteKarafTest
Feature[] features = featuresSvc.getFeatures(IGNITE_FEATURES_NAME_REGEX);
assertNotNull(features);
- assertEquals(24, features.length);
+ assertEquals(EXPECTED_FEATURES, features.length);
for (Feature f : features) {
if (IGNORED_FEATURES.contains(f.getName()))
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e4c01ab/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 30118d4..858f482 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -47,4 +47,14 @@
<version>${slf4j.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <!-- Generate the OSGi MANIFEST.MF for this bundle. -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>