Skip to content

Commit

Permalink
Use bnd-maven-plugin instead of maven-bundle-plugin vaadin#8830
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmerruko
mmerruko committed Mar 24, 2017
1 parent 198a5df commit 8d105fd
Show file tree
Hide file tree
Showing 19 changed files with 191 additions and 354 deletions.
6 changes: 6 additions & 0 deletions client-compiled/bnd.bnd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bundle-SymbolicName: ${project.groupId}.client.compiled
Bundle-Name: Default Widgetset
Bundle-Version: ${osgi.bundle.version}
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.widgetset;-noimport:=true
76 changes: 20 additions & 56 deletions client-compiled/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -49,40 +56,19 @@
<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>
Expand All @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions compatibility-client-compiled/bnd.bnd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bundle-SymbolicName: ${project.groupId}.compatibility.client.compiled
Bundle-Name: Compatibility Widgetset
Bundle-Version: ${osgi.bundle.version}
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.compatibility.widgetset;-noimport:=true
65 changes: 11 additions & 54 deletions compatibility-client-compiled/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,40 +50,19 @@
<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>
Expand All @@ -104,32 +83,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>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
7 changes: 7 additions & 0 deletions compatibility-server/bnd.bnd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Bundle-SymbolicName: ${project.groupId}.compatibility.server
Bundle-Name: Vaadin Compatibility Server
Import-Package: com.vaadin.*;version="[${osgi.bundle.version},${osgi.bundle.version}]", \
org.osgi*
Export-Package: !com.vaadin.v7.shared*,\
!com.vaadin.v7.client*,\
com.vaadin.v7*;-noimport:=true
34 changes: 3 additions & 31 deletions compatibility-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</plugin>

<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions compatibility-shared/bnd.bnd
View file
Original file line number Diff line number Diff line change
@@ -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
26 changes: 2 additions & 24 deletions compatibility-shared/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions compatibility-themes/bnd.bnd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bundle-SymbolicName: ${project.groupId}.compatibility.themes
Bundle-Name: Vaadin Compatibility Themes
Bundle-Version: ${osgi.bundle.version}
Import-Package: com.vaadin.*;version='[${osgi.bundle.version},${osgi.bundle.version}]',\
*
Export-Package: com.vaadin.osgi.compatibility.themes;-noimport:=true
56 changes: 11 additions & 45 deletions compatibility-themes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@
<artifactId>commons-io</artifactId>
<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>
Expand Down Expand Up @@ -223,29 +232,6 @@
</arguments>
</configuration>
</execution>
<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=0</argument>

<argument>-classpath</argument>
<classpath />

<argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>

<argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument>
<argument>VAADIN/themes</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>

Expand Down Expand Up @@ -281,29 +267,9 @@
</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>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
Loading

0 comments on commit 8d105fd

Please sign in to comment.