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 /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 'pom.xml')
| -rw-r--r-- | pom.xml | 41 |
1 files changed, 36 insertions, 5 deletions
@@ -24,6 +24,7 @@ <!-- Used version numbers for dependencies --> <liferay.portal-service.version>6.2.5</liferay.portal-service.version> + <liferay.portal-kernel.version>2.0.0</liferay.portal-kernel.version> <vaadin.gwt.version>2.8.0</vaadin.gwt.version> <vaadin.plugin.version>8.1-SNAPSHOT</vaadin.plugin.version> @@ -37,14 +38,18 @@ <atmosphere.runtime.version>2.4.5.vaadin2</atmosphere.runtime.version> <!-- OSGi --> - <osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version> <osgi.execution.environment>JavaSE-1.8</osgi.execution.environment> <osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version> + <osgi.version>6.0.0</osgi.version> + <osgi.annotation.version>6.0.1</osgi.annotation.version> + + <bnd.version>3.3.0</bnd.version> <!-- Dependency unpack directory --> <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory> - <!-- Cannot use 9.3 or 9.4 because they sometimes reset the connection too early in case of errors --> + <!-- Cannot use 9.3 or 9.4 because they sometimes reset the connection + too early in case of errors --> <!-- See e.g. https://issues.apache.org/jira/browse/SOLR-8453 --> <jetty.version>9.2.9.v20150224</jetty.version> <phantomjs.version>2.1.1</phantomjs.version> @@ -290,6 +295,25 @@ <version>${vaadin.icons.version}</version> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>${osgi.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.annotation</artifactId> + <version>${osgi.annotation.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.version}</version> + <scope>provided</scope> + </dependency> </dependencies> </dependencyManagement> @@ -376,9 +400,16 @@ <version>1.8</version> </plugin> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>3.0.1</version> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + <version>${bnd.version}</version> + <executions> + <execution> + <goals> + <goal>bnd-process</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> |