[#321] add the bnd-resolver-maven plugin that verifies that the bundl…

…es will in fact resolve in an OSGi environment (with respect to available dependencies) fixes #321 Signed-off-by: Raymond Augé <raymond.auge@liferay.com>
lukas-krecan · Jan 30, 2021 · eae65f5 · eae65f5
1 parent c78ba44
commit eae65f5
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 1 deletion.
diff --git a/json-unit-assertj/pom.xml b/json-unit-assertj/pom.xml
@@ -127,6 +127,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-resolver-maven-plugin</artifactId>
+                <configuration>
+                    <bndruns>
+                        <bndrun>resolve.bndrun</bndrun>
+                    </bndruns>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/json-unit-assertj/resolve.bndrun b/json-unit-assertj/resolve.bndrun
@@ -0,0 +1,2 @@
+-runfw: org.eclipse.osgi
+-runrequires: bnd.identity;id='${project.groupId}.${project.artifactId}'
diff --git a/json-unit-core/pom.xml b/json-unit-core/pom.xml
@@ -53,7 +53,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-json_1.1_spec</artifactId>
-            <version>${geronimo.jsonp.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -120,6 +119,15 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-resolver-maven-plugin</artifactId>
+                <configuration>
+                    <bndruns>
+                        <bndrun>resolve.bndrun</bndrun>
+                    </bndruns>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/json-unit-core/resolve.bndrun b/json-unit-core/resolve.bndrun
@@ -0,0 +1,2 @@
+-runfw: org.eclipse.osgi
+-runrequires: bnd.identity;id='${project.groupId}.${project.artifactId}'
diff --git a/json-unit-fluent/pom.xml b/json-unit-fluent/pom.xml
@@ -40,6 +40,15 @@
                     </archive>
                 </configuration>
             </plugin>
+             <plugin>
+                 <groupId>biz.aQute.bnd</groupId>
+                 <artifactId>bnd-resolver-maven-plugin</artifactId>
+                 <configuration>
+                     <bndruns>
+                         <bndrun>resolve.bndrun</bndrun>
+                     </bndruns>
+                 </configuration>
+             </plugin>
         </plugins>
     </build>
 </project>
diff --git a/json-unit-fluent/resolve.bndrun b/json-unit-fluent/resolve.bndrun
@@ -0,0 +1,2 @@
+-runfw: org.eclipse.osgi
+-runrequires: bnd.identity;id='${project.groupId}.${project.artifactId}'
diff --git a/json-unit-json-path/pom.xml b/json-unit-json-path/pom.xml
@@ -27,6 +27,12 @@
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
             <version>${json-path.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -55,6 +61,15 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-resolver-maven-plugin</artifactId>
+                <configuration>
+                    <bndruns>
+                        <bndrun>resolve.bndrun</bndrun>
+                    </bndruns>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/json-unit-json-path/resolve.bndrun b/json-unit-json-path/resolve.bndrun
@@ -0,0 +1,2 @@
+-runfw: org.eclipse.osgi
+-runrequires: bnd.identity;id='${project.groupId}.${project.artifactId}'
diff --git a/json-unit/pom.xml b/json-unit/pom.xml
@@ -38,6 +38,15 @@
                  </archive>
              </configuration>
          </plugin>
+         <plugin>
+             <groupId>biz.aQute.bnd</groupId>
+             <artifactId>bnd-resolver-maven-plugin</artifactId>
+             <configuration>
+                 <bndruns>
+                     <bndrun>resolve.bndrun</bndrun>
+                 </bndruns>
+             </configuration>
+         </plugin>
      </plugins>
  </build>
 </project>
diff --git a/json-unit/resolve.bndrun b/json-unit/resolve.bndrun
@@ -0,0 +1,2 @@
+-runfw: org.eclipse.osgi
+-runrequires: bnd.identity;id='${project.groupId}.${project.artifactId}'
diff --git a/pom.xml b/pom.xml
@@ -19,6 +19,7 @@
         <json-path.version>2.4.0</json-path.version>
         <opentest4j.version>1.2.0</opentest4j.version>
         <kotlin.version>1.4.21</kotlin.version>
+        <bnd.version>5.2.0</bnd.version>
         <symbolic.name>${project.groupId}.${project.artifactId}</symbolic.name>
         <osgi.importPackage>!kotlin.*,*</osgi.importPackage>
         <osgi.exportPackage />
@@ -63,6 +64,29 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.apache.aries.spifly</groupId>
+                <artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
+                <version>1.3.2</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.johnzon</groupId>
+                <artifactId>johnzon-core</artifactId>
+                <version>1.2.10</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-json_1.1_spec</artifactId>
+                <version>${geronimo.jsonp.version}</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.platform</groupId>
+                <artifactId>org.eclipse.osgi</artifactId>
+                <version>3.16.100</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
@@ -162,6 +186,37 @@
                         <target>${target.java.version}</target>
                     </configuration>
                 </plugin>
+
+                <!-- Asserts that the resulting bundle resolves adequately in OSGi in terms
+                     of it's dependencies. If this check fails it is most likely a problem
+                     with package export or import specification. -->
+                <plugin>
+                    <groupId>biz.aQute.bnd</groupId>
+                    <artifactId>bnd-resolver-maven-plugin</artifactId>
+                    <version>${bnd.version}</version>
+                    <configuration>
+                        <failOnChanges>false</failOnChanges>
+                        <includeDependencyManagement>true</includeDependencyManagement>
+                        <reportOptional>false</reportOptional>
+                        <writeOnChanges>false</writeOnChanges>
+                        <bundles>
+                            <bundle>target/${project.artifactId}-${project.version}.jar</bundle>
+                        </bundles>
+                        <scopes>
+                            <scope>compile</scope>
+                            <scope>runtime</scope>
+                            <scope>test</scope>
+                        </scopes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>pre-integration-test</phase>
+                            <goals>
+                                <goal>resolve</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>