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-server | |
| 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-server')
| -rw-r--r-- | compatibility-server/bnd.bnd | 10 | ||||
| -rw-r--r-- | compatibility-server/pom.xml | 32 |
2 files changed, 12 insertions, 30 deletions
diff --git a/compatibility-server/bnd.bnd b/compatibility-server/bnd.bnd new file mode 100644 index 0000000000..11ea914dcc --- /dev/null +++ b/compatibility-server/bnd.bnd @@ -0,0 +1,10 @@ +Bundle-SymbolicName: ${project.groupId}.compatibility.server +Bundle-Name: Vaadin Compatibility Server +Import-Package: com.vaadin*;version="[${osgi.bundle.version},${osgi.bundle.version}]",\ + !com.google*,\ + org.osgi*,\ + javax.validation*;resolution:=optional;version='${javax.validation.version}',\ + * +Export-Package: !com.vaadin.v7.shared*,\ + !com.vaadin.v7.client*,\ + com.vaadin.v7*;-noimport:=true diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml index 8599d352ff..ed3468a9a2 100644 --- a/compatibility-server/pom.xml +++ b/compatibility-server/pom.xml @@ -82,38 +82,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>VAADIN;version="${osgi.bundle.version}",com.vaadin.v7.*;version="${osgi.bundle.version}"</Export-Package> - <Import-Package>!com.google.appengine.api.datastore, - !com.google.appengine.api.memcache, - !com.google.apphosting.api, - * - </Import-Package> - <Require-Bundle> - com.vaadin.server;bundle-version="${osgi.bundle.version}", - 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> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> |