diff options
author | Mirjan Merruko <mirjan@vaadin.com> | 2017-03-24 13:33:37 +0200 |
---|---|---|
committer | Henri Sara <henri.sara@gmail.com> | 2017-04-25 15:01:06 +0300 |
commit | 9a6ebeb5a80bdb1d97d47422c62a973b3f2d2cf9 (patch) | |
tree | 20b1c09d6c2e6319cba036f9ecf409893c4b6c56 /compatibility-shared | |
parent | d0a8608c7e074d4baeef0282146b2da5c47603a5 (diff) | |
download | vaadin-framework-9a6ebeb5a80bdb1d97d47422c62a973b3f2d2cf9.tar.gz vaadin-framework-9a6ebeb5a80bdb1d97d47422c62a973b3f2d2cf9.zip |
Add OSGi support #8830 #8827 #8828 #8829
Use bnd-maven-plugin instead of maven-bundle-plugin and helper class, and
add support for publishing static resources such as themes and widgetsets.
Diffstat (limited to 'compatibility-shared')
-rw-r--r-- | compatibility-shared/bnd.bnd | 6 | ||||
-rw-r--r-- | compatibility-shared/pom.xml | 26 |
2 files changed, 8 insertions, 24 deletions
diff --git a/compatibility-shared/bnd.bnd b/compatibility-shared/bnd.bnd new file mode 100644 index 0000000000..754a6a4ca0 --- /dev/null +++ b/compatibility-shared/bnd.bnd @@ -0,0 +1,6 @@ +Bundle-SymbolicName: ${project.groupId}.compatibility.shared +Bundle-Name: Vaadin Compatibility Shared +Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\ + org.osgi* +Export-Package: \ + com.vaadin.v7.shared*;-noimport:=true diff --git a/compatibility-shared/pom.xml b/compatibility-shared/pom.xml index 00f92ec9c5..d17cc5253a 100644 --- a/compatibility-shared/pom.xml +++ b/compatibility-shared/pom.xml @@ -42,32 +42,10 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <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}" - </Require-Bundle> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> </plugin> - <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> |