Skip to content

Commit 83acc18

Browse files
Merge remote-tracking branch 'origin/master'
2 parents 6dca4b8 + 396de83 commit 83acc18

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

http/itest/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<properties>
3434
<felix.java.version>11</felix.java.version>
3535
<http.servlet.api.version>2.1.0</http.servlet.api.version>
36-
<http.jetty.version>5.1.25-SNAPSHOT</http.jetty.version>
36+
<http.jetty.version>5.1.27-SNAPSHOT</http.jetty.version>
3737
<http.jetty.id>org.apache.felix.http.jetty</http.jetty.id>
3838
<pax.exam.version>4.13.1</pax.exam.version>
3939
<pax.url.aether.version>2.6.14</pax.url.aether.version>
@@ -45,7 +45,7 @@
4545
<properties>
4646
<felix.java.version>17</felix.java.version>
4747
<http.servlet.api.version>3.0.0</http.servlet.api.version>
48-
<http.jetty.version>1.0.15-SNAPSHOT</http.jetty.version>
48+
<http.jetty.version>1.0.17-SNAPSHOT</http.jetty.version>
4949
<http.jetty.id>org.apache.felix.http.jetty12</http.jetty.id>
5050
</properties>
5151
</profile>

http/jetty/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description>
3131

3232
<artifactId>org.apache.felix.http.jetty</artifactId>
33-
<version>5.1.25-SNAPSHOT</version>
33+
<version>5.1.27-SNAPSHOT</version>
3434
<packaging>bundle</packaging>
3535

3636
<scm>
@@ -42,7 +42,7 @@
4242

4343
<properties>
4444
<felix.java.version>11</felix.java.version>
45-
<jetty.version>11.0.23</jetty.version>
45+
<jetty.version>11.0.24</jetty.version>
4646
<baseline.skip>true</baseline.skip>
4747
<org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
4848
<!-- To debug the pax process, override this with -D -->

http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.slf4j.LoggerFactory;
4646

4747
public abstract class AbstractJettyTestSupport {
48-
protected static final String JETTY_VERSION = "11.0.23";
48+
protected static final String JETTY_VERSION = "11.0.24";
4949

5050
protected final Logger logger = LoggerFactory.getLogger(getClass());
5151

http/jetty12/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description>
3131

3232
<artifactId>org.apache.felix.http.jetty12</artifactId>
33-
<version>1.0.15-SNAPSHOT</version>
33+
<version>1.0.17-SNAPSHOT</version>
3434
<packaging>bundle</packaging>
3535

3636
<scm>
@@ -42,7 +42,7 @@
4242

4343
<properties>
4444
<felix.java.version>17</felix.java.version>
45-
<jetty.version>12.0.12</jetty.version>
45+
<jetty.version>12.0.13</jetty.version>
4646
<baseline.skip>true</baseline.skip>
4747
<org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
4848
<!-- To debug the pax process, override this with -D -->

http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.slf4j.LoggerFactory;
4646

4747
public abstract class AbstractJettyTestSupport {
48-
protected static final String JETTY_VERSION = "12.0.12";
48+
protected static final String JETTY_VERSION = "12.0.13";
4949

5050
protected final Logger logger = LoggerFactory.getLogger(getClass());
5151

http/samples/whiteboard/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</scm>
4040

4141
<properties>
42-
<jetty.version>12.0.12</jetty.version>
42+
<jetty.version>12.0.13</jetty.version>
4343
</properties>
4444

4545
<build>

0 commit comments

Comments
 (0)