Skip to content

Commit 16eaaff

Browse files
jansupoljansupol
committed
Additional OSGi headers
Signed-off-by: jansupol <[email protected]>
1 parent f0754eb commit 16eaaff

File tree

9 files changed

+50
-22
lines changed

9 files changed

+50
-22
lines changed

‎connectors/jetty-connector/pom.xml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,19 @@
8484
<groupId>org.apache.maven.plugins</groupId>
8585
<artifactId>maven-compiler-plugin</artifactId>
8686
</plugin>
87+
<plugin>
88+
<groupId>org.apache.felix</groupId>
89+
<artifactId>maven-bundle-plugin</artifactId>
90+
<inherited>true</inherited>
91+
<configuration>
92+
<instructions>
93+
<Import-Package>
94+
${jetty.osgi.version},
95+
*
96+
</Import-Package>
97+
</instructions>
98+
</configuration>
99+
</plugin>
87100
</plugins>
88101
</build>
89102

@@ -101,15 +114,6 @@
101114
</dependency>
102115
</dependencies>
103116
</profile>
104-
<profile>
105-
<id>testsSkipJdk6</id>
106-
<activation>
107-
<jdk>1.6</jdk>
108-
</activation>
109-
<properties>
110-
<skip.tests>true</skip.tests>
111-
</properties>
112-
</profile>
113117
</profiles>
114118

115119
</project>

‎connectors/netty-connector/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
<groupId>org.apache.maven.plugins</groupId>
6868
<artifactId>maven-compiler-plugin</artifactId>
6969
</plugin>
70+
<plugin>
71+
<groupId>org.apache.felix</groupId>
72+
<artifactId>maven-bundle-plugin</artifactId>
73+
<inherited>true</inherited>
74+
</plugin>
7075
</plugins>
7176
</build>
7277

‎connectors/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<profile>
8282
<id>HelidonConnector</id>
8383
<activation>
84-
<jdk>11</jdk>
84+
<jdk>[11,)</jdk>
8585
</activation>
8686
<modules>
8787
<module>helidon-connector</module>

‎containers/jetty-http/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,14 @@
7272
<groupId>org.apache.felix</groupId>
7373
<artifactId>maven-bundle-plugin</artifactId>
7474
<inherited>true</inherited>
75+
<configuration>
76+
<instructions>
77+
<Import-Package>
78+
${jetty.osgi.version},
79+
*
80+
</Import-Package>
81+
</instructions>
82+
</configuration>
7583
</plugin>
7684
</plugins>
7785

‎containers/jetty-servlet/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<instructions>
6868
<Import-Package>
6969
javax.servlet.*;version="[2.4,5.0)",
70+
${jetty.osgi.version},
7071
*
7172
</Import-Package>
7273
</instructions>

‎incubator/declarative-linking/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@
169169
</execution>
170170
</executions>
171171
</plugin>
172+
<plugin>
173+
<groupId>org.apache.felix</groupId>
174+
<artifactId>maven-bundle-plugin</artifactId>
175+
<inherited>true</inherited>
176+
</plugin>
172177
</plugins>
173178
</build>
174179
</project>

‎incubator/kryo/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,21 @@
6767
<directory>${project.build.directory}/legal</directory>
6868
</resource>
6969
</resources>
70+
71+
<plugins>
72+
<plugin>
73+
<groupId>org.apache.felix</groupId>
74+
<artifactId>maven-bundle-plugin</artifactId>
75+
<inherited>true</inherited>
76+
<configuration>
77+
<instructions>
78+
<Import-Package>
79+
com.esotericsoftware.kryo.*;version="!",
80+
*
81+
</Import-Package>
82+
</instructions>
83+
</configuration>
84+
</plugin>
85+
</plugins>
7086
</build>
7187
</project>

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2230,6 +2230,7 @@
22302230
<jaxrs.api.spec.version>2.1</jaxrs.api.spec.version>
22312231
<jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version>
22322232
<jetty.plugin.version>6.1.26</jetty.plugin.version>
2233+
<jetty.osgi.version>org.eclipse.jetty.*;version="[9.4,11)"</jetty.osgi.version>
22332234
<jetty.version>9.4.46.v20220331</jetty.version>
22342235
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
22352236
<jsonb.api.version>1.0.2</jsonb.api.version>

‎test-framework/providers/jetty/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,4 @@
4444
</dependency>
4545
</dependencies>
4646

47-
<profiles>
48-
<profile>
49-
<id>testsSkipJdk6</id>
50-
<activation>
51-
<jdk>1.6</jdk>
52-
</activation>
53-
<properties>
54-
<skip.tests>true</skip.tests>
55-
</properties>
56-
</profile>
57-
</profiles>
58-
5947
</project>

0 commit comments

Comments
 (0)