Skip to content

Commit

Permalink
prepare for next r16 release.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1849681 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Pierre De Rop committed Dec 24, 2018
1 parent 6bf1944 commit 34d0e7e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
8 changes: 4 additions & 4 deletions dependencymanager/cnf/repository.mvn
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -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




2 changes: 1 addition & 1 deletion dependencymanager/release/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 34d0e7e

Please sign in to comment.