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

Fixing bad merge of pom.xml 

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2018-09-07 14:56:20 -05:00
parent 4978321a93
commit 0ec0216542
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -24,7 +24,7 @@
<alpn.api.version>1.1.3.v20160715</alpn.api.version>
<servlet.api.version>4.0.0</servlet.api.version>
<servlet.schema.version>4.0.0</servlet.schema.version>
<jsp.version>8.5.24.2</jsp.version>
<jsp.version>8.5.33</jsp.version>
<!-- default values are unsupported, but required to be defined for reactor sanity reasons -->
<alpn.version>undefined</alpn.version>
<conscrypt.version>1.1.4</conscrypt.version>
@ -681,7 +681,6 @@
<Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor>
<Bundle-Classpath>.</Bundle-Classpath>
<Bundle-Copyright>Copyright (c) 2008-2018 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
<Import-Package>javax.servlet*;version="[2.6.0,4.1)",javax.transaction*;version="[1.1,1.3)",org.eclipse.jetty*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",*</Import-Package>
<_provider-policy><![CDATA[$<range;[===,=+)>]]></_provider-policy>
<_consumer-policy><![CDATA[$<range;[===,+)>]]></_consumer-policy>
</instructions>