[dependency manager] prepare for next r17 development iteration
diff --git a/dependencymanager/cnf/build.bnd b/dependencymanager/cnf/build.bnd
index c9832ce..b5144dc 100644
--- a/dependencymanager/cnf/build.bnd
+++ b/dependencymanager/cnf/build.bnd
@@ -46,6 +46,11 @@
-pom: groupid = org.apache.felix
#
+# do not include pom dependencies
+#
+-maven-dependencies:
+
+#
# Don't include sources in generated bundles
#
-sources: true
@@ -60,3 +65,11 @@
# Removes some headers in order to reduce binary diff between same bundles that are not changed between subsequent releases.
#
-removeheaders: Bnd-LastModified,Tool,Created-By,Include-Resource
+
+#
+# Add pom scm section in generated poms
+#
+Bundle-SCM: \
+ url='https://gitbox.apache.org/repos/asf?p=felix-dev.git',\
+ connection='scm:git:https://github.com/apache/felix-dev.git',\
+ developerConnection='scm:git:https://github.com/apache/felix-dev.git'
diff --git a/dependencymanager/cnf/repository.mvn b/dependencymanager/cnf/repository.mvn
index ae9ec0b..46d73cb 100644
--- a/dependencymanager/cnf/repository.mvn
+++ b/dependencymanager/cnf/repository.mvn
@@ -31,11 +31,11 @@
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.6.0
-org.apache.felix:org.apache.felix.dependencymanager.annotation:5.0.1
-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.apache.felix:org.apache.felix.dependencymanager:4.6.1
+org.apache.felix:org.apache.felix.dependencymanager.annotation:5.0.2
+org.apache.felix:org.apache.felix.dependencymanager.lambda:1.2.2
+org.apache.felix:org.apache.felix.dependencymanager.runtime:4.0.8
+org.apache.felix:org.apache.felix.dependencymanager.shell:4.0.9
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.annotation/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
index f448335..9d04b26 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-Bundle-Version: 5.0.2
+Bundle-Version: 5.0.3
-buildpath: \
osgi.core;version=6.0,\
osgi.cmpn;version=6.0,\
diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
index 3e26cb2..604546b 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd
@@ -16,7 +16,7 @@
#
javac.source: 1.8
javac.target: 1.8
-Bundle-Version: 1.2.2
+Bundle-Version: 1.2.3
-buildpath: \
org.apache.felix.dependencymanager;version=latest,\
osgi.core;version=6.0,\
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
index 8edcb70..7236438 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-Bundle-Version: 4.0.8
+Bundle-Version: 4.0.9
-buildpath: \
osgi.core;version=4.2,\
osgi.cmpn;version=4.2,\
diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
index ceb86ed..957d03b 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd
@@ -24,7 +24,7 @@
Private-Package: \
org.apache.felix.dm.shell
Bundle-Activator:org.apache.felix.dm.shell.Activator
-Bundle-Version: 4.0.9
+Bundle-Version: 4.0.10
Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt
Bundle-Name: Apache Felix Dependency Manager Shell
Bundle-Description: Gogo Shell commands for Apache Felix Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
index 133bfbb..26ec2d9 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
@@ -34,7 +34,7 @@
Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt
Import-Package: !org.junit,!org.mockito.*,org.osgi.framework;version="[1.8, 2)",*
Bundle-Activator: org.apache.felix.dm.impl.Activator
-Bundle-Version: 4.6.1
+Bundle-Version: 4.6.2
Bundle-Name: Apache Felix Dependency Manager
Bundle-Description: Provides dynamic service and component dependency management
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/dependencymanager/release/README.release b/dependencymanager/release/README.release
index 4cce38e..7d52f40 100644
--- a/dependencymanager/release/README.release
+++ b/dependencymanager/release/README.release
@@ -82,7 +82,7 @@
To: "Felix Developers List" <dev@felix.apache.org>
Subject: [VOTE] Release of Apache Felix Dependency Manager release r<n>
-Hi,
+I would like to call for a vote on the Dependency Manager top level release r<n>
We solved N issues in this release:
http://issues.apache.org/jira/...
@@ -94,16 +94,23 @@
https://dist.apache.org/repos/dist/dev/felix/apache-felix-dependencymanager-r<n>/
You can use this UNIX script to download the release and verify the signatures:
+
https://github.com/apache/felix-dev/blob/master/dependencymanager/release/check_staged_release.sh
Usage:
-sh check_staged_release.sh r<n> /tmp/felix-staging
-This script, unlike the original Felix check_stage_release.sh, will download staging from https://dist.apache.org/repos/dist/dev/felix instead of
-http://repository.apache.org/content/repositories.
+ sh check_staged_release.sh r<n> /tmp/felix-staging
+This script, unlike the original Felix check_stage_release.sh, is specific
+to the Dependency Manager release process (see FELIX-4818) and will
+download staging from https://dist.apache.org/repos/dist/dev/felix instead
+of http://repository.apache.org/content/repositories.
-Please vote to approve this release:
+To rebuild the DM binaries from the source, jdk8 must be used, and you can refer to:
+
+https://github.com/apache/felix-dev/blob/master/dependencymanager/release/resources/src/README.src
+
+Please cast your votes to approve this release:
[ ] +1 Approve the release
[ ] -1 Veto the release (please provide specific comments)
diff --git a/dependencymanager/release/build.gradle b/dependencymanager/release/build.gradle
index d168524..db781b0 100644
--- a/dependencymanager/release/build.gradle
+++ b/dependencymanager/release/build.gradle
@@ -33,7 +33,7 @@
}
// Our release number, which has to be monotonically incremented each time we make a new release.
-ext.dmRelease = "r16"
+ext.dmRelease = "r17"
// Our Apache svn Staging repo
ext.svnStagingPath = "https://dist.apache.org/repos/dist/dev/felix"
@@ -214,10 +214,15 @@
task commitToStaging {
doLast {
description = 'Commits the local staging to the Apache svn staging repository.'
- getProject().exec {
+ ant.input(message: 'Enter SVN user:', addproperty: 'user')
+ ant.input(message: 'Enter SVN password:', addproperty: 'password')
+ def user = ant.properties.user
+ def password = ant.properties.password
+
+ getProject().exec {
commandLine 'svn',
'import', 'staging', svnStagingPath + "/org.apache.felix.dependencymanager-" + dmRelease + "/",
- '-m', "Staging Apache Felix Dependency Manager release " + dmRelease + ".", "--force-interactive"
+ '-m', "Staging Apache Felix Dependency Manager release " + dmRelease + ".", "--username", user, "--password", password
}
}
}
@@ -226,6 +231,10 @@
task promoteToRelease {
doLast {
description = 'Moves the staging repository to the Apache release repository.'
+ ant.input(message: 'Enter SVN user:', addproperty: 'user')
+ ant.input(message: 'Enter SVN password:', addproperty: 'password')
+ def user = ant.properties.user
+ def password = ant.properties.password
// Move all artifacts from the staging repo to the release repo
new ByteArrayOutputStream().withStream { os ->
@@ -241,7 +250,8 @@
getProject().exec {
commandLine 'svn',
'move', svnStagingPath+"/org.apache.felix.dependencymanager-" + dmRelease + "/" + artifact ,
- svnReleasePath, '-m', "Releasing Apache Felix Dependency Manager release " + dmRelease + ".", "--force-interactive"
+ svnReleasePath, '-m', "Releasing Apache Felix Dependency Manager release " + dmRelease + ".",
+ "--username", user, "--password", password
}
}
}
@@ -251,7 +261,8 @@
getProject().exec {
commandLine 'svn',
'rm', svnStagingPath+"/org.apache.felix.dependencymanager-" + dmRelease, "-m",
- "Releasing Apache Felix Dependency Manager release " + dmRelease + "."
+ "Releasing Apache Felix Dependency Manager release " + dmRelease + ".",
+ "--username", user, "--password", password
}
}
}
@@ -260,10 +271,16 @@
task deleteFromStaging {
doLast {
description = 'Cancels the staged distribution from the Apache staging repository.'
+ ant.input(message: 'Enter SVN user:', addproperty: 'user')
+ ant.input(message: 'Enter SVN password:', addproperty: 'password')
+ def user = ant.properties.user
+ def password = ant.properties.password
+
getProject().exec {
commandLine 'svn',
'delete', svnStagingPath+"/org.apache.felix.dependencymanager-" + dmRelease + "/",
- "-m", "Removing Apache Felix Dependency Manager release " + dmRelease + " from staging."
+ "-m", "Removing Apache Felix Dependency Manager release " + dmRelease + " from staging.",
+ "--username", user, "--password", password
}
}
}
