diff options
| author | Sampsa Sohlman <sampsa@sohlman.com> | 2016-07-01 13:11:52 +0300 |
|---|---|---|
| committer | Sampsa Sohlman <sampsa@sohlman.com> | 2016-07-14 13:40:44 +0200 |
| commit | 498599fa9b54bc6754287d001e83dcd6a6a26dfd (patch) | |
| tree | b04af4b75d8073fd11933ba97bafa1e52e5b0378 /server/pom.xml | |
| parent | cb031ed350cdf0369d0fbe4b2364629c52c90279 (diff) | |
| download | vaadin-framework-498599fa9b54bc6754287d001e83dcd6a6a26dfd.tar.gz vaadin-framework-498599fa9b54bc6754287d001e83dcd6a6a26dfd.zip | |
Fix the OSGi version at MANIFEST.MF so it does not contain -SNAPSHOT
Change-Id: Iad1f7c9fbff6ded1ce85536788a0b86135ecfbad
Diffstat (limited to 'server/pom.xml')
| -rw-r--r-- | server/pom.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/pom.xml b/server/pom.xml index fcd11f3a47..3df2ec1918 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -150,7 +150,7 @@ </dependencies> <build> - <plugins> + <plugins> <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> @@ -221,7 +221,8 @@ <configuration> <instructions> <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - <Export-Package>com.vaadin.*;version="${project.version}"</Export-Package> + <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> + <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package> <Import-Package>javax.servlet;version="${javax.servlet.version}", javax.servlet.http;version="${javax.servlet.version}", javax.validation;version="${javax.validation.version}";resolution:=optional, @@ -235,8 +236,8 @@ javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional, com.liferay.portal.kernel.util;resolution:=optional</Import-Package> <Require-Bundle> - com.vaadin.shared;bundle-version="${project.version}", - com.vaadin.push;bundle-version="${project.version}";resolution:=optional, + com.vaadin.shared;bundle-version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", + com.vaadin.push;bundle-version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";resolution:=optional, com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional"</Require-Bundle> </instructions> </configuration> |