Skip to content

Commit 91e4135

Browse files
committed
JAVA-272: To deal with the OSGi/Maven version name incompatibilities, added ability to use a different version name for maven and OSGi. So the Maven POM that we upload would have a version like 2.8.0-RC1 or 2.8.0, while the corresponding Bundle-Version in MANIFEST.MF would be 2.8.0.RC1 or 2.8.0.RELEASE. Hopefully this will work for both Maven and OSGi users, as it's the strategy used by, for example the maven-bundle-plugin
1 parent a063663 commit 91e4135

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

build.properties

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616

1717
javac.source=1.5
1818

19-
lib.version=2.8.0.BUILD-SNAPSHOT
19+
# IMPORTANT: MAKE SURE YOU CHANGE BOTH lib.version AND lib.version.osi.compat, ACCORDING TO THIS PATTERN
20+
# lib.version=2.8.0-RC1 ==> lib.version.osgi.compat=2.8.0.RC1
21+
# lib.version=2.8.0 ==> lib.version.osgi.compat=2.8.0.RELEASE
22+
lib.version=2.8.0
23+
lib.version.osgi.compat=2.8.0.RELEASE
2024

2125
compatibility.baseline.version=2.7.3
22-
url.libbase=http://cloud.github.com/downloads/mongodb
26+
url.libbase=http://cloud.github.com/downloads/mongodb

build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@ limitations under the License.
171171
<target name="jar" depends="compile" description="Create driver jar">
172172

173173
<copy file="src/main/META-INF/MANIFEST.MF" tofile="build/MANIFEST.MF" filtering="true">
174-
<filterset><filter token="VERSION" value="${build.conf.lib.version}"/></filterset>
174+
<filterset><filter token="VERSION" value="${build.conf.lib.version.osgi.compat}"/></filterset>
175175
</copy>
176176

177177
<copy file="src/main/META-INF/MANIFEST_BSON.MF" tofile="build/MANIFEST_BSON.MF" filtering="true">
178-
<filterset><filter token="VERSION" value="${build.conf.lib.version}"/></filterset>
178+
<filterset><filter token="VERSION" value="${build.conf.lib.version.osgi.compat}"/></filterset>
179179
</copy>
180180

181181
<exec executable="git" output="build/main/git-hash">

0 commit comments

Comments
 (0)