diff options
-rw-r--r-- | compatibility-server/bnd.bnd | 1 | ||||
-rw-r--r-- | compatibility-shared/bnd.bnd | 3 | ||||
-rw-r--r-- | pom.xml | 5 | ||||
-rw-r--r-- | shared/bnd.bnd | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/compatibility-server/bnd.bnd b/compatibility-server/bnd.bnd index ef841e7d0d..e39fbbcf4d 100644 --- a/compatibility-server/bnd.bnd +++ b/compatibility-server/bnd.bnd @@ -3,7 +3,6 @@ Bundle-Name: Vaadin Compatibility Server Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0 Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\ - org.osgi*,\ javax.validation*;resolution:=optional;version='${javax.validation.version}',\ * Export-Package: !com.vaadin.v7.shared*,\ diff --git a/compatibility-shared/bnd.bnd b/compatibility-shared/bnd.bnd index c6c7af1b69..5d24b99e3d 100644 --- a/compatibility-shared/bnd.bnd +++ b/compatibility-shared/bnd.bnd @@ -2,7 +2,6 @@ Bundle-SymbolicName: ${project.groupId}.compatibility-shared Bundle-Name: Vaadin Compatibility Shared Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0 -Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\ - org.osgi* +Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]" Export-Package: \ com.vaadin.v7.shared*;-noimport:=true @@ -522,6 +522,11 @@ </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>3.3.0</version> + </plugin> </plugins> </pluginManagement> diff --git a/shared/bnd.bnd b/shared/bnd.bnd index 9821bc67a7..56b69fdfd0 100644 --- a/shared/bnd.bnd +++ b/shared/bnd.bnd @@ -3,8 +3,7 @@ Bundle-Activator: com.vaadin.osgi.resources.OsgiVaadinResources Bundle-Name: Vaadin Shared Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0 -Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\ - org.osgi* +Import-Package: org.osgi* Export-Package: com.vaadin.osgi.resources;-noimport:=true,\ com.vaadin.shared*;-noimport:=true,\ elemental.json*;-noimport:=true |