summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client-compiled/pom.xml3
-rw-r--r--client-compiler/pom.xml3
-rw-r--r--client/pom.xml2
-rw-r--r--pom.xml13
-rw-r--r--push/pom.xml1
-rw-r--r--server/pom.xml9
-rw-r--r--shared/pom.xml3
-rw-r--r--themes/pom.xml3
-rw-r--r--widgets/pom.xml3
9 files changed, 30 insertions, 10 deletions
diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml
index 251c8e9ffa..63c045e2a9 100644
--- a/client-compiled/pom.xml
+++ b/client-compiled/pom.xml
@@ -67,7 +67,7 @@
<classpathScope>compile</classpathScope>
<executable>${java.home}/bin/java</executable>
<arguments>
- <argument>-Dvaadin.version=${project.version}</argument>
+ <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
<argument>-DincludeNumberPackages=1</argument>
<argument>-classpath</argument>
@@ -110,6 +110,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
<!-- Export package is handled in exec plugin -->
<Export-Package></Export-Package>
diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml
index 33a3423b3f..4564bfb0a5 100644
--- a/client-compiler/pom.xml
+++ b/client-compiler/pom.xml
@@ -229,8 +229,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
- <Export-Package>com.vaadin.*;version="${project.version}"</Export-Package>
+ <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
<!--TODO decide gwt packages version number<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${vaadin.gwt.version}"</Export-Package> -->
<Import-Package></Import-Package> <!--todo find out what should be in Import-Package -->
</instructions>
diff --git a/client/pom.xml b/client/pom.xml
index 87a6e93d53..a980c97162 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -96,7 +96,7 @@
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
- <Export-Package>com.vaadin.*;version="${project.version}"</Export-Package>
+ <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
<Import-Package></Import-Package>
</instructions>
</configuration>
diff --git a/pom.xml b/pom.xml
index c6059ad8af..55565bbaab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,6 +232,19 @@
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<executions>
diff --git a/push/pom.xml b/push/pom.xml
index 31131653f8..51c2557d47 100644
--- a/push/pom.xml
+++ b/push/pom.xml
@@ -138,6 +138,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
<Export-Package>VAADIN</Export-Package>
<Require-Bundle>com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport</Require-Bundle>
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>
diff --git a/shared/pom.xml b/shared/pom.xml
index f8bff03e6b..4f4037c371 100644
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -117,7 +117,8 @@
<configuration>
<instructions>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
- <Export-Package>com.vaadin.*;version="${project.version}",elemental.*;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}",elemental.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
<Import-Package>com.google.gwt.thirdparty.streamhtmlparser;version="${streamhtmlparser.version}",
com.google.gwt.thirdparty.streamhtmlparser.impl;version="${streamhtmlparser.version}",
com.google.gwt.thirdparty.streamhtmlparser.util;version="${streamhtmlparser.version}",
diff --git a/themes/pom.xml b/themes/pom.xml
index 8a1333a754..6c621204b9 100644
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -246,7 +246,7 @@
<classpathScope>compile</classpathScope>
<executable>${java.home}/bin/java</executable>
<arguments>
- <argument>-Dvaadin.version=${project.version}</argument>
+ <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
<argument>-DincludeNumberPackages=0</argument>
<argument>-classpath</argument>
@@ -295,6 +295,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
<!-- Export package is handled in exec plugin -->
<Export-Package></Export-Package>
diff --git a/widgets/pom.xml b/widgets/pom.xml
index 5fa0f7120b..b971da479a 100644
--- a/widgets/pom.xml
+++ b/widgets/pom.xml
@@ -63,6 +63,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
<!-- Export package is handled in exec plugin -->
<Export-Package></Export-Package>
@@ -225,7 +226,7 @@
<classpathScope>compile</classpathScope>
<executable>${java.home}/bin/java</executable>
<arguments>
- <argument>-Dvaadin.version=${project.version}</argument>
+ <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
<argument>-DincludeNumberPackages=1</argument>
<argument>-classpath</argument>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 07:59:35 +0000