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 /push/pom.xml | |
| 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 'push/pom.xml')
| -rw-r--r-- | push/pom.xml | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/push/pom.xml b/push/pom.xml index af51026084..ee9d82e1fe 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -29,7 +29,20 @@ <type>war</type> <scope>provided</scope> </dependency> - + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-shared</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + </dependency> </dependencies> <build> @@ -134,28 +147,9 @@ <outputDirectory>${project.build.outputDirectory}/VAADIN</outputDirectory> </configuration> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <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> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</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> |