Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit 5895957

Browse files
committed
Allow OSGi runtime dependency on Servlet 4.x.
Change-Id: I7d9d11c75e9983c18749111b212d7ca6042a3747
1 parent 2c3b2e9 commit 5895957

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

containers/grizzly2-servlet/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -101,7 +101,7 @@
101101
<configuration>
102102
<instructions>
103103
<Import-Package>
104-
javax.servlet.*;version="[2.4,4.0)",
104+
javax.servlet.*;version="[2.4,5.0)",
105105
*
106106
</Import-Package>
107107
</instructions>

containers/jersey-servlet-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -94,7 +94,7 @@
9494
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
9595
<Import-Package>
9696
javax.persistence.*;resolution:=optional,
97-
javax.servlet.*;version="[2.4,4.0)",
97+
javax.servlet.*;version="[2.4,5.0)",
9898
javax.annotation.*;version=!,
9999
*
100100
</Import-Package>

containers/jersey-servlet/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -97,7 +97,7 @@
9797
<instructions>
9898
<!-- Note: When you're changing these properties change them also in bundles/jax-rs-ri/bundle/pom.xml. -->
9999
<Import-Package>
100-
javax.servlet.*;version="[3.0,4.0)",
100+
javax.servlet.*;version="[3.0,5.0)",
101101
javax.annotation.*;version=!,
102102
*
103103
</Import-Package>

containers/jetty-servlet/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -96,7 +96,7 @@
9696
<configuration>
9797
<instructions>
9898
<Import-Package>
99-
javax.servlet.*;version="[2.4,4.0)",
99+
javax.servlet.*;version="[2.4,5.0)",
100100
*
101101
</Import-Package>
102102
</instructions>

examples/osgi-http-service/bundle/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2010-2016 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -83,7 +83,7 @@
8383
<configuration>
8484
<instructions>
8585
<Export-Package>org.glassfish.jersey.examples.osgihttpservice</Export-Package>
86-
<Import-Package>javax.servlet.*;version="[2.4,4.0)",*</Import-Package>
86+
<Import-Package>javax.servlet.*;version="[2.4,5.0)",*</Import-Package>
8787
<Bundle-Activator>org.glassfish.jersey.examples.osgihttpservice.Activator</Bundle-Activator>
8888
<Implementation-Title>jersey-osgi-http-service-bundle</Implementation-Title>
8989
<Implementation-Version>${project.version}</Implementation-Version>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
<doctitle>Jersey ${jersey.version} API Documentation</doctitle>
323323
<windowtitle>Jersey ${jersey.version} API</windowtitle>
324324
<bottom>
325-
<![CDATA[Copyright &#169; 2007-2016,
325+
<![CDATA[Copyright &#169; 2007-2017,
326326
<a href="http://www.oracle.com">Oracle</a>
327327
and/or its affiliates.
328328
All Rights Reserved. Use is subject to license terms.]]>

0 commit comments

Comments
 (0)