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 /client-compiled/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 'client-compiled/pom.xml')
| -rw-r--r-- | client-compiled/pom.xml | 76 |
1 files changed, 20 insertions, 56 deletions
diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml index 708f87e11f..185d88d9db 100644 --- a/client-compiled/pom.xml +++ b/client-compiled/pom.xml @@ -29,6 +29,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-shared</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>vaadin-client</artifactId> @@ -49,41 +56,20 @@ <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> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-export-package</id> - <phase>package</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument> - <argument>-DincludeNumberPackages=1</argument> - - <argument>-classpath</argument> - <classpath /> - - <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument> - - <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument> - <argument>VAADIN/widgetsets</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>com.vaadin</groupId> <artifactId>vaadin-maven-plugin</artifactId> <configuration> @@ -103,32 +89,10 @@ </execution> </executions> </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 is handled in exec plugin --> - <Export-Package></Export-Package> - <Import-Package></Import-Package> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> - + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> |