Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #746 Update osgi manifests to servlet 4.0

This commit is contained in:
Jan Bartel 2016-08-04 14:41:39 +10:00
parent 5232b933a4
commit 3b2291e82f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-osgi/test-jetty-osgi-context/pom.xml
View File

@ -68,8 +68,7 @@
compilation time. --> compilation time. -->
<_nouses>true</_nouses> <_nouses>true</_nouses>
<Import-Package> <Import-Package>
javax.servlet;version="[3.1,3.2)", javax.servlet;version="[3.1,4.1)",
javax.servlet.resources;version="[3.1,3.2)",
org.osgi.framework, org.osgi.framework,
org.osgi.service.cm;version="1.2.0", org.osgi.service.cm;version="1.2.0",
org.osgi.service.packageadmin, org.osgi.service.packageadmin,
@ -83,7 +82,7 @@
org.xml.sax.helpers, org.xml.sax.helpers,
* *
</Import-Package> </Import-Package>
<DynamicImport-Package>org.eclipse.jetty.*;version="[9.1,11.0)"</DynamicImport-Package> <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>

6
jetty-osgi/test-jetty-osgi-server/pom.xml
View File

@ -59,8 +59,8 @@
compilation time. --> compilation time. -->
<_nouses>true</_nouses> <_nouses>true</_nouses>
<Import-Package> <Import-Package>
javax.servlet;version="[3.1,3.2)", javax.servlet;version="[3.1,4.1)",
javax.servlet.resources;version="[3.1,3.2)", javax.servlet.resources;version="[3.1,4.1)",
org.osgi.framework, org.osgi.framework,
org.osgi.service.cm;version="1.2.0", org.osgi.service.cm;version="1.2.0",
org.osgi.service.packageadmin, org.osgi.service.packageadmin,
@ -74,7 +74,7 @@
org.xml.sax.helpers, org.xml.sax.helpers,
* *
</Import-Package> </Import-Package>
<DynamicImport-Package>org.eclipse.jetty.*;version="[9.1,10.0)"</DynamicImport-Package> <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>