* Specify correct (Java 8) execution environment for OSGi * Accept any servlet 3 version Change-Id: I170d4577218e773bc17c14342bc7f93572932fcctags/8.0.0.alpha1
@@ -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> |
@@ -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> |
@@ -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> | |||
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> |