From 34d0e7e09440307fdf3cb061e628728e77c5945c Mon Sep 17 00:00:00 2001
From: Pierre De Rop <pderop@apache.org>
Date: Mon, 24 Dec 2018 09:57:35 +0000
Subject: [PATCH] prepare for next r16 release.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1849681 13f79535-47bb-0310-9956-ffa450edef68
---
 dependencymanager/cnf/repository.mvn                      | 8 ++++----
 .../org.apache.felix.dependencymanager/bnd.bnd            | 5 +----
 dependencymanager/release/build.gradle                    | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dependencymanager/cnf/repository.mvn b/dependencymanager/cnf/repository.mvn
index db2099f638d..a8bdecee96f 100644
--- a/dependencymanager/cnf/repository.mvn
+++ b/dependencymanager/cnf/repository.mvn
@@ -31,11 +31,11 @@ org.apache.felix:org.apache.felix.log:1.0.1
 org.apache.felix:org.apache.felix.metatype:1.1.2
 org.apache.felix:org.apache.felix.http.jetty:3.4.8
 org.apache.felix:org.apache.felix.webconsole:4.3.4
-org.apache.felix:org.apache.felix.dependencymanager:4.5.1
+org.apache.felix:org.apache.felix.dependencymanager:4.6.0
 org.apache.felix:org.apache.felix.dependencymanager.annotation:5.0.1
-org.apache.felix:org.apache.felix.dependencymanager.lambda:1.2.0
-org.apache.felix:org.apache.felix.dependencymanager.runtime:4.0.6
-org.apache.felix:org.apache.felix.dependencymanager.shell:4.0.7
+org.apache.felix:org.apache.felix.dependencymanager.lambda:1.2.1
+org.apache.felix:org.apache.felix.dependencymanager.runtime:4.0.7
+org.apache.felix:org.apache.felix.dependencymanager.shell:4.0.8
 org.jline:jline-builtins:3.3.0
 org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1
 org.mockito:mockito-core:1.10.19
diff --git a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
index 1aa1ed83868..436bf468276 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
@@ -47,10 +47,7 @@ Bundle-Category: osgi
 	${mockito},\
 	org.objenesis;version=2.2
 	
--fixupmessages.baselining-error-to-warning: \
-    "Baseline mismatch for package org.apache.felix.dm, MAJOR change. Current is 4.6.0, repo is 4.5.0...";is:=warning,\
-    "Baseline mismatch for package org.apache.felix.dm.context, MAJOR change. Current is 4.4.1, repo is 4.4.0...";is:=warning,\
-    "The bundle version \\(4.5.1/4.6.0\\) is too low, must be at least 5.0.0";is:=warning
+
 
 
 
diff --git a/dependencymanager/release/build.gradle b/dependencymanager/release/build.gradle
index 3ae9cb2659f..d168524f2f9 100644
--- a/dependencymanager/release/build.gradle
+++ b/dependencymanager/release/build.gradle
@@ -33,7 +33,7 @@ buildscript {
 }
 
 // Our release number, which has to be monotonically incremented each time we make a new release.
-ext.dmRelease = "r15"
+ext.dmRelease = "r16"
 
 // Our Apache svn Staging repo
 ext.svnStagingPath = "https://dist.apache.org/repos/dist/dev/felix"