diff options
| author | Artur Signell <artur@vaadin.com> | 2016-08-29 13:34:37 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2016-08-29 13:33:17 +0000 |
| commit | ce3575500883820c16bbb53363a3d6dca5c4a6fb (patch) | |
| tree | 730b213e09bc52f0e7419484b5a4adca4a6b73db | |
| parent | 9fce56f6a4b81b69bbdf70a5434a51d6f85aebd8 (diff) | |
| download | vaadin-framework-ce3575500883820c16bbb53363a3d6dca5c4a6fb.tar.gz vaadin-framework-ce3575500883820c16bbb53363a3d6dca5c4a6fb.zip | |
Fix OSGi support in compatibility packages
Change-Id: I0f04060c70d83724c08c37e93dd57a2d93b065a8
| -rw-r--r-- | compatibility-server/pom.xml | 5 | ||||
| -rw-r--r-- | compatibility-shared/pom.xml | 2 | ||||
| -rw-r--r-- | server/pom.xml | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml index a027291e88..024cefc001 100644 --- a/compatibility-server/pom.xml +++ b/compatibility-server/pom.xml @@ -53,6 +53,7 @@ <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <scope>provided</scope> + <optional>true</optional> </dependency> </dependencies> @@ -80,10 +81,10 @@ <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> <Bundle-Version>${osgi.bundle.version}</Bundle-Version> <Export-Package>com.vaadin.v7.*;version="${osgi.bundle.version}"</Export-Package> - <Import-Package>javax.validation;version="${javax.validation.version}";resolution:=optional</Import-Package> <Require-Bundle> - com.vaadin.server;bundle-version="${osgi.bundle.version}" + com.vaadin.server;bundle-version="${osgi.bundle.version}", + com.vaadin.shared;bundle-version="${osgi.bundle.version}" </Require-Bundle> </instructions> </configuration> diff --git a/compatibility-shared/pom.xml b/compatibility-shared/pom.xml index 9c9b88fdbc..aa5a27ab8c 100644 --- a/compatibility-shared/pom.xml +++ b/compatibility-shared/pom.xml @@ -48,7 +48,7 @@ <Bundle-Version>${osgi.bundle.version}</Bundle-Version> <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> <Require-Bundle> - com.vaadin.shared;bundle-version="${osgi.bundle.version}", + com.vaadin.shared;bundle-version="${osgi.bundle.version}" </Require-Bundle> </instructions> </configuration> diff --git a/server/pom.xml b/server/pom.xml index 303d40df8a..27edf34288 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -51,6 +51,7 @@ <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <scope>provided</scope> + <optional>true</optional> </dependency> <!-- Sass compiler --> |