Repository: karaf-cellar Updated Branches: refs/heads/master a0fa1df2a -> 7986ab851
Upgrade to Karaf 3.0.1, starting the preparation of Cellar 3.0.0 Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/7986ab85 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/7986ab85 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/7986ab85 Branch: refs/heads/master Commit: 7986ab851034067281db3220ce1fd977bf1d738d Parents: a0fa1df Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu May 29 21:29:47 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu May 29 21:29:47 2014 +0200 ---------------------------------------------------------------------- assembly/pom.xml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/7986ab85/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 072ff8d..c3b986b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -136,12 +136,12 @@ </execution> </executions> </plugin> + <!-- <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <version>${karaf.version}</version> <executions> - <!-- <execution> <id>features-generate-descriptor</id> <phase>compile</phase> @@ -152,7 +152,6 @@ <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature> </configuration> </execution> - --> <execution> <id>features-create-kar</id> <phase>package</phase> @@ -165,6 +164,7 @@ </execution> </executions> </plugin> + --> </plugins> </build> http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/7986ab85/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 23eb6d9..d543f8d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ <joda-time.version>2.1</joda-time.version> <junit.version>4.10</junit.version> <junit.bundle.version>4.10_1</junit.bundle.version> - <karaf.version>3.0.0-SNAPSHOT</karaf.version> + <karaf.version>3.0.1</karaf.version> <osgi.version>4.3.1</osgi.version> <osgi.compendium.version>4.3.1</osgi.compendium.version> <pax.exam.version>2.6.0</pax.exam.version>
