Skip to content

Commit 2f76c36

Browse files
benapplemikesamuel
authored andcommitted
Add OSGI bundle packaging (#185)
* Add OSGI bundle compatibility * Add OSGi bundle manifest verification tests
1 parent 400bf8c commit 2f76c36

5 files changed

Lines changed: 73 additions & 2 deletions

File tree

html-types/pom.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
44
<artifactId>html-types</artifactId>
55
<version>20190610.2-SNAPSHOT</version>
6-
<packaging>jar</packaging>
6+
<packaging>bundle</packaging>
77
<parent>
88
<relativePath>../parent</relativePath>
99
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
@@ -20,6 +20,26 @@
2020

2121
<build>
2222
<plugins>
23+
<plugin>
24+
<groupId>org.apache.felix</groupId>
25+
<artifactId>maven-bundle-plugin</artifactId>
26+
</plugin>
27+
<plugin>
28+
<groupId>org.apache.maven.plugins</groupId>
29+
<artifactId>maven-verifier-plugin</artifactId>
30+
<configuration>
31+
<verificationFile>src/test/resources/osgi-integration-verification.xml</verificationFile>
32+
</configuration>
33+
<executions>
34+
<execution>
35+
<id>main</id>
36+
<phase>verify</phase>
37+
<goals>
38+
<goal>verify</goal>
39+
</goals>
40+
</execution>
41+
</executions>
42+
</plugin>
2343
</plugins>
2444
</build>
2545

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<verifications xmlns="http://maven.apache.org/verifications/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/verifications/1.0.0 http://maven.apache.org/xsd/verifications-1.0.0.xsd">
4+
<files>
5+
<file>
6+
<location>target/classes/META-INF/MANIFEST.MF</location>
7+
<contains>Export-Package: org.owasp.html.htmltypes</contains>
8+
</file>
9+
</files>
10+
</verifications>

parent/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,17 @@ application while protecting against XSS.
213213
</dependency>
214214
</dependencies>
215215
</plugin>
216+
<plugin>
217+
<groupId>org.apache.felix</groupId>
218+
<artifactId>maven-bundle-plugin</artifactId>
219+
<extensions>true</extensions>
220+
<version>3.5.0</version>
221+
</plugin>
222+
<plugin>
223+
<groupId>org.apache.maven.plugins</groupId>
224+
<artifactId>maven-verifier-plugin</artifactId>
225+
<version>1.1</version>
226+
</plugin>
216227
</plugins>
217228
</pluginManagement>
218229
</build>

pom.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33
<artifactId>owasp-java-html-sanitizer</artifactId>
4-
<packaging>jar</packaging>
4+
<packaging>bundle</packaging>
55
<parent>
66
<relativePath>parent</relativePath>
77
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
@@ -57,6 +57,26 @@
5757
<repoToken>TENYw0IKRulLOXgkyzjGqNi0hQyhBiSiU</repoToken>
5858
</configuration>
5959
</plugin>
60+
<plugin>
61+
<groupId>org.apache.felix</groupId>
62+
<artifactId>maven-bundle-plugin</artifactId>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-verifier-plugin</artifactId>
67+
<configuration>
68+
<verificationFile>src/test/resources/osgi-integration-verification.xml</verificationFile>
69+
</configuration>
70+
<executions>
71+
<execution>
72+
<id>main</id>
73+
<phase>verify</phase>
74+
<goals>
75+
<goal>verify</goal>
76+
</goals>
77+
</execution>
78+
</executions>
79+
</plugin>
6080
</plugins>
6181
</build>
6282

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<verifications xmlns="http://maven.apache.org/verifications/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/verifications/1.0.0 http://maven.apache.org/xsd/verifications-1.0.0.xsd">
4+
<files>
5+
<file>
6+
<location>target/classes/META-INF/MANIFEST.MF</location>
7+
<contains>Export-Package: org.owasp.html</contains>
8+
</file>
9+
</files>
10+
</verifications>

0 commit comments

Comments
 (0)