diff options
| -rw-r--r-- | client-compiled/pom.xml | 4 | ||||
| -rw-r--r-- | client-compiler/pom.xml | 6 | ||||
| -rw-r--r-- | client/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 5 | ||||
| -rw-r--r-- | push/pom.xml | 4 | ||||
| -rw-r--r-- | server/pom.xml | 14 | ||||
| -rw-r--r-- | shared/pom.xml | 6 | ||||
| -rw-r--r-- | themes/pom.xml | 4 | ||||
| -rw-r--r-- | widgets/pom.xml | 2 |
9 files changed, 27 insertions, 22 deletions
diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml index 97fd8fa575..e8673d6e7f 100644 --- a/client-compiled/pom.xml +++ b/client-compiled/pom.xml @@ -110,8 +110,8 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> <!-- Export package is handled in exec plugin --> <Export-Package></Export-Package> <Import-Package></Import-Package> diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index 053a84e496..72e794118c 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -88,9 +88,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="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</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 1b2041b8c3..b47cabd15e 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -95,8 +95,8 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> <Import-Package></Import-Package> </instructions> </configuration> @@ -36,6 +36,11 @@ <javax.servlet.version>3.0.1</javax.servlet.version> <javax.validation.version>1.0.0.GA</javax.validation.version> + <!-- OSGi --> + <osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version> + <osgi.execution.environment>JavaSE-1.8</osgi.execution.environment> + <osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version> + <!-- Test dependencies --> <junit.version>4.11</junit.version> diff --git a/push/pom.xml b/push/pom.xml index 1ae24ba2aa..98c4e2a654 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -135,8 +135,8 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> <Export-Package>VAADIN</Export-Package> <Require-Bundle>com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport</Require-Bundle> </instructions> diff --git a/server/pom.xml b/server/pom.xml index c9c435b918..111c7fa996 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -220,11 +220,11 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - <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="[2.4,${javax.servlet.version}]", - javax.servlet.http;version="[2.4,${javax.servlet.version}]", + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> + <Import-Package>javax.servlet;version="${osgi.javax.servlet.version}", + javax.servlet.http;version="${osgi.javax.servlet.version}", javax.validation;version="${javax.validation.version}";resolution:=optional, org.jsoup;version="${jsoup.version}", org.jsoup.parser;version="${jsoup.version}", @@ -236,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="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", - com.vaadin.push;bundle-version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";resolution:=optional, + com.vaadin.shared;bundle-version="${osgi.bundle.version}", + com.vaadin.push;bundle-version="${osgi.bundle.version}";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 3ab39b3adb..1fb2144611 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -114,9 +114,9 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - <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> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}",elemental.*;version="${osgi.bundle.version}"</Export-Package> <Import-Package></Import-Package> <Require-Bundle></Require-Bundle> </instructions> diff --git a/themes/pom.xml b/themes/pom.xml index 588bf6704d..3d59ab14cf 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -276,8 +276,8 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> <!-- Export package is handled in exec plugin --> <Export-Package></Export-Package> <Import-Package></Import-Package> diff --git a/widgets/pom.xml b/widgets/pom.xml index 33a60b832b..8eaa0ced89 100644 --- a/widgets/pom.xml +++ b/widgets/pom.xml @@ -64,7 +64,7 @@ <configuration> <instructions> <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> <!-- Export package is handled in exec plugin --> <Export-Package></Export-Package> <Import-Package></Import-Package> |