(felix-dev) branch master updated (6e77eab8fc -> f0308f5688)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 6e77eab8fc [maven-release-plugin] prepare release org.apache.felix.http.jetty-5.1.14 add f0308f5688 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) annotated tag org.apache.felix.http.jetty-5.1.14 updated (6e77eab8fc -> 30f6a7b805)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty-5.1.14 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty-5.1.14 was modified! *** from 6e77eab8fc (commit) to 30f6a7b805 (tag) tagging 6e77eab8fc46fd5df629e6867af9fad0be95db95 (commit) replaces org.apache.felix.http.jetty12-1.0.6 by Carsten Ziegeler on Wed May 8 09:58:23 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty-5.1.14 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (43e5ee926c -> 6e77eab8fc)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 43e5ee926c [maven-release-plugin] prepare for next development iteration add 6e77eab8fc [maven-release-plugin] prepare release org.apache.felix.http.jetty-5.1.14 No new revisions were added by this update. Summary of changes: http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch master updated (97a8bde0d0 -> 43e5ee926c)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 97a8bde0d0 [maven-release-plugin] prepare release org.apache.felix.http.jetty12-1.0.6 add 43e5ee926c [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: http/jetty12/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) annotated tag org.apache.felix.http.jetty12-1.0.6 updated (97a8bde0d0 -> 6e9dba7754)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty12-1.0.6 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty12-1.0.6 was modified! *** from 97a8bde0d0 (commit) to 6e9dba7754 (tag) tagging 97a8bde0d0898b2c8a70765b773a1aec44ab674a (commit) replaces org.apache.felix.scr-2.2.12 by Carsten Ziegeler on Wed May 8 09:56:56 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty12-1.0.6 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (485c095e94 -> 97a8bde0d0)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 485c095e94 FELIX-6707 : Fix uriComplianceMode add 97a8bde0d0 [maven-release-plugin] prepare release org.apache.felix.http.jetty12-1.0.6 No new revisions were added by this update. Summary of changes: http/jetty12/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch master updated: FELIX-6707 : Fix uriComplianceMode
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 485c095e94 FELIX-6707 : Fix uriComplianceMode
485c095e94 is described below
commit 485c095e94e4fe7522521b28f82a681fdb0d598f
Author: Paul
AuthorDate: Wed May 8 09:41:40 2024 +0200
FELIX-6707 : Fix uriComplianceMode
* Fix uriComplianceMode
When making code review changes, an error was made in using the enum.
This pr fixes it.
Will add a unit test to guard behavior.
* Add unit tests to assert org.eclipse.jetty.UriComplianceMode works
* Assert response
---
.../felix/http/jetty/internal/JettyService.java| 13 ++-
.../jetty/it/JettyUriComplianceModeDefaultIT.java | 114 +
.../jetty/it/JettyUriComplianceModeLegacyIT.java | 83 +++
3 files changed, 205 insertions(+), 5 deletions(-)
diff --git
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index b52adc5a5b..6c483c47bb 100644
---
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -16,6 +16,10 @@
*/
package org.apache.felix.http.jetty.internal;
+import static org.eclipse.jetty.http.UriCompliance.LEGACY;
+import static org.eclipse.jetty.http.UriCompliance.UNAMBIGUOUS;
+import static org.eclipse.jetty.http.UriCompliance.UNSAFE;
+
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
@@ -677,15 +681,14 @@ public final class JettyService
config.setRequestHeaderSize(this.config.getHeaderSize());
config.setResponseHeaderSize(this.config.getHeaderSize());
config.setOutputBufferSize(this.config.getResponseBufferSize());
-
+
String uriComplianceMode =
this.config.getProperty(JettyConfig.FELIX_JETTY_URI_COMPLIANCE_MODE, null);
if (uriComplianceMode != null) {
try {
-
config.setUriCompliance(UriCompliance.valueOf(uriComplianceMode));
+UriCompliance compliance =
UriCompliance.valueOf(uriComplianceMode);
+config.setUriCompliance(compliance);
-if (UriCompliance.LEGACY.equals(uriComplianceMode)
-|| UriCompliance.UNSAFE.equals(uriComplianceMode)
-||
UriCompliance.UNAMBIGUOUS.equals(uriComplianceMode)) {
+if (LEGACY.equals(compliance) || UNSAFE.equals(compliance) ||
UNAMBIGUOUS.equals(compliance)) {
// See
https://github.com/jetty/jetty.project/issues/11448#issuecomment-1969206031
this.server.getContainedBeans(ServletHandler.class)
.forEach(handler ->
handler.setDecodeAmbiguousURIs(true));
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java
new file mode 100644
index 00..591aa51e5b
--- /dev/null
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.http.jetty.it;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.inject.Inject;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.eclipse.jetty.client.ContentResponse;
+import org.eclipse.jetty.cli
(felix-dev) branch master updated: FELIX-6706 : Avoid Jetty restart in case of a required configuration
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 2eb711b5c2 FELIX-6706 : Avoid Jetty restart in case of a required
configuration
2eb711b5c2 is described below
commit 2eb711b5c2e79d6e089725b3463f4fd661cd93f1
Author: Carsten Ziegeler
AuthorDate: Wed May 8 09:38:13 2024 +0200
FELIX-6706 : Avoid Jetty restart in case of a required configuration
---
.../felix/http/jetty/internal/JettyConfig.java | 6 ++
.../felix/http/jetty/internal/JettyService.java| 71 +++---
.../felix/http/jetty/internal/JettyConfig.java | 7 +++
.../felix/http/jetty/internal/JettyService.java| 70 ++---
4 files changed, 112 insertions(+), 42 deletions(-)
diff --git
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
index bba6ef7794..bb94561c84 100644
---
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
+++
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
@@ -274,6 +274,8 @@ public final class JettyConfig
/** Felix specific property to control whether to enable they
Jetty-specific WebSocket APIs */
public static final String FELIX_JETTY_WEBSOCKET_ENABLE =
"org.apache.felix.jetty.websocket.enable";
+/** Felix specific property to control whether an OSGi configuration is
required */
+private static final String FELIX_REQUIRE_OSGI_CONFIG =
"org.apache.felix.http.require.config";
private static String validateContextPath(String ctxPath)
{
@@ -964,4 +966,8 @@ public final class JettyConfig
return dflt;
}
}
+
+public boolean isRequireConfiguration() {
+return this.getBooleanProperty(FELIX_REQUIRE_OSGI_CONFIG, false);
+}
}
diff --git
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index 4b2e62c6b5..123deefc2e 100644
---
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -83,32 +83,57 @@ public final class JettyService
private volatile FileRequestLog fileRequestLog;
private volatile LoadBalancerCustomizerFactoryTracker
loadBalancerCustomizerTracker;
private volatile CustomizerWrapper customizerWrapper;
-private boolean registerManagedService = true;
+
+private final boolean registerManagedService;
private final String jettyVersion;
+private final boolean immediatelyStartJetty;
-public JettyService(final BundleContext context,
-final HttpServiceController controller)
-{
+/**
+ * Shared constructor for JettyService instances.
+ * @param context The bundle context
+ * @param controller The HTTP service controller
+ * @param registerManagedService Whether to register the managed service
+ */
+private JettyService(final BundleContext context,
+final HttpServiceController controller,
+final boolean registerManagedService) {
this.jettyVersion = fixJettyVersion(context);
this.context = context;
this.config = new JettyConfig(this.context);
this.controller = controller;
+this.registerManagedService = registerManagedService;
+this.immediatelyStartJetty = !registerManagedService ||
!this.config.isRequireConfiguration();
}
+/**
+ * Constructor for the managed service jetty service.
+ * @param context The bundle context
+ * @param controller The HTTP service controller
+ */
+public JettyService(final BundleContext context,
+final HttpServiceController controller) {
+this(context, controller, true);
+}
+
+/**
+ * Constructor for the managed service factory jetty service.
+ * @param context The bundle context
+ * @param controller The HTTP service controller
+ * @param props The configuration properties
+ */
public JettyService(final BundleContext context,
final HttpServiceController controller,
-final Dictionary props)
-{
-this(context, controller);
+final Dictionary props) {
+this(context, controller, false);
this.config.update(props);
- this.registerManagedService = false;
}
-public void start() throws Exception
-{
-// FELIX-4422: start Jetty synchronously...
-startJetty();
+public void start() throws Exception {
+if ( this.immediatelyStartJetty) {
+// FELIX-4422: start Jetty synchronously...
+
(felix-dev) branch master updated: FELIX-6702 : Make Jetty bundles EE version neutral
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 6a59d8f995 FELIX-6702 : Make Jetty bundles EE version neutral 6a59d8f995 is described below commit 6a59d8f995bb15678d1b537045bdda74d28c6a9f Author: Paul AuthorDate: Wed May 8 06:55:48 2024 +0200 FELIX-6702 : Make Jetty bundles EE version neutral Jetty bundle * org.apache.felix.jakarta.ee9.websocket.enable -> org.apache.felix.jakarta.websocket.enable * org.apache.felix.jetty.ee9.websocket.enable -> org.apache.felix.jetty.websocket.enable Jetty12 bundle * org.apache.felix.jakarta.ee10.websocket.enable -> org.apache.felix.jakarta.websocket.enable * org.apache.felix.jetty.ee10.websocket.enable -> org.apache.felix.jetty.websocket.enable Classifiers: * with-jetty-ee10-websockets -> with-jetty-websockets * with-jakarta-ee10-websockets -> with-jakarta-websockets Updated unit tests and README.md to reflect these changes. --- http/README.md | 116 ++--- .../jetty/internal/ConfigMetaTypeProvider.java | 14 +-- .../felix/http/jetty/internal/JettyConfig.java | 16 +-- .../felix/http/jetty/internal/JettyService.java| 22 ++-- ...cketIT.java => JakartaSpecificWebsocketIT.java} | 4 +- ...socketIT.java => JettySpecificWebsocketIT.java} | 4 +- .../jetty/it/MissingWebsocketDependenciesIT.java | 6 +- http/jetty12/pom.xml | 8 +- .../jetty/internal/ConfigMetaTypeProvider.java | 16 +-- .../felix/http/jetty/internal/JettyConfig.java | 22 ++-- .../felix/http/jetty/internal/JettyService.java| 18 ++-- ...cketIT.java => JakartaSpecificWebsocketIT.java} | 4 +- ...socketIT.java => JettySpecificWebsocketIT.java} | 4 +- .../jetty/it/MissingWebsocketDependenciesIT.java | 4 +- http/samples/whiteboard/pom.xml| 2 +- .../samples/whiteboard/TestWebSocketServlet.java | 2 +- .../TestWebSocketServletAlternative.java | 2 +- 17 files changed, 131 insertions(+), 133 deletions(-) diff --git a/http/README.md b/http/README.md index 621a358cc3..ef2689cf69 100644 --- a/http/README.md +++ b/http/README.md @@ -8,7 +8,7 @@ This is an implementation of the [R8.1 Whiteboard Specification for Jakarta Serv * [Felix HTTP Jetty 12](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty12) is the preferred bundle of choice as it supports JavaEE 8 and JakartaEE 8 with the `javax` namespace, JakartaEE 9/10/11/future versions with the `jakarta` namespace. * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/310), see example code [here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java). * [Felix HTTP Jetty 11](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty) is the predecessor of the Jetty 12 bundle, which shipped with [Jetty 9.4.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/4.2.26) in the 4.x range, [Jetty 11.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/5.1.10) in the 5.x range. - * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/39), see example code [here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java). + * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/309), see example code [here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java). * Correctly versioned Servlet API. ## Installing @@ -28,11 +28,11 @@ Note that as of version **3.x**, the Servlet APIs are **no longer** packaged wit `org.apache.felix.http.servlet-api` (or any other compatible Serlvet API bundle) to your classpath and deployment! -### Using classifiers: `light`, `with-jetty-ee10-websockets` and `with-jakarta-ee10-websockets` bundle +### Using classifiers: `light`, `with-jetty-websockets` and `with-jakarta-websockets` bundle If you would like to use your own Jetty jars instead of the one packaged with the Felix Jetty bundles, you can use the variants with the following classifiers: * `light` - A light version of the bundle that does not include the Jetty classes. This is useful when you want to use your own Jetty jars. Available for both Jetty bundles. -* `with-jetty-ee10-websockets` - A bundle that includes the classes required for Jetty WebSocket support for Jakarta EE10. Jetty12 bundle only. -* `with-jakar
(felix-antora-site) branch main updated: Http releases
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/felix-antora-site.git The following commit(s) were added to refs/heads/main by this push: new 2255b019 Http releases 2255b019 is described below commit 2255b01996906d8e079120dca5d0548e50c91739 Author: Carsten Ziegeler AuthorDate: Sun May 5 10:59:48 2024 +0200 Http releases --- downloads.list | 7 --- modules/ROOT/examples/downloads.yml | 8 modules/ROOT/pages/news.adoc| 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/downloads.list b/downloads.list index 6f62a2df..45af82d9 100644 --- a/downloads.list +++ b/downloads.list @@ -55,9 +55,10 @@ Health Check API|org.apache.felix.healthcheck.api|2.0.4|project||- Health Check Core|org.apache.felix.healthcheck.core|2.2.0|project||- Health Check General Checks|org.apache.felix.healthcheck.generalchecks|3.0.8|project||- Health Check Webconsole Plugin|org.apache.felix.healthcheck.webconsoleplugin|2.2.0|project||- -HTTP Service Base|org.apache.felix.http.base|5.1.6 -HTTP Service Bridge|org.apache.felix.http.bridge|5.1.6 -HTTP Service Jetty|org.apache.felix.http.jetty|5.1.10 +HTTP Service Base|org.apache.felix.http.base|5.1.8 +HTTP Service Bridge|org.apache.felix.http.bridge|5.1.8 +HTTP Service Jetty|org.apache.felix.http.jetty|5.1.12 +HTTP Service Jetty|org.apache.felix.http.jetty12|1.0.4 HTTP Service Proxy|org.apache.felix.http.proxy|3.0.6 HTTP Service SSL filter|org.apache.felix.http.sslfilter|2.0.2 HTTP Service Whiteboard|org.apache.felix.http.whiteboard|4.0.0 diff --git a/modules/ROOT/examples/downloads.yml b/modules/ROOT/examples/downloads.yml index c9f8d1cc..30090b1d 100644 --- a/modules/ROOT/examples/downloads.yml +++ b/modules/ROOT/examples/downloads.yml @@ -173,25 +173,25 @@ subprojects: - title: HTTP Service Base artifactId: org.apache.felix.http.base -version: 5.1.6 +version: 5.1.8 source_classifier: source-release changelog: false - title: HTTP Service Bridge artifactId: org.apache.felix.http.bridge -version: 5.1.6 +version: 5.1.8 source_classifier: source-release changelog: false - title: HTTP Service Jetty artifactId: org.apache.felix.http.jetty -version: 5.1.10 +version: 5.1.12 source_classifier: source-release changelog: false - title: HTTP Service Jetty12 artifactId: org.apache.felix.http.jetty12 -version: 1.0.2 +version: 1.0.4 source_classifier: source-release changelog: false diff --git a/modules/ROOT/pages/news.adoc b/modules/ROOT/pages/news.adoc index c5497a14..150a8825 100644 --- a/modules/ROOT/pages/news.adoc +++ b/modules/ROOT/pages/news.adoc @@ -1,5 +1,6 @@ = News +* Apache Felix Http Jetty 5.1.12, Http Jetty12 1.0.4, Http Base 5.1.8 and Http Bridge 5.1.8 (May 5th) * Apache Felix Webconsole 5.0.2 and 4.9.8 (April, 14th) * Apache Felix Http Jetty 5.1.10 and Http Jetty 4.2.26 (March, 4th) * Apache Felix Http Jetty 5.1.8, Http Jetty12 1.0.2, Http Jetty 4.2.24, Http Base 5.1.6, Http Base 4.2.14, Http Bridge 5.1.6 and Http Bridge 4.2.18 (January 26th)
svn commit: r68955 [3/3] - /release/felix/
Added: release/felix/org.apache.felix.http.jetty12-1.0.4.pom
==
--- release/felix/org.apache.felix.http.jetty12-1.0.4.pom (added)
+++ release/felix/org.apache.felix.http.jetty12-1.0.4.pom Sun May 5 08:51:57
2024
@@ -0,0 +1,830 @@
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+org.apache.felix
+felix-parent
+9
+../../pom/pom.xml
+
+
+Apache Felix Http Jetty
+This is an implementation of the R8.1 OSGi Servlet Service,
the R7 OSGi Http Service and the R7 OSGi Http Whiteboard
Specification
+
+org.apache.felix.http.jetty12
+1.0.4
+bundle
+
+
+
scm:git:https://github.com/apache/felix-dev.git
+
scm:git:https://github.com/apache/felix-dev.git
+https://gitbox.apache.org/repos/asf?p=felix-dev.git
+ org.apache.felix.http.jetty12-1.0.4
+
+
+
+17
+12.0.8
+true
+4.13.3
+
+-Xmx512M
+
+
+
+
+
+
+
+org.codehaus.gmaven
+groovy-maven-plugin
+2.1.1
+
+
+groovy-magic
+prepare-package
+
+execute
+
+
+
+
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+5.1.9
+true
+
+
+
${project.artifactId}
+${project.version}
+
+${jetty.version}
+
+
+org.apache.felix.http.jetty.internal.JettyActivator
+
+
+org.osgi.service.http,
+org.osgi.service.http.context,
+org.osgi.service.http.runtime,
+org.osgi.service.http.runtime.dto,
+org.osgi.service.http.whiteboard,
+org.osgi.service.servlet.context,
+org.osgi.service.servlet.runtime,
+org.osgi.service.servlet.runtime.dto,
+org.osgi.service.servlet.whiteboard,
+org.eclipse.jetty.alpn.server,
+org.eclipse.jetty.http.*,
+org.eclipse.jetty.http2.*,
+org.eclipse.jetty.io.*,
+org.eclipse.jetty.jmx.*,
+org.eclipse.jetty.security.*,
+org.eclipse.jetty.session.*,
+org.eclipse.jetty.server.*,
+org.eclipse.jetty.util.*,
+!org.eclipse.jetty.ee10.websocket.*,
+org.eclipse.jetty.ee10.servlet.*,
+org.apache.felix.http.jetty,
+org.apache.felix.http.jakartawrappers,
+org.apache.felix.http.javaxwrappers
+
+
+org.apache.felix.http.base.*,
+org.apache.felix.http.jetty.*,
+org.eclipse.jetty.version
+
+
+org.apache.commons.*
+
+
+sun.misc;resolution:=optional,
+sun.nio.ch;resolution:=optional,
+javax.imageio;resolution:=optional,
+javax.sql;resolution:=optional,
+org.ietf.jgss;resolution:=optional,
+
org.osgi.service.cm;resolution:=optional;version="[1.3,2)",
+
org.osgi.service.event;resolution:=optional;version="[1.2,2)",
+
org.osgi.service.log;resolution:=optional;version="[1.3,2)",
+
org.osgi.service.metatype;resolution:=optional;version="[1.1,2)",
+
org.osgi.service.useradmin;resolution:=optional;version="[1.1,2)",
+org.osgi.service.http;version="[1.2.1,1.3)",
+org.osgi.service.http.context;version="[1.1,1.2)",
+org.osgi.service.http.runtime;version="[1.1,1.2)",
+
svn commit: r68955 [2/3] - /release/felix/
Added: release/felix/org.apache.felix.http.jetty-5.1.12.pom
==
--- release/felix/org.apache.felix.http.jetty-5.1.12.pom (added)
+++ release/felix/org.apache.felix.http.jetty-5.1.12.pom Sun May 5 08:51:57
2024
@@ -0,0 +1,604 @@
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+org.apache.felix
+felix-parent
+9
+../../pom/pom.xml
+
+
+Apache Felix Http Jetty
+This is an implementation of the R8.1 OSGi Servlet Service,
the R7 OSGi Http Service and the R7 OSGi Http Whiteboard
Specification
+
+org.apache.felix.http.jetty
+5.1.12
+bundle
+
+
+
scm:git:https://github.com/apache/felix-dev.git
+
scm:git:https://github.com/apache/felix-dev.git
+https://gitbox.apache.org/repos/asf?p=felix-dev.git
+ org.apache.felix.http.jetty-5.1.12
+
+
+
+11
+11.0.20
+true
+4.13.3
+
+-Xmx512M
+
+
+
+
+
+
+
+org.codehaus.gmaven
+groovy-maven-plugin
+2.1.1
+
+
+groovy-magic
+prepare-package
+
+execute
+
+
+
+
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+5.1.9
+true
+
+
+
${project.artifactId}
+${project.version}
+
+${jetty.version}
+
+
+org.apache.felix.http.jetty.internal.JettyActivator
+
+
+org.osgi.service.http,
+org.osgi.service.http.context,
+org.osgi.service.http.runtime,
+org.osgi.service.http.runtime.dto,
+org.osgi.service.http.whiteboard,
+org.osgi.service.servlet.context,
+org.osgi.service.servlet.runtime,
+org.osgi.service.servlet.runtime.dto,
+org.osgi.service.servlet.whiteboard,
+org.eclipse.jetty.alpn.server,
+org.eclipse.jetty.http.*,
+org.eclipse.jetty.http2.*,
+org.eclipse.jetty.io.*,
+org.eclipse.jetty.jmx.*,
+org.eclipse.jetty.security.*,
+org.eclipse.jetty.server.*,
+org.eclipse.jetty.servlet.*,
+org.eclipse.jetty.util.*,
+org.apache.felix.http.jetty,
+org.apache.felix.http.jakartawrappers,
+org.apache.felix.http.javaxwrappers
+
+
+org.apache.felix.http.base.*,
+org.apache.felix.http.jetty.*,
+org.eclipse.jetty,
+org.eclipse.jetty.version
+
+
+org.apache.commons.*
+
+
+sun.misc;resolution:=optional,
+sun.nio.ch;resolution:=optional,
+javax.imageio;resolution:=optional,
+javax.sql;resolution:=optional,
+org.ietf.jgss;resolution:=optional,
+
org.osgi.service.cm;resolution:=optional;version="[1.3,2)",
+
org.osgi.service.event;resolution:=optional;version="[1.2,2)",
+
org.osgi.service.log;resolution:=optional;version="[1.3,2)",
+
org.osgi.service.metatype;resolution:=optional;version="[1.1,2)",
+
org.osgi.service.useradmin;resolution:=optional;version="[1.1,2)",
+org.osgi.service.http;version="[1.2.1,1.3)",
+org.osgi.service.http.context;version="[1.1,1.2)",
+org.osgi.service.http.runtime;version="[1.1,1.2)",
+
org.osgi.service.http.runtime.dto;version="[1.1,1.2)",
+
svn commit: r68955 [1/3] - /release/felix/
Author: cziegeler Date: Sun May 5 08:51:57 2024 New Revision: 68955 Log: Http jetty and jetty12 releases Added: release/felix/org.apache.felix.http.base-5.1.8-javadoc.jar (with props) release/felix/org.apache.felix.http.base-5.1.8-javadoc.jar.asc release/felix/org.apache.felix.http.base-5.1.8-javadoc.jar.sha1 release/felix/org.apache.felix.http.base-5.1.8-javadoc.jar.sha512 release/felix/org.apache.felix.http.base-5.1.8-source-release.tar.gz (with props) release/felix/org.apache.felix.http.base-5.1.8-source-release.tar.gz.asc release/felix/org.apache.felix.http.base-5.1.8-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.base-5.1.8-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.base-5.1.8-source-release.zip (with props) release/felix/org.apache.felix.http.base-5.1.8-source-release.zip.asc release/felix/org.apache.felix.http.base-5.1.8-source-release.zip.sha1 release/felix/org.apache.felix.http.base-5.1.8-source-release.zip.sha512 release/felix/org.apache.felix.http.base-5.1.8-sources.jar (with props) release/felix/org.apache.felix.http.base-5.1.8-sources.jar.asc release/felix/org.apache.felix.http.base-5.1.8-sources.jar.sha1 release/felix/org.apache.felix.http.base-5.1.8-sources.jar.sha512 release/felix/org.apache.felix.http.base-5.1.8.jar (with props) release/felix/org.apache.felix.http.base-5.1.8.jar.asc release/felix/org.apache.felix.http.base-5.1.8.jar.sha1 release/felix/org.apache.felix.http.base-5.1.8.jar.sha512 release/felix/org.apache.felix.http.base-5.1.8.pom release/felix/org.apache.felix.http.base-5.1.8.pom.asc release/felix/org.apache.felix.http.base-5.1.8.pom.sha1 release/felix/org.apache.felix.http.base-5.1.8.pom.sha512 release/felix/org.apache.felix.http.bridge-5.1.8-light.jar (with props) release/felix/org.apache.felix.http.bridge-5.1.8-light.jar.asc release/felix/org.apache.felix.http.bridge-5.1.8-light.jar.sha1 release/felix/org.apache.felix.http.bridge-5.1.8-light.jar.sha512 release/felix/org.apache.felix.http.bridge-5.1.8-source-release.tar.gz (with props) release/felix/org.apache.felix.http.bridge-5.1.8-source-release.tar.gz.asc release/felix/org.apache.felix.http.bridge-5.1.8-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.bridge-5.1.8-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.bridge-5.1.8-source-release.zip (with props) release/felix/org.apache.felix.http.bridge-5.1.8-source-release.zip.asc release/felix/org.apache.felix.http.bridge-5.1.8-source-release.zip.sha1 release/felix/org.apache.felix.http.bridge-5.1.8-source-release.zip.sha512 release/felix/org.apache.felix.http.bridge-5.1.8-sources.jar (with props) release/felix/org.apache.felix.http.bridge-5.1.8-sources.jar.asc release/felix/org.apache.felix.http.bridge-5.1.8-sources.jar.sha1 release/felix/org.apache.felix.http.bridge-5.1.8-sources.jar.sha512 release/felix/org.apache.felix.http.bridge-5.1.8.jar (with props) release/felix/org.apache.felix.http.bridge-5.1.8.jar.asc release/felix/org.apache.felix.http.bridge-5.1.8.jar.sha1 release/felix/org.apache.felix.http.bridge-5.1.8.jar.sha512 release/felix/org.apache.felix.http.bridge-5.1.8.pom release/felix/org.apache.felix.http.bridge-5.1.8.pom.asc release/felix/org.apache.felix.http.bridge-5.1.8.pom.sha1 release/felix/org.apache.felix.http.bridge-5.1.8.pom.sha512 release/felix/org.apache.felix.http.jetty-5.1.12-javadoc.jar (with props) release/felix/org.apache.felix.http.jetty-5.1.12-javadoc.jar.asc release/felix/org.apache.felix.http.jetty-5.1.12-javadoc.jar.sha1 release/felix/org.apache.felix.http.jetty-5.1.12-javadoc.jar.sha512 release/felix/org.apache.felix.http.jetty-5.1.12-light.jar (with props) release/felix/org.apache.felix.http.jetty-5.1.12-light.jar.asc release/felix/org.apache.felix.http.jetty-5.1.12-light.jar.sha1 release/felix/org.apache.felix.http.jetty-5.1.12-light.jar.sha512 release/felix/org.apache.felix.http.jetty-5.1.12-source-release.tar.gz (with props) release/felix/org.apache.felix.http.jetty-5.1.12-source-release.tar.gz.asc release/felix/org.apache.felix.http.jetty-5.1.12-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.jetty-5.1.12-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.jetty-5.1.12-source-release.zip (with props) release/felix/org.apache.felix.http.jetty-5.1.12-source-release.zip.asc release/felix/org.apache.felix.http.jetty-5.1.12-source-release.zip.sha1 release/felix/org.apache.felix.http.jetty-5.1.12-source-release.zip.sha512 release/felix/org.apache.felix.http.jetty-5.1.12-sources.jar (with props) release/felix/org.apache.felix.http.jetty-5.1.12-sources.jar.asc release/felix/org.apache.felix.http.jetty-5.1.12-sources.jar.sha1 release/felix
(felix-dev) branch master updated: FELIX-6700 Missing o.o.service.servlet.* export-package in felix jetty (#314)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 517f9a0c89 FELIX-6700 Missing o.o.service.servlet.* export-package in
felix jetty (#314)
517f9a0c89 is described below
commit 517f9a0c89cad1866f315255568b40c568f5239d
Author: Eric Norman
AuthorDate: Sun May 5 01:17:50 2024 -0700
FELIX-6700 Missing o.o.service.servlet.* export-package in felix jetty
(#314)
---
http/jetty/pom.xml | 6 +-
.../http/jetty/it/AbstractJettyTestSupport.java| 2 +-
.../felix/http/jetty/it/LightClassifierIT.java | 107
http/jetty12/pom.xml | 6 +-
.../http/jetty/it/AbstractJettyTestSupport.java| 2 +-
.../felix/http/jetty/it/LightClassifierIT.java | 108 +
6 files changed, 225 insertions(+), 6 deletions(-)
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 1c20a8093f..e3cd1696ba 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -281,7 +281,10 @@
org.osgi.service.http.runtime,
org.osgi.service.http.runtime.dto,
org.osgi.service.http.whiteboard,
-!org.osgi.service.servlet.*,
+org.osgi.service.servlet.context,
+org.osgi.service.servlet.runtime,
+org.osgi.service.servlet.runtime.dto,
+org.osgi.service.servlet.whiteboard,
org.apache.felix.http.jetty,
org.apache.felix.http.javaxwrappers,
org.apache.felix.http.jakartawrappers
@@ -289,7 +292,6 @@
org.apache.felix.http.base.*,
org.apache.felix.http.jetty.*,
-org.osgi.service.servlet.*
org.osgi.service.cm;resolution:=optional;version="[1.3,2)",
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 617f712b39..58b2c39e3f 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -153,7 +153,7 @@ public abstract class AbstractJettyTestSupport {
* @param systemProperty the System property which contains the pathname
of the test bundle
* @return the provisioning option
*/
-public static UrlProvisionOption testBundle(final String systemProperty) {
+protected UrlProvisionOption testBundle(final String systemProperty) {
final String pathname = System.getProperty(systemProperty);
final File file = new File(pathname);
return bundle(file.toURI().toString());
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
new file mode 100644
index 00..e93aee6962
--- /dev/null
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.http.jetty.it;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.bundle;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import javax.inject.Inject;
+
+
(felix-dev) branch master updated: Fix javadoc warnings
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new f9f34ee0e0 Fix javadoc warnings
f9f34ee0e0 is described below
commit f9f34ee0e01f178c5d6acc519153eb50212cceba
Author: Carsten Ziegeler
AuthorDate: Thu May 2 07:10:49 2024 +0200
Fix javadoc warnings
---
.../http/base/internal/handler/HttpSessionWrapper.java | 4
.../http/base/internal/registry/ErrorPageRegistry.java | 1 +
.../http/base/internal/registry/EventListenerRegistry.java | 3 +--
.../felix/http/base/internal/registry/HandlerRegistry.java | 1 +
.../base/internal/registry/PerContextHandlerRegistry.java | 4 +++-
.../felix/http/base/internal/registry/ServletRegistry.java | 1 +
.../felix/http/base/internal/runtime/AbstractInfo.java | 5 +
.../apache/felix/http/base/internal/runtime/FilterInfo.java | 1 +
.../felix/http/base/internal/runtime/PreprocessorInfo.java | 1 +
.../base/internal/runtime/ServletContextHelperInfo.java | 2 +-
.../felix/http/base/internal/runtime/ServletInfo.java | 5 -
.../http/base/internal/runtime/dto/ErrorPageDTOBuilder.java | 1 +
.../http/base/internal/runtime/dto/FilterDTOBuilder.java| 2 ++
.../base/internal/runtime/dto/PreprocessorDTOBuilder.java | 1 +
.../http/base/internal/runtime/dto/ResourceDTOBuilder.java | 2 ++
.../http/base/internal/runtime/dto/ServletDTOBuilder.java | 1 +
.../apache/felix/http/base/internal/util/ServiceUtils.java | 13 +
.../base/internal/whiteboard/WhiteboardContextHandler.java | 1 +
.../http/base/internal/whiteboard/WhiteboardManager.java| 5 +++--
.../felix/http/jetty/LoadBalancerCustomizerFactory.java | 1 -
.../main/java/org/apache/felix/http/jetty/package-info.java | 3 +++
21 files changed, 50 insertions(+), 8 deletions(-)
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
index dba883e225..821dbe7403 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
@@ -147,6 +147,10 @@ public class HttpSessionWrapper implements HttpSession
/**
* Creates a new {@link HttpSessionWrapper} instance.
+ * @param session The internal session
+ * @param context The servlet context
+ * @param config The configuration
+ * @param terminate Whether to terminate the session
*/
public HttpSessionWrapper(final HttpSession session,
final ExtServletContext context,
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java
index 9deee6bda2..83fc1b2301 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/ErrorPageRegistry.java
@@ -241,6 +241,7 @@ public final class ErrorPageRegistry
/**
* Remove the servlet from error handling
* @param info The servlet info.
+ * @param destroy Unused
*/
public synchronized void removeServlet(@NotNull final ServletInfo info,
final boolean destroy)
{
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java
index 1efabfd055..3d541f0ae4 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/EventListenerRegistry.java
@@ -126,8 +126,7 @@ public final class EventListenerRegistry implements
/**
* Remove listeners
- *
- * @param info
+ * @param info The listener info
*/
public void removeListeners(@NotNull final ListenerInfo info)
{
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/HandlerRegistry.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/HandlerRegistry.java
index 82b0c0a68b..869bfe1e45 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/registry/HandlerRegistry.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/registry/HandlerRegistry.java
@@ -120,6 +120,7 @@ public final class HandlerRegistry
/**
* Add a new context registration.
+ * @param registry The registry
*/
public void add(@NotNull PerContextHandlerRegistry registry)
{
diff --git
a/http/base/src/main/java
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 7d5114c16e [maven-release-plugin] prepare for next development iteration 7d5114c16e is described below commit 7d5114c16e7afe4ccb597197fdbf03da6b574713 Author: Carsten Ziegeler AuthorDate: Wed May 1 18:15:38 2024 +0200 [maven-release-plugin] prepare for next development iteration --- http/jetty12/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 86d64d3c4b..565845178d 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -30,14 +30,14 @@ This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification org.apache.felix.http.jetty12 -1.0.4 +1.0.5-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.jetty12-1.0.4 + HEAD
(felix-dev) annotated tag org.apache.felix.http.jetty12-1.0.4 updated (18c0790038 -> d666e08d03)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty12-1.0.4 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty12-1.0.4 was modified! *** from 18c0790038 (commit) to d666e08d03 (tag) tagging 18c079003849686f0799ae5d0abd3490fa9391bc (commit) replaces org.apache.felix.http.jetty-5.1.12 by Carsten Ziegeler on Wed May 1 18:15:37 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty12-1.0.4 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (065333b46b -> 18c0790038)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 065333b46b [maven-release-plugin] prepare for next development iteration add 18c0790038 [maven-release-plugin] prepare release org.apache.felix.http.jetty12-1.0.4 No new revisions were added by this update. Summary of changes: http/jetty12/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 065333b46b [maven-release-plugin] prepare for next development iteration 065333b46b is described below commit 065333b46b77f6ee79ed35a1125de56c765c7d42 Author: Carsten Ziegeler AuthorDate: Wed May 1 18:14:31 2024 +0200 [maven-release-plugin] prepare for next development iteration --- http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 191171cf0e..1c20a8093f 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -30,14 +30,14 @@ This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification org.apache.felix.http.jetty -5.1.12 +5.1.13-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.jetty-5.1.12 + HEAD
(felix-dev) annotated tag org.apache.felix.http.jetty-5.1.12 updated (1eb59c0390 -> 97087a43f0)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty-5.1.12 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty-5.1.12 was modified! *** from 1eb59c0390 (commit) to 97087a43f0 (tag) tagging 1eb59c03905616c056338b0c26ad7bf4300727f6 (commit) replaces org.apache.felix.http.bridge-5.1.8 by Carsten Ziegeler on Wed May 1 18:14:30 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty-5.1.12 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (a4587174d6 -> 1eb59c0390)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from a4587174d6 [maven-release-plugin] prepare for next development iteration add 1eb59c0390 [maven-release-plugin] prepare release org.apache.felix.http.jetty-5.1.12 No new revisions were added by this update. Summary of changes: http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new a4587174d6 [maven-release-plugin] prepare for next development iteration a4587174d6 is described below commit a4587174d66bd2e916d98ff059f1fe005e32b224 Author: Carsten Ziegeler AuthorDate: Wed May 1 18:13:42 2024 +0200 [maven-release-plugin] prepare for next development iteration --- http/bridge/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml index e9e09ca534..b259bc8bac 100644 --- a/http/bridge/pom.xml +++ b/http/bridge/pom.xml @@ -29,14 +29,14 @@ Apache Felix Http Bridge This is an implementation of the OSGi Servlet Service, the OSGi Http Service and the OSGi Http Whiteboard Specification used when run as a web application org.apache.felix.http.bridge -5.1.8 +5.1.9-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.bridge-5.1.8 + HEAD
(felix-dev) annotated tag org.apache.felix.http.bridge-5.1.8 updated (4c362ca690 -> e36f6bc753)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.bridge-5.1.8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.bridge-5.1.8 was modified! *** from 4c362ca690 (commit) to e36f6bc753 (tag) tagging 4c362ca69016d101243e7cf1f62dd5db9e034947 (commit) replaces org.apache.felix.http.base-5.1.8 by Carsten Ziegeler on Wed May 1 18:13:40 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.bridge-5.1.8 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (3b8a7e60ef -> 4c362ca690)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 3b8a7e60ef [maven-release-plugin] prepare for next development iteration add 4c362ca690 [maven-release-plugin] prepare release org.apache.felix.http.bridge-5.1.8 No new revisions were added by this update. Summary of changes: http/bridge/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) annotated tag org.apache.felix.http.base-5.1.8 updated (6d68e8156c -> 155e9ceb43)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.base-5.1.8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.base-5.1.8 was modified! *** from 6d68e8156c (commit) to 155e9ceb43 (tag) tagging 6d68e8156c7cc3a3f36726d345d4d8e228ca38a2 (commit) replaces felix-parent-9 by Carsten Ziegeler on Wed May 1 18:12:57 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.base-5.1.8 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 3b8a7e60ef [maven-release-plugin] prepare for next development iteration 3b8a7e60ef is described below commit 3b8a7e60ef592165df80f7014ce11f7bb724a729 Author: Carsten Ziegeler AuthorDate: Wed May 1 18:12:58 2024 +0200 [maven-release-plugin] prepare for next development iteration --- http/base/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/base/pom.xml b/http/base/pom.xml index 8a9c34ae0a..13573273e7 100644 --- a/http/base/pom.xml +++ b/http/base/pom.xml @@ -28,14 +28,14 @@ Apache Felix Http Base org.apache.felix.http.base -5.1.8 +5.1.9-SNAPSHOT jar scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.base-5.1.8 + HEAD
(felix-dev) branch master updated (2e348c5d35 -> 6d68e8156c)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 2e348c5d35 [maven-release-plugin] prepare for next development iteration add 6d68e8156c [maven-release-plugin] prepare release org.apache.felix.http.base-5.1.8 No new revisions were added by this update. Summary of changes: http/base/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) annotated tag felix-parent-9 updated (9a0efe5fd7 -> 5f20f02cf0)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag felix-parent-9 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag felix-parent-9 was modified! *** from 9a0efe5fd7 (commit) to 5f20f02cf0 (tag) tagging 9a0efe5fd74422f47e381132e0d3e413d01563ad (commit) replaces org.apache.felix.webconsole-5.0.2 by Carsten Ziegeler on Wed May 1 18:11:36 2024 +0200 - Log - [maven-release-plugin] copy for tag felix-parent-9 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (6a315947ec -> 9a0efe5fd7)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 6a315947ec Update to parent pom 9 add 9a0efe5fd7 [maven-release-plugin] prepare release felix-parent-9 No new revisions were added by this update. Summary of changes: pom/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 2e348c5d35 [maven-release-plugin] prepare for next development iteration 2e348c5d35 is described below commit 2e348c5d3565c48ed448b2319cb5e46a488fb815 Author: Carsten Ziegeler AuthorDate: Wed May 1 18:11:37 2024 +0200 [maven-release-plugin] prepare for next development iteration --- pom/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom/pom.xml b/pom/pom.xml index e4e5723c2b..4f7723da20 100644 --- a/pom/pom.xml +++ b/pom/pom.xml @@ -31,7 +31,7 @@ pom Apache Felix -9 +10-SNAPSHOT https://felix.apache.org/ 2006 Apache Felix is a community effort to implement the OSGi Framework and Service platform and other interesting OSGi-related technologies. @@ -46,7 +46,7 @@ *.impl:*.internal: UTF-8 UTF-8 - 1714579892 + 1714579897 @@ -75,7 +75,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=pom - felix-parent-9 + HEAD
(felix-dev) branch master updated: Update to parent pom 9
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 6a315947ec Update to parent pom 9 6a315947ec is described below commit 6a315947eca66dba44fa017d9d8b7c19e493c1fc Author: Carsten Ziegeler AuthorDate: Wed May 1 18:11:18 2024 +0200 Update to parent pom 9 --- http/base/pom.xml | 5 - http/bridge/pom.xml | 2 +- http/inventoryprinter/pom.xml | 2 +- http/itest/pom.xml| 2 +- http/jetty/pom.xml| 2 +- http/jetty12/pom.xml | 2 +- http/proxy/pom.xml| 2 +- http/servlet-api/pom.xml | 2 +- http/sslfilter/pom.xml| 2 +- http/webconsoleplugin/pom.xml | 2 +- http/wrappers/pom.xml | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/http/base/pom.xml b/http/base/pom.xml index bac38d3165..ebd3455e0a 100644 --- a/http/base/pom.xml +++ b/http/base/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../../pom/pom.xml @@ -71,6 +71,9 @@ + +maven-javadoc-plugin + diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml index 873e399f54..d0be826f05 100644 --- a/http/bridge/pom.xml +++ b/http/bridge/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../../pom/pom.xml diff --git a/http/inventoryprinter/pom.xml b/http/inventoryprinter/pom.xml index 8bf3abf387..c3cdf5436d 100644 --- a/http/inventoryprinter/pom.xml +++ b/http/inventoryprinter/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../../pom/pom.xml diff --git a/http/itest/pom.xml b/http/itest/pom.xml index 5e3a70b81b..0c22f10f57 100644 --- a/http/itest/pom.xml +++ b/http/itest/pom.xml @@ -15,7 +15,7 @@ org.apache.felix felix-parent -8 +9 ../../pom/pom.xml diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 566f6940b5..1dd5b45b43 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../../pom/pom.xml diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index f706750fb0..4b0f6dfa44 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../../pom/pom.xml diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml index 678c111849..c0798add2d 100644 --- a/http/proxy/pom.xml +++ b/http/proxy/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../../pom/pom.xml diff --git a/http/servlet-api/pom.xml b/http/servlet-api/pom.xml index cd0e82de8e..bfbb4de269 100644 --- a/http/servlet-api/pom.xml +++ b/http/servlet-api/pom.xml @@ -14,7 +14,7 @@ org.apache.felix felix-parent -8 +9 ../../pom/pom.xml diff --git a/http/sslfilter/pom.xml b/http/sslfilter/pom.xml index 84f85bb6a6..f056363c15 100644 --- a/http/sslfilter/pom.xml +++ b/http/sslfilter/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../pom/pom.xml diff --git a/http/webconsoleplugin/pom.xml b/http/webconsoleplugin/pom.xml index cc24522106..896bb4f7e3 100644 --- a/http/webconsoleplugin/pom.xml +++ b/http/webconsoleplugin/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../pom/pom.xml diff --git a/http/wrappers/pom.xml b/http/wrappers/pom.xml index 2a8800c7d0..39a5af1395 100644 --- a/http/wrappers/pom.xml +++ b/http/wrappers/pom.xml @@ -22,7 +22,7 @@ org.apache.felix felix-parent -8 +9 ../pom/pom.xml
(felix-dev) annotated tag org.apache.felix.http.base-5.1.8 deleted (was 3b5cc33530)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.base-5.1.8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.base-5.1.8 was deleted! *** tag was 3b5cc33530 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(felix-dev) branch master updated: [maven-release-plugin] rollback the release of org.apache.felix.http.base-5.1.8
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new bad94caf62 [maven-release-plugin] rollback the release of org.apache.felix.http.base-5.1.8 bad94caf62 is described below commit bad94caf627205f8b1e54f475a9276efc7ccc247 Author: Carsten Ziegeler AuthorDate: Wed May 1 18:02:51 2024 +0200 [maven-release-plugin] rollback the release of org.apache.felix.http.base-5.1.8 --- http/base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/base/pom.xml b/http/base/pom.xml index ac93e262a5..bac38d3165 100644 --- a/http/base/pom.xml +++ b/http/base/pom.xml @@ -28,7 +28,7 @@ Apache Felix Http Base org.apache.felix.http.base -5.1.9-SNAPSHOT +5.1.7-SNAPSHOT jar
(felix-dev) annotated tag org.apache.felix.http.base-5.1.8 updated (7c0076c67c -> 3b5cc33530)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.base-5.1.8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.base-5.1.8 was modified! *** from 7c0076c67c (commit) to 3b5cc33530 (tag) tagging 7c0076c67ca861b07615ec4e920d44ef97fb7899 (commit) replaces org.apache.felix.webconsole-5.0.2 by Carsten Ziegeler on Wed May 1 18:01:58 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.base-5.1.8 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new be468b6ca5 [maven-release-plugin] prepare for next development iteration be468b6ca5 is described below commit be468b6ca54a18b35ed8d8ca8ca6b4137c155e67 Author: Carsten Ziegeler AuthorDate: Wed May 1 18:01:59 2024 +0200 [maven-release-plugin] prepare for next development iteration --- http/base/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/base/pom.xml b/http/base/pom.xml index fdc8eacc21..ac93e262a5 100644 --- a/http/base/pom.xml +++ b/http/base/pom.xml @@ -28,14 +28,14 @@ Apache Felix Http Base org.apache.felix.http.base -5.1.8 +5.1.9-SNAPSHOT jar scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.base-5.1.8 + HEAD
(felix-dev) branch master updated (e68fc3b77e -> 7c0076c67c)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from e68fc3b77e Prepare for next release of http base add 7c0076c67c [maven-release-plugin] prepare release org.apache.felix.http.base-5.1.8 No new revisions were added by this update. Summary of changes: http/base/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch master updated: Prepare for next release of http base
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new e68fc3b77e Prepare for next release of http base e68fc3b77e is described below commit e68fc3b77e87bf925be1e5ba8a77552f7c3ddd52 Author: Carsten Ziegeler AuthorDate: Wed May 1 18:01:27 2024 +0200 Prepare for next release of http base --- http/bridge/pom.xml | 2 +- http/itest/pom.xml | 4 ++-- http/jetty/pom.xml | 2 +- http/jetty12/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml index 736cf0a7a1..873e399f54 100644 --- a/http/bridge/pom.xml +++ b/http/bridge/pom.xml @@ -184,7 +184,7 @@ org.apache.felix org.apache.felix.http.base -5.1.6 +5.1.8 org.apache.felix diff --git a/http/itest/pom.xml b/http/itest/pom.xml index 3087e36d7a..5e3a70b81b 100644 --- a/http/itest/pom.xml +++ b/http/itest/pom.xml @@ -33,7 +33,7 @@ 11 2.1.0 -5.1.11-SNAPSHOT +5.1.13-SNAPSHOT org.apache.felix.http.jetty 4.13.1 2.6.14 @@ -45,7 +45,7 @@ 17 3.0.0 -1.0.3-SNAPSHOT +1.0.5-SNAPSHOT org.apache.felix.http.jetty12 diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 9a9fd003b2..566f6940b5 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -492,7 +492,7 @@ org.apache.felix org.apache.felix.http.base -5.1.7-SNAPSHOT +5.1.8 org.apache.felix diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 450d6ed274..f706750fb0 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -717,7 +717,7 @@ org.apache.felix org.apache.felix.http.base -5.1.7-SNAPSHOT +5.1.8 org.apache.felix
(felix-dev) branch master updated: Fix import (#313)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 69bb629081 Fix import (#313)
69bb629081 is described below
commit 69bb629081c8fc0cc3691ab24e70ed5261a4bb1a
Author: Paul
AuthorDate: Wed May 1 10:49:45 2024 +0200
Fix import (#313)
---
.../main/java/org/apache/felix/http/jetty/internal/JettyService.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index d9e4c3768a..6d56a55a9e 100644
---
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -53,7 +53,6 @@ import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
-import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -532,7 +531,7 @@ public final class JettyService
// set it on the shared servlet context once available
if (this.config.isUseJettyEE9Websocket() &&
isClassNameVisible("org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer"))
{
-String attribute =
JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE;
+String attribute =
org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE;
this.controller.setAttributeSharedServletContext(attribute,
context.getServletContext().getAttribute(attribute));
}
if (this.config.isUseJakartaEE9Websocket() &&
(felix-dev) branch master updated: Update README.md to include Jetty11 properties (#312)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 4bfe9aa4fc Update README.md to include Jetty11 properties (#312) 4bfe9aa4fc is described below commit 4bfe9aa4fcb9ddd47aa5870eb272f0e00a696b48 Author: Paul AuthorDate: Wed May 1 09:23:57 2024 +0200 Update README.md to include Jetty11 properties (#312) --- http/README.md | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/http/README.md b/http/README.md index 10f8fd4d87..621a358cc3 100644 --- a/http/README.md +++ b/http/README.md @@ -7,7 +7,8 @@ This is an implementation of the [R8.1 Whiteboard Specification for Jakarta Serv * Run either with Jetty (version 11 or 12) bundle or inside your own application server using the servlet bridge * [Felix HTTP Jetty 12](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty12) is the preferred bundle of choice as it supports JavaEE 8 and JakartaEE 8 with the `javax` namespace, JakartaEE 9/10/11/future versions with the `jakarta` namespace. * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/310), see example code [here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java). -* [Felix HTTP Jetty 11](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty) is the predecessor of the Jetty 12 bundle, which shipped with [Jetty 9.4.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/4.2.26) in the 4.x range, [Jetty 11.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/5.1.10) in the 5.x range. +* [Felix HTTP Jetty 11](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty) is the predecessor of the Jetty 12 bundle, which shipped with [Jetty 9.4.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/4.2.26) in the 4.x range, [Jetty 11.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/5.1.10) in the 5.x range. + * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/39), see example code [here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java). * Correctly versioned Servlet API. ## Installing @@ -387,7 +388,7 @@ this service is `"org.apache.felix.http"`. If you use both methods, Configuratio properties can be used (some legacy property names still exist but are not documented here on purpose). As properties might change over time, the actual list of properties can be found [here for the Jetty 12 bundle](https://github.com/apache/felix-dev/blob/master/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java) and [here for the Jetty 11 bundle](https://github.com/apache/felix-dev/blob/master/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/J [...] | Property | Description [...] -|--|--| +|--| [...] | `org.apache.felix.http.host` | Host name or IP Address of the interface to listen on. The default is `null` causing Jetty to listen on all
(felix-dev) branch master updated: FELIX-6692 jetty 12.x websockets new approach (based on #309) (#310)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 0444ac4f73 FELIX-6692 jetty 12.x websockets new approach (based on #309) (#310) 0444ac4f73 is described below commit 0444ac4f73a3cb876511b00a2df49e7f16efee0c Author: Paul AuthorDate: Wed May 1 09:04:05 2024 +0200 FELIX-6692 jetty 12.x websockets new approach (based on #309) (#310) * Revert "Add jetty websocket support to Jetty12 (#298)" This reverts commit 6d95c936dfc7767f1cea23d1db98a8c7d7810378. * FELIX-6692 Add Jetty WebSocket support for jetty 12.x - Apply 11.x approach to jetty12 bundle - Add two new classifiers 'with-jetty-ee10-websockets' and 'with-jakarta-ee10-websockets' to have a fat jar containing the appropriate websocket classes * Working example base on previous code. Do note that the workaround in FelixJettyWebSocketServlet are still required; the initialization code in the Jetty12 bundle doesn't seem to work * * Enable cross context support to allow WebSockets to be registered in Jetty 12. See https://github.com/jetty/jetty.project/blob/jetty-12.0.x/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java#L510 and https://github.com/jetty/jetty.project/issues/9774 * Add example based on registering the websocket to the main servlet context instead of the per-bundle one - * Added paxweb unit tests based on the Jetty11 work from #309 * Fix version * Fix message * Test casing * Update README.md * Make client optional * Add Jetty12 bundle to pom * Store the WebSocket container reference and set it on the shared servlet context once available This removes the need to set setCrossContextDispatchSupported, as the WS container is available on the proper servlet context itself * Update example to no longer use the root context. Removed other WebSocket example, as this is no longer needed with the new approach. Updated documentation. * Add servlet based example again, as it shows another example of how to register a WebSocket endpoint that abides to the servlet context it's registered to. * Rename class * Comment * Comments * Remove classloader code as it now also works without * Rename test class to EE10 * Small changes to README.md --- http/README.md | 123 +++ http/jetty12/pom.xml | 377 +++-- .../jetty/internal/ConfigMetaTypeProvider.java | 11 + .../felix/http/jetty/internal/JettyConfig.java | 22 ++ .../felix/http/jetty/internal/JettyService.java| 86 - .../http/jetty/it/AbstractJettyTestSupport.java| 185 ++ .../jetty/it/JakartaEE10SpecificWebsocketIT.java | 211 .../jetty/it/JettyEE10SpecificWebsocketIT.java | 209 .../jetty/it/MissingWebsocketDependenciesIT.java | 91 + http/pom.xml | 1 + http/samples/whiteboard/pom.xml| 20 +- .../felix/http/samples/whiteboard/Activator.java | 31 +- .../whiteboard/FelixJettyWebSocketServlet.java | 109 +- .../samples/whiteboard/TestWebSocketServlet.java | 32 +- ...t.java => TestWebSocketServletAlternative.java} | 24 +- 15 files changed, 1331 insertions(+), 201 deletions(-) diff --git a/http/README.md b/http/README.md index 875fcce940..10f8fd4d87 100644 --- a/http/README.md +++ b/http/README.md @@ -6,8 +6,8 @@ This is an implementation of the [R8.1 Whiteboard Specification for Jakarta Serv * Standard OSGi Http Whiteboard implementation * Run either with Jetty (version 11 or 12) bundle or inside your own application server using the servlet bridge * [Felix HTTP Jetty 12](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty12) is the preferred bundle of choice as it supports JavaEE 8 and JakartaEE 8 with the `javax` namespace, JakartaEE 9/10/11/future versions with the `jakarta` namespace. - * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/298), see example code [here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java). -* [Felix HTTP Jetty 11](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty) is the predecessor of the Jetty 12 bundle, which shipped with [Jetty 9.4.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/4.2.26) in the 4.x range, [Jetty 11.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/5.1.10
(felix-dev) branch master updated: FELIX-6692 Add Jetty WebSocket support for jetty 11.x (#309)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new a49d9f356b FELIX-6692 Add Jetty WebSocket support for jetty 11.x (#309)
a49d9f356b is described below
commit a49d9f356bac9a0ec87a32f5f9acff1716103ec4
Author: Eric Norman
AuthorDate: Wed May 1 00:02:55 2024 -0700
FELIX-6692 Add Jetty WebSocket support for jetty 11.x (#309)
* FELIX-6692 Add Jetty WebSocket support for jetty 11.x
* FELIX-6692 rename jakarta websocket enable config for future expansion
* FELIX-6692 add paxexam integration tests to verify the functionality
* FELIX-6692 cleanup
* FELIX-6692 merge changes from PR #310
Rename org.apache.felix.jetty.websocket.enable to
org.apache.felix.jetty.ee9.websocket.enable
Incorporate the changes for using maybeStoreWebSocketContainerAttributes
* FELIX-6692 renamed for consistency
---
.../http/base/internal/HttpServiceController.java | 9 +
.../internal/whiteboard/WhiteboardManager.java | 30 +++
http/jetty/pom.xml | 143 +-
.../jetty/internal/ConfigMetaTypeProvider.java | 12 ++
.../felix/http/jetty/internal/JettyConfig.java | 23 +++
.../felix/http/jetty/internal/JettyService.java| 83 +
.../http/jetty/it/AbstractJettyTestSupport.java| 185 ++
.../jetty/it/JakartaEE9SpecificWebsocketIT.java| 207 +
.../http/jetty/it/JettyEE9SpecificWebsocketIT.java | 207 +
.../jetty/it/MissingWebsocketDependenciesIT.java | 89 +
10 files changed, 983 insertions(+), 5 deletions(-)
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
index 570e9fe1ce..96439f5b1a 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
@@ -138,6 +138,15 @@ public final class HttpServiceController
this.dispatcher.setWhiteboardManager(this.whiteboardManager);
}
+/**
+ * Stores an attribute in the to be created shared servlet context.
+ * @param key attribute key
+ * @param value attribute value
+ */
+public void setAttributeSharedServletContext(String key, Object value) {
+this.whiteboardManager.setAttributeSharedServletContext(key, value);
+}
+
/**
* Stops the http and http whiteboard service.
*/
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
index f082122f7c..7d95499eb2 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
@@ -70,6 +70,7 @@ import
org.apache.felix.http.base.internal.whiteboard.tracker.ResourceTracker;
import
org.apache.felix.http.base.internal.whiteboard.tracker.ServletContextHelperTracker;
import org.apache.felix.http.base.internal.whiteboard.tracker.ServletTracker;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
@@ -118,6 +119,7 @@ public final class WhiteboardManager
private final FailureStateHandler failureStateHandler = new
FailureStateHandler();
private volatile ServletContext webContext;
+private volatile Map attributesForSharedContext = new
HashMap<>();
/**
* Create a new whiteboard http manager
@@ -203,6 +205,7 @@ public final class WhiteboardManager
this.contextMap.clear();
this.servicesMap.clear();
this.failureStateHandler.clear();
+this.attributesForSharedContext.clear();
this.registry.reset();
}
@@ -366,6 +369,8 @@ public final class WhiteboardManager
{
handlerList.add(handler);
Collections.sort(handlerList);
+setAttributes(handler.getSharedContext());
+
this.contextMap.put(info.getName(), handlerList);
// check for deactivate
@@ -402,6 +407,21 @@ public final class WhiteboardManager
return false;
}
+/**
+ * Set the stored attributes on the shared servlet context.
+ * @param context the shared servlet context
+ */
+private void setAttributes(@Nullable ServletContext context) {
+if (c
(felix-dev) branch master updated: FELIX-6698 Ability to configure URI Compliance mode (#308)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 76344a4f96 FELIX-6698 Ability to configure URI Compliance mode (#308)
76344a4f96 is described below
commit 76344a4f9681f46c7db43ef9b089f0fcbcbb3e79
Author: Paul
AuthorDate: Mon Apr 29 07:19:54 2024 +0200
FELIX-6698 Ability to configure URI Compliance mode (#308)
* FELIX-6698 Ability to configure URI Compliance mode
- Add `org.eclipse.jetty.UriComplianceMode` option
- Possible values are: DEFAULT, LEGACY, RFC3986, UNAMBIGUOUS, UNSAFE
- When UNSAFE or LEGACY is used, also apply workaround as suggested in
https://github.com/jetty/jetty.project/issues/11448#issuecomment-1969206031.
This is not Servlet API 6 compliant though, so use on your own risk.
* FELIX-6698 Ability to configure URI Compliance mode
- Add UNAMBIGUOUS
* Code review comments
* Code review comments
---
http/README.md | 1 +
.../jetty/internal/ConfigMetaTypeProvider.java | 6 ++
.../felix/http/jetty/internal/JettyConfig.java | 3 +++
.../felix/http/jetty/internal/JettyService.java| 23 --
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/http/README.md b/http/README.md
index be402ef77a..875fcce940 100644
--- a/http/README.md
+++ b/http/README.md
@@ -413,6 +413,7 @@ properties can be used (some legacy property names still
exist but are not docum
| `org.eclipse.jetty.servlet.SessionDomain` | Domain to set on the session
cookie. The default is `null`. |
| `org.eclipse.jetty.servlet.SessionPath` | The path to set on the session
cookie. The default is the configured session context path ("/"). |
| `org.eclipse.jetty.servlet.MaxAge` | The maximum age value to set on the
cookie. The default is "-1". |
+| `org.eclipse.jetty.UriComplianceMode` | The URI compliance mode to set. The
default is
[DEFAULT](https://eclipse.dev/jetty/javadoc/jetty-12/org/eclipse/jetty/http/UriCompliance.html#DEFAULT).
See
[documentation](https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-server-compliance-uri.)
and [possible
modes](https://github.com/jetty/jetty.project/blob/jetty-12.0.x/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.java#L186C107-L186C113).
|
| `org.apache.felix.proxy.load.balancer.connection.enable` | Set this to
`true` when running Felix HTTP behind a (offloading) proxy or load balancer
which rewrites the requests. The default is `false`. |
| `org.apache.felix.http.runtime.init.` | Properties starting with this prefix
are added as service registration properties to the HttpServiceRuntime service.
The prefix is removed for the property name. |
| `org.apache.felix.jetty.gziphandler.enable` | Whether the server should use
a server-wide gzip handler. Default is false. |
diff --git
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
index 03bd3cf02f..917e334132 100644
---
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
+++
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
@@ -284,6 +284,12 @@ class ConfigMetaTypeProvider implements MetaTypeProvider
false,
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JETTY_SESSION_COOKIE_SECURE)));
+adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JETTY_URI_COMPLIANCE_MODE,
+"Jetty URI compliance mode",
+"Jetty URI compliance mode (if not set, Jetty will configure a
default)",
+null,
+
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JETTY_URI_COMPLIANCE_MODE)));
+
adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JETTY_SERVLET_SESSION_ID_PATH_PARAMETER_NAME,
"Session Id path parameter",
"Defaults to jsessionid. If set to null or \"none\" no URL
rewriting will be done.",
diff --git
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
index ef336ea61c..05e6c7f941 100644
---
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
+++
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
@@ -166,6 +166,9 @@ public final class JettyConfig
/** Felix specific property to configure session max age */
public static final String FELIX_JETTY_SERVLET_SESSION_MAX_AGE =
"org.eclipse.jett
(felix-dev) branch master updated: Add reference to the WebSocket example code (#307)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new b6fff2adcc Add reference to the WebSocket example code (#307) b6fff2adcc is described below commit b6fff2adcc1afee039f0f60713032363144ad0fa Author: Paul AuthorDate: Fri Apr 19 07:56:25 2024 +0200 Add reference to the WebSocket example code (#307) --- http/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/README.md b/http/README.md index 0c009818ce..be402ef77a 100644 --- a/http/README.md +++ b/http/README.md @@ -6,7 +6,7 @@ This is an implementation of the [R8.1 Whiteboard Specification for Jakarta Serv * Standard OSGi Http Whiteboard implementation * Run either with Jetty (version 11 or 12) bundle or inside your own application server using the servlet bridge * [Felix HTTP Jetty 12](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty12) is the preferred bundle of choice as it supports JavaEE 8 and JakartaEE 8 with the `javax` namespace, JakartaEE 9/10/11/future versions with the `jakarta` namespace. - * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/298) + * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/298), see example code [here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java). * [Felix HTTP Jetty 11](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty) is the predecessor of the Jetty 12 bundle, which shipped with [Jetty 9.4.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/4.2.26) in the 4.x range, [Jetty 11.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/5.1.10) in the 5.x range. * Correctly versioned Servlet API.
(felix-dev) branch master updated: Add jetty websocket support to Jetty12 (#298)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 6d95c936df Add jetty websocket support to Jetty12 (#298)
6d95c936df is described below
commit 6d95c936dfc7767f1cea23d1db98a8c7d7810378
Author: Paul
AuthorDate: Thu Apr 18 14:27:47 2024 +0200
Add jetty websocket support to Jetty12 (#298)
* Update to latest Jetty 12.0.6 and add Jetty WebSocket bundles
This change makes it possible to use WebSockets via Felix HTTP Jetty 12
bundle.
There are still some strange things that need to be done to get it all to
work, but that's for a separate change request/bug report.
* Update pom.xml
* Remove websocket client dependency
* Remove tag
* Update to jetty 12.0.7
* Update pom.xml
Update to 12.0.8
* Add example of how to register a servlet that can upgrade to a Jetty
WebSocket
To try it out, deploy the whiteboard sample bundle to your OSGi environment
and execute the following snippet in your Chrome console.
```
const websocket = new
WebSocket("ws://localhost:8080/filtersample/websocket/example");
websocket.send("test");
```
* Send message for example as well
* Remove upgrade check, already done in super
* Extract abstract base class, which could be part of the Felix HTTP
Jetty12 bundle.
This abstracts away all the ugly code currently required to make websockets
work.
---
http/jetty12/pom.xml | 18 +++
http/samples/whiteboard/pom.xml| 34 +
.../felix/http/samples/whiteboard/Activator.java | 17 +++
.../whiteboard/FelixJettyWebSocketServlet.java | 145 +
.../samples/whiteboard/TestWebSocketServlet.java | 83
5 files changed, 297 insertions(+)
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index c67de9645b..0267fdb641 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -180,6 +180,9 @@
org.apache.commons.*
+jakarta.annotation.*;resolution:=optional,
+jakarta.transaction.*;resolution:=optional,
+org.objectweb.asm.*;resolution:=optional,
sun.misc;resolution:=optional,
sun.nio.ch;resolution:=optional,
javax.imageio;resolution:=optional,
@@ -363,6 +366,11 @@
jetty-ee10-servlet
${jetty.version}
+
+org.eclipse.jetty.ee10.websocket
+jetty-ee10-websocket-jetty-server
+${jetty.version}
+
org.eclipse.jetty
jetty-server
@@ -413,6 +421,16 @@
jetty-session
${jetty.version}
+
+ org.eclipse.jetty.websocket
+ jetty-websocket-jetty-api
+ ${jetty.version}
+
+
+ org.eclipse.jetty.websocket
+ jetty-websocket-jetty-server
+ ${jetty.version}
+
org.osgi
org.osgi.service.servlet
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index ef0862fca3..4f40bff0ce 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -32,6 +32,10 @@
3.0.0-SNAPSHOT
bundle
+
+12.0.8
+
+
scm:git:https://github.com/apache/felix-dev.git
scm:git:https://github.com/apache/felix-dev.git
@@ -89,5 +93,35 @@
2.0.0
provided
+
+org.apache.felix
+org.apache.felix.http.jetty12
+1.0.3-SNAPSHOT
+provided
+
+
+org.apache.felix
+org.apache.felix.http.api
+3.0.0
+provided
+
+
+org.eclipse.jetty.ee10.websocket
+jetty-ee10-websocket-jetty-server
+${jetty.version}
+provided
+
+
+org.eclipse.jetty.websocket
+jetty-websocket-jetty-api
+${jetty.version}
+provided
+
+
+org.eclipse.jetty.websocket
+jetty-websocket-jetty-server
+${jetty.version}
+provided
+
diff --git
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/Activator.java
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/Activator.java
index 5b92209475..8e4346641c 100644
---
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/Activator.java
(felix-dev) branch master updated: FELIX-6691 : Update to Jetty 12.0.8
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new e7fdbb7774 FELIX-6691 : Update to Jetty 12.0.8 e7fdbb7774 is described below commit e7fdbb7774392b76bab23c44200fec654f565cf0 Author: Carsten Ziegeler AuthorDate: Thu Apr 18 14:25:14 2024 +0200 FELIX-6691 : Update to Jetty 12.0.8 --- http/jetty12/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 02eeb1d911..c67de9645b 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -41,7 +41,7 @@ 17 -12.0.6 +12.0.8 true
(felix-dev) 02/02: FELIX-6696 : Resources content-type are no longer defined when using a whiteboard pattern
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit a8704fe1452629a6d03122925a469df426f2dcf2
Author: Carsten Ziegeler
AuthorDate: Sun Apr 14 15:56:30 2024 +0200
FELIX-6696 : Resources content-type are no longer defined when using a
whiteboard pattern
---
.../felix/http/base/internal/whiteboard/ResourceServlet.java | 7 ++-
http/jetty/pom.xml | 2 +-
http/jetty12/pom.xml | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ResourceServlet.java
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ResourceServlet.java
index 3d873feaa7..d2666061c7 100644
---
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ResourceServlet.java
+++
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ResourceServlet.java
@@ -24,6 +24,8 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
+import org.apache.felix.http.base.internal.util.MimeTypes;
+
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
@@ -64,7 +66,10 @@ public class ResourceServlet extends HttpServlet {
private void handle(final HttpServletRequest req, final
HttpServletResponse res, final URL url, final String resName)
throws IOException {
-final String contentType = getServletContext().getMimeType(resName);
+String contentType = getServletContext().getMimeType(resName);
+if (contentType == null) {
+contentType = MimeTypes.get().getByFile(resName);
+}
if (contentType != null) {
res.setContentType(contentType);
}
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index d66c20cb79..bb16c026a0 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -431,7 +431,7 @@
org.apache.felix
org.apache.felix.http.base
-5.1.6
+5.1.7-SNAPSHOT
org.apache.felix
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 6222fdbfc1..02eeb1d911 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -434,7 +434,7 @@
org.apache.felix
org.apache.felix.http.base
-5.1.6
+5.1.7-SNAPSHOT
org.apache.felix
(felix-dev) 01/02: Update webconsole readme
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 04bb0b75546242fa4f71d119a55c8d329586d445
Author: Carsten Ziegeler
AuthorDate: Sun Apr 14 15:22:58 2024 +0200
Update webconsole readme
---
webconsole/README.md | 9 +
1 file changed, 9 insertions(+)
diff --git a/webconsole/README.md b/webconsole/README.md
index 78c693f5a1..7a5250f71e 100644
--- a/webconsole/README.md
+++ b/webconsole/README.md
@@ -111,6 +111,13 @@ In this case the Configuration Manager displays the name
"myRealm, myClass" as d
## Releases
+### Changes in 5.0.2 (14/Apr/24)
+
+ Bug
+
+- [FELIX-6688](https://issues.apache.org/jira/browse/FELIX-6688) : Context
path of outer servlet container is not respected for authentication
+
+
### Changes in 5.0.0 (8/Jan/24)
New Feature
@@ -126,6 +133,8 @@ In this case the Configuration Manager displays the name
"myRealm, myClass" as d
- [FELIX-6654](https://issues.apache.org/jira/browse/FELIX-6654) : Remove
support for commons fileupload
+### Changes in 4.9.8 (14/Apr/24)
Bug
[...]
+
### Changes in 4.9.6 (7/Oct/23)
(felix-dev) branch master updated (598b9f0198 -> a8704fe145)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 598b9f0198 Update Felix HTTP documentation (#303) new 04bb0b7554 Update webconsole readme new a8704fe145 FELIX-6696 : Resources content-type are no longer defined when using a whiteboard pattern The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../felix/http/base/internal/whiteboard/ResourceServlet.java | 7 ++- http/jetty/pom.xml | 2 +- http/jetty12/pom.xml | 2 +- webconsole/README.md | 9 + 4 files changed, 17 insertions(+), 3 deletions(-)
(felix-dev) branch master updated: Update Felix HTTP documentation (#303)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 598b9f0198 Update Felix HTTP documentation (#303) 598b9f0198 is described below commit 598b9f019803216059fad3b4ecd2d964a042b49a Author: Paul AuthorDate: Sun Apr 14 15:27:37 2024 +0200 Update Felix HTTP documentation (#303) * Update README.md Add information about jetty bundles and ee support. * Update README.md - Removed cometd, last released version is from 2014 and nowadays, websockets should be used instead - update bundle versions - add jetty 12 and wrappers bundles - update jetty properties - update code examples - update servlet, filter properties. Add OSGi reference links for full documentation. * Update README.md - add links to felix bundles * Update README.md Add EoL link * Update README.md * Update README.md * Update README.md Filter order * Update README.md Fix link to WS. * Update README.md Update HTTP/2 configuration for Jetty 12 bundle. * Update README.md * Update README.md Add links to bundles. * Update README.md Update links * Update README.md * Update README.md * maintenance/SSL-trust-all - Add option to trust all SSL certificates, regardless of keystore configuration (ignored when set to true) * maintenance/SSL-trust-all - Fix comment * Add reference to the light jar. * maintenance/SSL-trust-all - Set trust all, while keeping other configuration options intact * Revert "maintenance/SSL-trust-all" This reverts commit 51a5c4376a46da55e5a5118e6553e2e6fd8d5d0d. * Revert "maintenance/SSL-trust-all" This reverts commit ab19c6710ef8dd7e04a8f7cb79aee0a92854c9c6. * Revert "maintenance/SSL-trust-all" This reverts commit df0a5f76804d2fa5ec3dd47dbe8ef08351dacb95. * Update README.md Add maven light * Update README.md Update links to 8.1 --- http/README.md | 162 ++--- 1 file changed, 96 insertions(+), 66 deletions(-) diff --git a/http/README.md b/http/README.md index a49290a99d..0c009818ce 100644 --- a/http/README.md +++ b/http/README.md @@ -1,44 +1,74 @@ # Apache Felix HTTP Service -This is an implementation of the [HTTP Whiteboard Service as described in chapter 140](https://osgi.org/specification/osgi.cmpn/7.0.0/service.http.whiteboard.html) of the OSGi Compendium (R7) in combination with an implementation of the [HTTP Service Specification as described in chapter 102](https://osgi.org/specification/osgi.cmpn/7.0.0/service.http.html) of the OSGi Compendium. The goal is to provide a standard and simplified way to register servlets, listeners, filters, and resources [...] +This is an implementation of the [R8.1 Whiteboard Specification for Jakarta Servlet](https://docs.osgi.org/specification/osgi.cmpn/8.1.0/service.servlet.html), [HTTP Whiteboard Service as described in chapter 140](https://osgi.org/specification/osgi.cmpn/7.0.0/service.http.whiteboard.html) of the OSGi Compendium (R7) in combination with an implementation of the [HTTP Service Specification as described in chapter 102](https://osgi.org/specification/osgi.cmpn/7.0.0/service.http.html) of th [...] * Standard OSGi Http Service implementation * Standard OSGi Http Whiteboard implementation - * Run either with Jetty or inside your own application server using the servlet bridge + * Run either with Jetty (version 11 or 12) bundle or inside your own application server using the servlet bridge +* [Felix HTTP Jetty 12](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty12) is the preferred bundle of choice as it supports JavaEE 8 and JakartaEE 8 with the `javax` namespace, JakartaEE 9/10/11/future versions with the `jakarta` namespace. + * [Jetty WebSocket support](https://github.com/apache/felix-dev/pull/298) +* [Felix HTTP Jetty 11](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty) is the predecessor of the Jetty 12 bundle, which shipped with [Jetty 9.4.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/4.2.26) in the 4.x range, [Jetty 11.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/5.1.10) in the 5.x range. * Correctly versioned Servlet API. ## Installing The Apache Felix HTTP Service project includes several bundles. - * `org.apache.felix.http.servlet-api` - Provides the Servlet API (versions 2.6, 3.0, and 3.1 of the Servlet specification) -
(felix-dev) branch http-4.x updated: Update webconsole readme
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch http-4.x
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/http-4.x by this push:
new 0d0d3eb36e Update webconsole readme
0d0d3eb36e is described below
commit 0d0d3eb36e7826ef7f2e88484c2fe9e7085289e4
Author: Carsten Ziegeler
AuthorDate: Sun Apr 14 15:23:29 2024 +0200
Update webconsole readme
---
webconsole/README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/webconsole/README.md b/webconsole/README.md
index bc46ab0391..0f821dca28 100644
--- a/webconsole/README.md
+++ b/webconsole/README.md
@@ -9,6 +9,9 @@ For documentation have a look at [The Apache Felix
Website](https://felix.apache
## Release Notes
+### Changes in 4.9.8 (14/Apr/24)
Bug
[...]
+
+
### Changes in 4.9.6 (7/Oct/23)
(felix-antora-site) branch main updated: Webconsole 4.9.8 and 5.0.2 releases
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/felix-antora-site.git The following commit(s) were added to refs/heads/main by this push: new a7735c08 Webconsole 4.9.8 and 5.0.2 releases a7735c08 is described below commit a7735c0849afa37ab80dd2ad7f37b95dde3abc3c Author: Carsten Ziegeler AuthorDate: Sun Apr 14 15:20:48 2024 +0200 Webconsole 4.9.8 and 5.0.2 releases --- downloads.list | 2 +- modules/ROOT/examples/downloads.yml | 2 +- modules/ROOT/pages/news.adoc| 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/downloads.list b/downloads.list index ae450072..6f62a2df 100644 --- a/downloads.list +++ b/downloads.list @@ -112,7 +112,7 @@ User Admin |org.apache.felix.useradmin|1.0.4|project||- User Admin File-based store|org.apache.felix.useradmin.filestore|1.0.2|project||- User Admin MongoDB-based store|org.apache.felix.useradmin.mongodb|1.0.1|project||- Utils|org.apache.felix.utils|1.11.0|||doc/changelog.txt -Web Console|org.apache.felix.webconsole|5.0.0 +Web Console|org.apache.felix.webconsole|5.0.2 Web Console DS Plugin|org.apache.felix.webconsole.plugins.ds|2.3.0 Web Console Event Admin Plugin|org.apache.felix.webconsole.plugins.event|1.2.0 Web Console Memory Usage Plugin|org.apache.felix.webconsole.plugins.memoryusage|1.1.0 diff --git a/modules/ROOT/examples/downloads.yml b/modules/ROOT/examples/downloads.yml index 23cbcd78..c9f8d1cc 100644 --- a/modules/ROOT/examples/downloads.yml +++ b/modules/ROOT/examples/downloads.yml @@ -351,7 +351,7 @@ subprojects: - title: Web Console artifactId: org.apache.felix.webconsole -version: 5.0.0 +version: 5.0.2 source_classifier: source-release changelog: felix-dev/blob/master/webconsole/changelog.txt diff --git a/modules/ROOT/pages/news.adoc b/modules/ROOT/pages/news.adoc index 6ce76882..c5497a14 100644 --- a/modules/ROOT/pages/news.adoc +++ b/modules/ROOT/pages/news.adoc @@ -1,5 +1,6 @@ = News +* Apache Felix Webconsole 5.0.2 and 4.9.8 (April, 14th) * Apache Felix Http Jetty 5.1.10 and Http Jetty 4.2.26 (March, 4th) * Apache Felix Http Jetty 5.1.8, Http Jetty12 1.0.2, Http Jetty 4.2.24, Http Base 5.1.6, Http Base 4.2.14, Http Bridge 5.1.6 and Http Bridge 4.2.18 (January 26th) * Apache Felix Webconsole 5.0.0 (January 8th, 2024)
svn commit: r68487 - /release/felix/
Author: cziegeler Date: Sun Apr 14 13:17:59 2024 New Revision: 68487 Log: Webconsole 4.9.8 and 5.0.2 Added: release/felix/org.apache.felix.webconsole-4.9.8-all.jar (with props) release/felix/org.apache.felix.webconsole-4.9.8-all.jar.asc release/felix/org.apache.felix.webconsole-4.9.8-all.jar.sha1 release/felix/org.apache.felix.webconsole-4.9.8-all.jar.sha512 release/felix/org.apache.felix.webconsole-4.9.8-debug.jar (with props) release/felix/org.apache.felix.webconsole-4.9.8-debug.jar.asc release/felix/org.apache.felix.webconsole-4.9.8-debug.jar.sha1 release/felix/org.apache.felix.webconsole-4.9.8-debug.jar.sha512 release/felix/org.apache.felix.webconsole-4.9.8-javadoc.jar (with props) release/felix/org.apache.felix.webconsole-4.9.8-javadoc.jar.asc release/felix/org.apache.felix.webconsole-4.9.8-javadoc.jar.sha1 release/felix/org.apache.felix.webconsole-4.9.8-javadoc.jar.sha512 release/felix/org.apache.felix.webconsole-4.9.8-source-release.tar.gz (with props) release/felix/org.apache.felix.webconsole-4.9.8-source-release.tar.gz.asc release/felix/org.apache.felix.webconsole-4.9.8-source-release.tar.gz.sha1 release/felix/org.apache.felix.webconsole-4.9.8-source-release.tar.gz.sha512 release/felix/org.apache.felix.webconsole-4.9.8-source-release.zip (with props) release/felix/org.apache.felix.webconsole-4.9.8-source-release.zip.asc release/felix/org.apache.felix.webconsole-4.9.8-source-release.zip.sha1 release/felix/org.apache.felix.webconsole-4.9.8-source-release.zip.sha512 release/felix/org.apache.felix.webconsole-4.9.8-sources.jar (with props) release/felix/org.apache.felix.webconsole-4.9.8-sources.jar.asc release/felix/org.apache.felix.webconsole-4.9.8-sources.jar.sha1 release/felix/org.apache.felix.webconsole-4.9.8-sources.jar.sha512 release/felix/org.apache.felix.webconsole-4.9.8.jar (with props) release/felix/org.apache.felix.webconsole-4.9.8.jar.asc release/felix/org.apache.felix.webconsole-4.9.8.jar.sha1 release/felix/org.apache.felix.webconsole-4.9.8.jar.sha512 release/felix/org.apache.felix.webconsole-4.9.8.pom release/felix/org.apache.felix.webconsole-4.9.8.pom.asc release/felix/org.apache.felix.webconsole-4.9.8.pom.sha1 release/felix/org.apache.felix.webconsole-4.9.8.pom.sha512 release/felix/org.apache.felix.webconsole-5.0.2-javadoc.jar (with props) release/felix/org.apache.felix.webconsole-5.0.2-javadoc.jar.asc release/felix/org.apache.felix.webconsole-5.0.2-javadoc.jar.sha1 release/felix/org.apache.felix.webconsole-5.0.2-javadoc.jar.sha512 release/felix/org.apache.felix.webconsole-5.0.2-source-release.tar.gz (with props) release/felix/org.apache.felix.webconsole-5.0.2-source-release.tar.gz.asc release/felix/org.apache.felix.webconsole-5.0.2-source-release.tar.gz.sha1 release/felix/org.apache.felix.webconsole-5.0.2-source-release.tar.gz.sha512 release/felix/org.apache.felix.webconsole-5.0.2-source-release.zip (with props) release/felix/org.apache.felix.webconsole-5.0.2-source-release.zip.asc release/felix/org.apache.felix.webconsole-5.0.2-source-release.zip.sha1 release/felix/org.apache.felix.webconsole-5.0.2-source-release.zip.sha512 release/felix/org.apache.felix.webconsole-5.0.2-sources.jar (with props) release/felix/org.apache.felix.webconsole-5.0.2-sources.jar.asc release/felix/org.apache.felix.webconsole-5.0.2-sources.jar.sha1 release/felix/org.apache.felix.webconsole-5.0.2-sources.jar.sha512 release/felix/org.apache.felix.webconsole-5.0.2.jar (with props) release/felix/org.apache.felix.webconsole-5.0.2.jar.asc release/felix/org.apache.felix.webconsole-5.0.2.jar.sha1 release/felix/org.apache.felix.webconsole-5.0.2.jar.sha512 release/felix/org.apache.felix.webconsole-5.0.2.pom release/felix/org.apache.felix.webconsole-5.0.2.pom.asc release/felix/org.apache.felix.webconsole-5.0.2.pom.sha1 release/felix/org.apache.felix.webconsole-5.0.2.pom.sha512 Removed: release/felix/org.apache.felix.webconsole-5.0.0-javadoc.jar release/felix/org.apache.felix.webconsole-5.0.0-javadoc.jar.asc release/felix/org.apache.felix.webconsole-5.0.0-javadoc.jar.sha1 release/felix/org.apache.felix.webconsole-5.0.0-javadoc.jar.sha512 release/felix/org.apache.felix.webconsole-5.0.0-source-release.tar.gz release/felix/org.apache.felix.webconsole-5.0.0-source-release.tar.gz.asc release/felix/org.apache.felix.webconsole-5.0.0-source-release.tar.gz.sha1 release/felix/org.apache.felix.webconsole-5.0.0-source-release.tar.gz.sha512 release/felix/org.apache.felix.webconsole-5.0.0-source-release.zip release/felix/org.apache.felix.webconsole-5.0.0-source-release.zip.asc release/felix/org.apache.felix.webconsole-5.0.0-source-release.zip.sha1 release/felix/org.apache.felix.webconsole-5.0.0-source-release.zip.sha512 release/felix
(felix-dev) branch master updated: Remove mentioning of JSON license
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 148fcbae4d Remove mentioning of JSON license 148fcbae4d is described below commit 148fcbae4d2d68cc82290ebbdd38efcacd3e26ec Author: Carsten Ziegeler AuthorDate: Fri Apr 12 14:56:37 2024 +0200 Remove mentioning of JSON license --- webconsole/src/main/appended-resources/META-INF/DEPENDENCIES | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES b/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES index 45b9d47cb5..e5666a764d 100644 --- a/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES +++ b/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES @@ -57,7 +57,6 @@ Licensed under the Apache License 2.0. III. License Summary - Apache License 2.0 -- JSON License - MIT License - Creative Commons Attribution 2.5 License -- Tanner Hildebrand's License \ No newline at end of file +- Tanner Hildebrand's License
(felix-dev) branch http-4.x updated: Remove mentioning of JSON license
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/http-4.x by this push: new 862c77e784 Remove mentioning of JSON license 862c77e784 is described below commit 862c77e784355351312595fbc910d111d5a456b9 Author: Carsten Ziegeler AuthorDate: Fri Apr 12 14:54:15 2024 +0200 Remove mentioning of JSON license --- .../main/appended-resources/META-INF/DEPENDENCIES | 3 +-- .../src/main/appended-resources/META-INF/LICENSE | 23 -- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES b/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES index 45b9d47cb5..e5666a764d 100644 --- a/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES +++ b/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES @@ -57,7 +57,6 @@ Licensed under the Apache License 2.0. III. License Summary - Apache License 2.0 -- JSON License - MIT License - Creative Commons Attribution 2.5 License -- Tanner Hildebrand's License \ No newline at end of file +- Tanner Hildebrand's License diff --git a/webconsole/src/main/appended-resources/META-INF/LICENSE b/webconsole/src/main/appended-resources/META-INF/LICENSE index e790e598f1..d0a991b84e 100644 --- a/webconsole/src/main/appended-resources/META-INF/LICENSE +++ b/webconsole/src/main/appended-resources/META-INF/LICENSE @@ -406,26 +406,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -For the org.json classes (applies if org.json classes are embedded): - -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file
(felix-dev) branch master updated: cleanup Manifest and JSON - LICENSE (#304)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new dd17a96ea9 cleanup Manifest and JSON - LICENSE (#304)
dd17a96ea9 is described below
commit dd17a96ea9e21fbe000848f96aabcd347f938b11
Author: Stefan Bischof
AuthorDate: Fri Apr 12 06:37:15 2024 +0200
cleanup Manifest and JSON - LICENSE (#304)
* rm Include-Resource from MANIFEST
was:
Include-Resource: META-INF/DEPENDENCIES=target/maven-shared-archive-re
sources/META-INF/DEPENDENCIES,META-INF/LICENSE=target/maven-shared-ar
chive-resources/META-INF/LICENSE,META-INF/NOTICE=target/maven-shared-
archive-resources/META-INF/NOTICE
* [webconsole] rm json part
came in commit a159abb39424f0a6c44586ef7f946378fa39db17
not relevant today
---
http/jetty12/pom.xml | 4 ++--
.../src/main/appended-resources/META-INF/LICENSE | 25 --
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 3adb09a0d4..6222fdbfc1 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -228,7 +228,7 @@
{maven-resources},${project.build.directory}/serviceloader-resources
<_removeheaders>
-Private-Package,Conditional-Package
+
Private-Package,Conditional-Package,Include-Resource
@@ -311,7 +311,7 @@
{maven-resources}
<_removeheaders>
-
X-Jetty-Version,Private-Package,Conditional-Package
+
X-Jetty-Version,Private-Package,Conditional-Package,Include-Resource
diff --git a/webconsole/src/main/appended-resources/META-INF/LICENSE
b/webconsole/src/main/appended-resources/META-INF/LICENSE
index e790e598f1..cb72821b48 100644
--- a/webconsole/src/main/appended-resources/META-INF/LICENSE
+++ b/webconsole/src/main/appended-resources/META-INF/LICENSE
@@ -404,28 +404,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-
-
-For the org.json classes (applies if org.json classes are embedded):
-
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 6ed1ee107c [maven-release-plugin] prepare for next development iteration 6ed1ee107c is described below commit 6ed1ee107c3e61093301358d76d7a1b2ff656705 Author: Carsten Ziegeler AuthorDate: Thu Apr 11 06:06:15 2024 +0200 [maven-release-plugin] prepare for next development iteration --- webconsole/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webconsole/pom.xml b/webconsole/pom.xml index 76847540a0..32e9056afb 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -28,7 +28,7 @@ org.apache.felix.webconsole bundle -5.0.2 +5.0.3-SNAPSHOT Apache Felix Web Management Console @@ -46,7 +46,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.webconsole-5.0.2 + HEAD
(felix-dev) annotated tag org.apache.felix.webconsole-5.0.2 updated (bcc09cdab8 -> 148a269aee)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.webconsole-5.0.2 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.webconsole-5.0.2 was modified! *** from bcc09cdab8 (commit) to 148a269aee (tag) tagging bcc09cdab86a18bec06cc256f266085e450b1c0f (commit) replaces org.apache.felix.http.jetty-5.1.10 by Carsten Ziegeler on Thu Apr 11 06:06:14 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.webconsole-5.0.2 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (f29d8a8a4d -> bcc09cdab8)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from f29d8a8a4d FELIX-6688 - Context path of outer servlet container is not respected for authentication (#306) add bcc09cdab8 [maven-release-plugin] prepare release org.apache.felix.webconsole-5.0.2 No new revisions were added by this update. Summary of changes: webconsole/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) annotated tag org.apache.felix.webconsole-4.9.8 updated (3b122aedf5 -> 1b15b78e37)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.webconsole-4.9.8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.webconsole-4.9.8 was modified! *** from 3b122aedf5 (commit) to 1b15b78e37 (tag) tagging 3b122aedf53a7e61844d72970b028f23a3440fa6 (commit) replaces org.apache.felix.http.jetty-4.2.26 by Carsten Ziegeler on Thu Apr 11 06:04:28 2024 +0200 - Log - [maven-release-plugin] copy for tag org.apache.felix.webconsole-4.9.8 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch http-4.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/http-4.x by this push: new 2ba9838fe6 [maven-release-plugin] prepare for next development iteration 2ba9838fe6 is described below commit 2ba9838fe605884cd16959ffd5363ddb6570cef3 Author: Carsten Ziegeler AuthorDate: Thu Apr 11 06:04:29 2024 +0200 [maven-release-plugin] prepare for next development iteration --- webconsole/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webconsole/pom.xml b/webconsole/pom.xml index b3a29b..171768839c 100644 --- a/webconsole/pom.xml +++ b/webconsole/pom.xml @@ -28,7 +28,7 @@ org.apache.felix.webconsole bundle -4.9.8 +4.9.9-SNAPSHOT Apache Felix Web Management Console @@ -52,7 +52,7 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.webconsole-4.9.8 + HEAD
(felix-dev) branch http-4.x updated (47a95d2b63 -> 3b122aedf5)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 47a95d2b63 FELIX-6688 - Context path of outer servlet container is not respected… (#305) add 3b122aedf5 [maven-release-plugin] prepare release org.apache.felix.webconsole-4.9.8 No new revisions were added by this update. Summary of changes: webconsole/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch http-4.x updated: FELIX-6688 - Context path of outer servlet container is not respected… (#305)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch http-4.x
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/http-4.x by this push:
new 47a95d2b63 FELIX-6688 - Context path of outer servlet container is not
respected… (#305)
47a95d2b63 is described below
commit 47a95d2b638c2b2142709f6f5b5fc1adf291b845
Author: Sagar Miglani <85228812+sagarmigl...@users.noreply.github.com>
AuthorDate: Wed Apr 10 12:31:46 2024 +0530
FELIX-6688 - Context path of outer servlet container is not respected…
(#305)
* FELIX-6688 - Context path of outer servlet container is not respected for
authentication
* FELIX-6688 - Context path of outer servlet container is not respected for
authentication
-
Co-authored-by: Sagar Miglani
---
.../webconsole/internal/servlet/OsgiManager.java | 2 +-
.../internal/servlet/OsgiManagerHttpContext.java | 13 ++--
.../servlet/OsgiManagerHttpContextTest.java| 37 --
3 files changed, 46 insertions(+), 6 deletions(-)
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
index d1292ed1ec..7d8e2d9360 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
@@ -979,7 +979,7 @@ public class OsgiManager extends GenericServlet {
if (this.servletContextRegistration == null) {
final ServletContextHelper httpContext = new
OsgiManagerHttpContext(this.bundleContext.getBundle(),
-securityProviderTracker, realm);
+securityProviderTracker, realm, this.webManagerRoot);
final Dictionary props = new Hashtable<>();
if (httpServiceSelector != null) {
props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_TARGET,
httpServiceSelector);
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
index b12c9793b9..2fe9c2e654 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
@@ -44,13 +44,16 @@ final class OsgiManagerHttpContext extends
ServletContextHelper {
private final Bundle bundle;
+private final String webManagerRoot;
+
OsgiManagerHttpContext(final Bundle webConsoleBundle,
final ServiceTracker tracker,
-final String realm) {
+final String realm, final String webManagerRoot) {
super(webConsoleBundle);
this.tracker = tracker;
this.realm = realm;
this.bundle = webConsoleBundle;
+this.webManagerRoot = webManagerRoot;
}
public URL getResource(final String name) {
@@ -63,19 +66,23 @@ final class OsgiManagerHttpContext extends
ServletContextHelper {
@Override
public boolean handleSecurity( final HttpServletRequest r, final
HttpServletResponse response ) {
+
final WebConsoleSecurityProvider provider = tracker.getService();
+final String webManagerRoot = this.webManagerRoot;
// for compatibility we have to adjust a few methods on the request
final HttpServletRequest request = new HttpServletRequestWrapper(r) {
@Override
public String getContextPath() {
-return "";
+int managerRootIndex =
r.getContextPath().lastIndexOf(webManagerRoot);
+return r.getContextPath().substring(0, managerRootIndex);
}
@Override
public String getServletPath() {
-return r.getContextPath();
+int managerRootIndex =
r.getContextPath().lastIndexOf(webManagerRoot);
+return r.getContextPath().substring(managerRootIndex);
}
@Override
diff --git
a/webconsole/src/test/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContextTest.java
b/webconsole/src/test/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContextTest.java
index 6b9a6c7848..9721a47600 100644
---
a/webconsole/src/test/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContextTest.java
+++
b/webconsole/src/test/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContextTest.java
@@ -19,11 +19,16 @@
package org.apache.felix.webconsole.internal.servlet;
import org.apache.felix.webconsole.WebConsoleSec
(felix-dev) branch master updated: FELIX-6688 - Context path of outer servlet container is not respected for authentication (#306)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new f29d8a8a4d FELIX-6688 - Context path of outer servlet container is not
respected for authentication (#306)
f29d8a8a4d is described below
commit f29d8a8a4d1b9b8f4f4fec771207e34c4462603c
Author: Sagar Miglani <85228812+sagarmigl...@users.noreply.github.com>
AuthorDate: Wed Apr 10 12:31:10 2024 +0530
FELIX-6688 - Context path of outer servlet container is not respected for
authentication (#306)
Co-authored-by: Sagar Miglani
---
.../webconsole/internal/servlet/OsgiManager.java | 2 +-
.../internal/servlet/OsgiManagerHttpContext.java | 11 ++--
.../servlet/OsgiManagerHttpContextTest.java| 62 ++
3 files changed, 71 insertions(+), 4 deletions(-)
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
index 966e588c44..4f8b9fcf9c 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
@@ -791,7 +791,7 @@ public class OsgiManager extends HttpServlet {
}
if (this.servletContextRegistration == null) {
-final ServletContextHelper httpContext = new
OsgiManagerHttpContext(this.bundleContext.getBundle(), securityProviderTracker);
+final ServletContextHelper httpContext = new
OsgiManagerHttpContext(this.bundleContext.getBundle(), securityProviderTracker,
this.webManagerRoot);
final Dictionary props = new Hashtable<>();
if (httpServiceSelector != null) {
props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_TARGET,
httpServiceSelector);
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
index bbf104baa4..c5fcc5f95b 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContext.java
@@ -35,11 +35,14 @@ final class OsgiManagerHttpContext extends
ServletContextHelper {
private final Bundle bundle;
+private final String webManagerRoot;
+
OsgiManagerHttpContext(final Bundle webConsoleBundle,
-final ServiceTracker tracker) {
+final ServiceTracker tracker,
final String webManagerRoot) {
super(webConsoleBundle);
this.tracker = tracker;
this.bundle = webConsoleBundle;
+this.webManagerRoot = webManagerRoot;
}
public URL getResource(final String name) {
@@ -60,12 +63,14 @@ final class OsgiManagerHttpContext extends
ServletContextHelper {
@Override
public String getContextPath() {
-return "";
+int managerRootIndex =
r.getContextPath().lastIndexOf(webManagerRoot);
+return r.getContextPath().substring(0, managerRootIndex);
}
@Override
public String getServletPath() {
-return r.getContextPath();
+int managerRootIndex =
r.getContextPath().lastIndexOf(webManagerRoot);
+return r.getContextPath().substring(managerRootIndex);
}
@Override
diff --git
a/webconsole/src/test/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContextTest.java
b/webconsole/src/test/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContextTest.java
new file mode 100644
index 00..cb40c490bf
--- /dev/null
+++
b/webconsole/src/test/java/org/apache/felix/webconsole/internal/servlet/OsgiManagerHttpContextTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limita
(felix-antora-site) branch main updated: Http Jetty 5.1.10 and 4.2.26
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/felix-antora-site.git The following commit(s) were added to refs/heads/main by this push: new 82b6d2e3 Http Jetty 5.1.10 and 4.2.26 82b6d2e3 is described below commit 82b6d2e3d95cf2a4694c70b6749493c9f8993a46 Author: Carsten Ziegeler AuthorDate: Mon Mar 4 07:33:36 2024 +0100 Http Jetty 5.1.10 and 4.2.26 --- downloads.list | 2 +- modules/ROOT/examples/downloads.yml | 2 +- modules/ROOT/pages/news.adoc| 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/downloads.list b/downloads.list index e08838e1..ae450072 100644 --- a/downloads.list +++ b/downloads.list @@ -57,7 +57,7 @@ Health Check General Checks|org.apache.felix.healthcheck.generalchecks|3.0.8|pro Health Check Webconsole Plugin|org.apache.felix.healthcheck.webconsoleplugin|2.2.0|project||- HTTP Service Base|org.apache.felix.http.base|5.1.6 HTTP Service Bridge|org.apache.felix.http.bridge|5.1.6 -HTTP Service Jetty|org.apache.felix.http.jetty|5.1.8 +HTTP Service Jetty|org.apache.felix.http.jetty|5.1.10 HTTP Service Proxy|org.apache.felix.http.proxy|3.0.6 HTTP Service SSL filter|org.apache.felix.http.sslfilter|2.0.2 HTTP Service Whiteboard|org.apache.felix.http.whiteboard|4.0.0 diff --git a/modules/ROOT/examples/downloads.yml b/modules/ROOT/examples/downloads.yml index 77e8e35d..23cbcd78 100644 --- a/modules/ROOT/examples/downloads.yml +++ b/modules/ROOT/examples/downloads.yml @@ -185,7 +185,7 @@ subprojects: - title: HTTP Service Jetty artifactId: org.apache.felix.http.jetty -version: 5.1.8 +version: 5.1.10 source_classifier: source-release changelog: false diff --git a/modules/ROOT/pages/news.adoc b/modules/ROOT/pages/news.adoc index c9b8357f..6ce76882 100644 --- a/modules/ROOT/pages/news.adoc +++ b/modules/ROOT/pages/news.adoc @@ -1,6 +1,7 @@ = News -* Apache Felix Httpy Jetty 5.1.8, Http Jetty12 1.0.2, Http Jetty 4.2.24, Http Base 5.1.6, Http Base 4.2.14, Http Bridge 5.1.6 and Http Bridge 4.2.18 (January 26th) +* Apache Felix Http Jetty 5.1.10 and Http Jetty 4.2.26 (March, 4th) +* Apache Felix Http Jetty 5.1.8, Http Jetty12 1.0.2, Http Jetty 4.2.24, Http Base 5.1.6, Http Base 4.2.14, Http Bridge 5.1.6 and Http Bridge 4.2.18 (January 26th) * Apache Felix Webconsole 5.0.0 (January 8th, 2024) * Apache Felix Http Jetty 5.1.6, Http Jetty12 1.0.0, Http Jetty 4.2.22, Http Base 5.1.4, Http Bridge 5.1.4, Http Base 4.2.12, Http Bridge 4.2.16 (December 11th, 2023) * Apache Felix iPOJO Manipulator 1.13.0 (December 8th, 2023)
svn commit: r67692 [1/2] - /release/felix/
Author: cziegeler Date: Mon Mar 4 06:30:32 2024 New Revision: 67692 Log: Http Jetty 4.2.26 and 5.1.10 Added: release/felix/org.apache.felix.http.jetty-4.2.26-javadoc.jar (with props) release/felix/org.apache.felix.http.jetty-4.2.26-javadoc.jar.asc release/felix/org.apache.felix.http.jetty-4.2.26-javadoc.jar.sha1 release/felix/org.apache.felix.http.jetty-4.2.26-javadoc.jar.sha512 release/felix/org.apache.felix.http.jetty-4.2.26-light.jar (with props) release/felix/org.apache.felix.http.jetty-4.2.26-light.jar.asc release/felix/org.apache.felix.http.jetty-4.2.26-light.jar.sha1 release/felix/org.apache.felix.http.jetty-4.2.26-light.jar.sha512 release/felix/org.apache.felix.http.jetty-4.2.26-source-release.tar.gz (with props) release/felix/org.apache.felix.http.jetty-4.2.26-source-release.tar.gz.asc release/felix/org.apache.felix.http.jetty-4.2.26-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.jetty-4.2.26-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.jetty-4.2.26-source-release.zip (with props) release/felix/org.apache.felix.http.jetty-4.2.26-source-release.zip.asc release/felix/org.apache.felix.http.jetty-4.2.26-source-release.zip.sha1 release/felix/org.apache.felix.http.jetty-4.2.26-source-release.zip.sha512 release/felix/org.apache.felix.http.jetty-4.2.26-sources.jar (with props) release/felix/org.apache.felix.http.jetty-4.2.26-sources.jar.asc release/felix/org.apache.felix.http.jetty-4.2.26-sources.jar.sha1 release/felix/org.apache.felix.http.jetty-4.2.26-sources.jar.sha512 release/felix/org.apache.felix.http.jetty-4.2.26.jar (with props) release/felix/org.apache.felix.http.jetty-4.2.26.jar.asc release/felix/org.apache.felix.http.jetty-4.2.26.jar.sha1 release/felix/org.apache.felix.http.jetty-4.2.26.jar.sha512 release/felix/org.apache.felix.http.jetty-4.2.26.pom release/felix/org.apache.felix.http.jetty-4.2.26.pom.asc release/felix/org.apache.felix.http.jetty-4.2.26.pom.sha1 release/felix/org.apache.felix.http.jetty-4.2.26.pom.sha512 release/felix/org.apache.felix.http.jetty-5.1.10-javadoc.jar (with props) release/felix/org.apache.felix.http.jetty-5.1.10-javadoc.jar.asc release/felix/org.apache.felix.http.jetty-5.1.10-javadoc.jar.sha1 release/felix/org.apache.felix.http.jetty-5.1.10-javadoc.jar.sha512 release/felix/org.apache.felix.http.jetty-5.1.10-light.jar (with props) release/felix/org.apache.felix.http.jetty-5.1.10-light.jar.asc release/felix/org.apache.felix.http.jetty-5.1.10-light.jar.sha1 release/felix/org.apache.felix.http.jetty-5.1.10-light.jar.sha512 release/felix/org.apache.felix.http.jetty-5.1.10-source-release.tar.gz (with props) release/felix/org.apache.felix.http.jetty-5.1.10-source-release.tar.gz.asc release/felix/org.apache.felix.http.jetty-5.1.10-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.jetty-5.1.10-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.jetty-5.1.10-source-release.zip (with props) release/felix/org.apache.felix.http.jetty-5.1.10-source-release.zip.asc release/felix/org.apache.felix.http.jetty-5.1.10-source-release.zip.sha1 release/felix/org.apache.felix.http.jetty-5.1.10-source-release.zip.sha512 release/felix/org.apache.felix.http.jetty-5.1.10-sources.jar (with props) release/felix/org.apache.felix.http.jetty-5.1.10-sources.jar.asc release/felix/org.apache.felix.http.jetty-5.1.10-sources.jar.sha1 release/felix/org.apache.felix.http.jetty-5.1.10-sources.jar.sha512 release/felix/org.apache.felix.http.jetty-5.1.10.jar (with props) release/felix/org.apache.felix.http.jetty-5.1.10.jar.asc release/felix/org.apache.felix.http.jetty-5.1.10.jar.sha1 release/felix/org.apache.felix.http.jetty-5.1.10.jar.sha512 release/felix/org.apache.felix.http.jetty-5.1.10.pom release/felix/org.apache.felix.http.jetty-5.1.10.pom.asc release/felix/org.apache.felix.http.jetty-5.1.10.pom.sha1 release/felix/org.apache.felix.http.jetty-5.1.10.pom.sha512 Removed: release/felix/org.apache.felix.http.jetty-4.2.24-javadoc.jar release/felix/org.apache.felix.http.jetty-4.2.24-javadoc.jar.asc release/felix/org.apache.felix.http.jetty-4.2.24-javadoc.jar.sha1 release/felix/org.apache.felix.http.jetty-4.2.24-javadoc.jar.sha512 release/felix/org.apache.felix.http.jetty-4.2.24-light.jar release/felix/org.apache.felix.http.jetty-4.2.24-light.jar.asc release/felix/org.apache.felix.http.jetty-4.2.24-light.jar.sha1 release/felix/org.apache.felix.http.jetty-4.2.24-light.jar.sha512 release/felix/org.apache.felix.http.jetty-4.2.24-source-release.tar.gz release/felix/org.apache.felix.http.jetty-4.2.24-source-release.tar.gz.asc release/felix/org.apache.felix.http.jetty-4.2.24-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.jetty-4.2.24
svn commit: r67692 [2/2] - /release/felix/
Added: release/felix/org.apache.felix.http.jetty-5.1.10.pom.asc == --- release/felix/org.apache.felix.http.jetty-5.1.10.pom.asc (added) +++ release/felix/org.apache.felix.http.jetty-5.1.10.pom.asc Mon Mar 4 06:30:32 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmXe3z4ACgkQP89Sn/Ly +egbM6A//btqhLoW6Va4Eq0tVdgVkMHvfI+/RVtoPEWZMQ1bkfOXNe/XnNVtJ5r03 +2X1zDJ4LQlODsADCYOz9Lpha8DZHK1QHI0/88kfF6yO5ARaJPh/jNuAN/DyvdGLd +JP/AAmItWOS6TdSf6xhc/IHdX91eExdFBxK/ha3QV5Gsqwbj2H/XWqx5+ZetkqkQ +SNkCce74PqM3EnLeILtDF81wbMHWXbj36WyDDSbsjSxCi4JU2RPFsaw3KjvZM3rl +/qvy3zHpA+H5qL4EBYK18Cw8z503Gsp4FhTLOpUBSrIWHYrfnAMSJIto3OiWTc6y ++2sgYgwKn/0suJsL+mKTD+PTrDrwvCzDUKwIoT2436G4GgQEGBxKnraPKIAV8HZ9 +JFbfBwZUPezraKXxQb1qAdJyyTALvg2n4B/+OVjURmI6VJID82ad/W23TQg5joDo +IesYvB+XOxmsM49AxGEDvbqUsQzJppERNbyCfffBBCB6J3T9OLaqB14crxommIVU +ywSPm76gb0lInZpT2fsNfm3tC8l/kkcQpdP3xheAh6I6uY2XQ6ES31XKtxDbVr/s +D1JOHIEepc9EfTiSnW0VoIl8NVtt+BeOZFwUwpLPyBHMRlH2EKMRe1mzArfSchmf +4QXVjfexGeut9zGti0dUUh/zsgxicoT01pa6yCe0Jp+UtzIPNH4= +=OfAK +-END PGP SIGNATURE- Added: release/felix/org.apache.felix.http.jetty-5.1.10.pom.sha1 == --- release/felix/org.apache.felix.http.jetty-5.1.10.pom.sha1 (added) +++ release/felix/org.apache.felix.http.jetty-5.1.10.pom.sha1 Mon Mar 4 06:30:32 2024 @@ -0,0 +1 @@ +be689ebf4e84a8cf345ebdc43ada5e7455944ea7 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty-5.1.10.pom.sha512 == --- release/felix/org.apache.felix.http.jetty-5.1.10.pom.sha512 (added) +++ release/felix/org.apache.felix.http.jetty-5.1.10.pom.sha512 Mon Mar 4 06:30:32 2024 @@ -0,0 +1 @@ +7e17fe896181e9b15809ddde621ffc5a39c0dd674f6aecfaaabd8aa53bbf83b93543132c13975879f8f35f9c5e98068e6d0fb60a50e8c920511d1fb988b87472 org.apache.felix.http.jetty-5.1.10.pom
(felix-dev) branch master updated: Update to latest jetty snapshot
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new f495351917 Update to latest jetty snapshot f495351917 is described below commit f495351917b0d122138cd6ea70d6c4e61f475629 Author: Carsten Ziegeler AuthorDate: Wed Feb 28 08:23:06 2024 +0100 Update to latest jetty snapshot --- http/itest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/itest/pom.xml b/http/itest/pom.xml index b2c57f36db..3087e36d7a 100644 --- a/http/itest/pom.xml +++ b/http/itest/pom.xml @@ -33,7 +33,7 @@ 11 2.1.0 -5.1.9-SNAPSHOT +5.1.11-SNAPSHOT org.apache.felix.http.jetty 4.13.1 2.6.14
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 82d03ad2b5 [maven-release-plugin] prepare for next development iteration 82d03ad2b5 is described below commit 82d03ad2b5b2033190dc5159f1f22d272cc84866 Author: Carsten Ziegeler AuthorDate: Wed Feb 28 08:22:17 2024 +0100 [maven-release-plugin] prepare for next development iteration --- http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index de72599dd6..d66c20cb79 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -30,14 +30,14 @@ This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification org.apache.felix.http.jetty -5.1.10 +5.1.11-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.jetty-5.1.10 + HEAD
(felix-dev) annotated tag org.apache.felix.http.jetty-5.1.10 updated (52acb82f41 -> e6e8098b1a)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty-5.1.10 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty-5.1.10 was modified! *** from 52acb82f41 (commit) to e6e8098b1a (tag) tagging 52acb82f4111d29baeb262732e9d02837cb13066 (commit) replaces org.apache.felix.http.jetty12-1.0.2 by Carsten Ziegeler on Wed Feb 28 08:22:16 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty-5.1.10 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated (94f6a67482 -> 52acb82f41)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 94f6a67482 FELIX-6691 : Update to Jetty 12.0.6 add 52acb82f41 [maven-release-plugin] prepare release org.apache.felix.http.jetty-5.1.10 No new revisions were added by this update. Summary of changes: http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch http-4.x updated: Update to latest jetty snapshot
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/http-4.x by this push: new 235ce95914 Update to latest jetty snapshot 235ce95914 is described below commit 235ce9591436cd0c962737a53c8cb1ed813286d6 Author: Carsten Ziegeler AuthorDate: Wed Feb 28 08:21:42 2024 +0100 Update to latest jetty snapshot --- http/itest/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/itest/pom.xml b/http/itest/pom.xml index 7186ade202..9176b2f85f 100644 --- a/http/itest/pom.xml +++ b/http/itest/pom.xml @@ -35,7 +35,7 @@ 4.13.1 2.6.2 2.0.0 -4.2.25-SNAPSHOT +4.2.27-SNAPSHOT
(felix-dev) branch http-4.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/http-4.x by this push: new f4d3105494 [maven-release-plugin] prepare for next development iteration f4d3105494 is described below commit f4d3105494ed83c1619a1e629a37e5a9ad9e55a1 Author: Carsten Ziegeler AuthorDate: Wed Feb 28 08:19:16 2024 +0100 [maven-release-plugin] prepare for next development iteration --- http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 2181280366..bba655c8a5 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -30,14 +30,14 @@ This is an implementation of the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification org.apache.felix.http.jetty -4.2.26 +4.2.27-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.jetty-4.2.26 + HEAD
(felix-dev) annotated tag org.apache.felix.http.jetty-4.2.26 updated (30948cd4e3 -> 54df1ae3b9)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty-4.2.26 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty-4.2.26 was modified! *** from 30948cd4e3 (commit) to 54df1ae3b9 (tag) tagging 30948cd4e3a7838b4e0b6b555af3a9051d6a1f7e (commit) replaces org.apache.felix.http.jetty-4.2.24 by Carsten Ziegeler on Wed Feb 28 08:19:15 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty-4.2.26 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch http-4.x updated (e3b8f498ac -> 30948cd4e3)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git from e3b8f498ac FELIX-6689 : Update to Jetty 9.4.54.v20240208 add 30948cd4e3 [maven-release-plugin] prepare release org.apache.felix.http.jetty-4.2.26 No new revisions were added by this update. Summary of changes: http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch http-4.x updated: FELIX-6689 : Update to Jetty 9.4.54.v20240208
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/http-4.x by this push: new e3b8f498ac FELIX-6689 : Update to Jetty 9.4.54.v20240208 e3b8f498ac is described below commit e3b8f498ac48329f0ab062fa23d8fd6d5683956b Author: Carsten Ziegeler AuthorDate: Wed Feb 28 07:44:58 2024 +0100 FELIX-6689 : Update to Jetty 9.4.54.v20240208 --- http/jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 16287d7ca6..171f29c92d 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -42,7 +42,7 @@ 8 -9.4.53.v20231009 +9.4.54.v20240208
(felix-dev) branch master updated: FELIX-6691 : Update to Jetty 12.0.6
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 94f6a67482 FELIX-6691 : Update to Jetty 12.0.6 94f6a67482 is described below commit 94f6a674829bdd94ad46604690c2d8a485d8ec77 Author: Carsten Ziegeler AuthorDate: Wed Feb 28 07:36:55 2024 +0100 FELIX-6691 : Update to Jetty 12.0.6 --- http/jetty12/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 8432bc0fce..3adb09a0d4 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -37,12 +37,11 @@ scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git -org.apache.felix.http.jetty12-1.0.2 17 -12.0.5 +12.0.6 true
(felix-dev) branch master updated: FELIX-6690 : Update to Jetty 11.0.20
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new a464f8c236 FELIX-6690 : Update to Jetty 11.0.20 a464f8c236 is described below commit a464f8c236b0419be916271357e588dd18f932be Author: Carsten Ziegeler AuthorDate: Wed Feb 28 07:26:57 2024 +0100 FELIX-6690 : Update to Jetty 11.0.20 --- http/jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 933869a09e..024ec931c0 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -42,7 +42,7 @@ 11 -11.0.19 +11.0.20 true
(felix-antora-site) branch main updated: Http releases
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/felix-antora-site.git The following commit(s) were added to refs/heads/main by this push: new a57da39a Http releases a57da39a is described below commit a57da39aaf325c98cbff08ca619144d23fc41862 Author: Carsten Ziegeler AuthorDate: Fri Jan 26 07:45:31 2024 +0100 Http releases --- downloads.list | 6 +++--- modules/ROOT/examples/downloads.yml | 8 modules/ROOT/pages/news.adoc| 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/downloads.list b/downloads.list index 99ad9299..e08838e1 100644 --- a/downloads.list +++ b/downloads.list @@ -55,9 +55,9 @@ Health Check API|org.apache.felix.healthcheck.api|2.0.4|project||- Health Check Core|org.apache.felix.healthcheck.core|2.2.0|project||- Health Check General Checks|org.apache.felix.healthcheck.generalchecks|3.0.8|project||- Health Check Webconsole Plugin|org.apache.felix.healthcheck.webconsoleplugin|2.2.0|project||- -HTTP Service Base|org.apache.felix.http.base|5.1.4 -HTTP Service Bridge|org.apache.felix.http.bridge|5.1.4 -HTTP Service Jetty|org.apache.felix.http.jetty|5.1.6 +HTTP Service Base|org.apache.felix.http.base|5.1.6 +HTTP Service Bridge|org.apache.felix.http.bridge|5.1.6 +HTTP Service Jetty|org.apache.felix.http.jetty|5.1.8 HTTP Service Proxy|org.apache.felix.http.proxy|3.0.6 HTTP Service SSL filter|org.apache.felix.http.sslfilter|2.0.2 HTTP Service Whiteboard|org.apache.felix.http.whiteboard|4.0.0 diff --git a/modules/ROOT/examples/downloads.yml b/modules/ROOT/examples/downloads.yml index 2a24fec9..77e8e35d 100644 --- a/modules/ROOT/examples/downloads.yml +++ b/modules/ROOT/examples/downloads.yml @@ -173,25 +173,25 @@ subprojects: - title: HTTP Service Base artifactId: org.apache.felix.http.base -version: 5.1.4 +version: 5.1.6 source_classifier: source-release changelog: false - title: HTTP Service Bridge artifactId: org.apache.felix.http.bridge -version: 5.1.4 +version: 5.1.6 source_classifier: source-release changelog: false - title: HTTP Service Jetty artifactId: org.apache.felix.http.jetty -version: 5.1.6 +version: 5.1.8 source_classifier: source-release changelog: false - title: HTTP Service Jetty12 artifactId: org.apache.felix.http.jetty12 -version: 1.0.0 +version: 1.0.2 source_classifier: source-release changelog: false diff --git a/modules/ROOT/pages/news.adoc b/modules/ROOT/pages/news.adoc index a6cddd5b..c9b8357f 100644 --- a/modules/ROOT/pages/news.adoc +++ b/modules/ROOT/pages/news.adoc @@ -1,5 +1,6 @@ = News +* Apache Felix Httpy Jetty 5.1.8, Http Jetty12 1.0.2, Http Jetty 4.2.24, Http Base 5.1.6, Http Base 4.2.14, Http Bridge 5.1.6 and Http Bridge 4.2.18 (January 26th) * Apache Felix Webconsole 5.0.0 (January 8th, 2024) * Apache Felix Http Jetty 5.1.6, Http Jetty12 1.0.0, Http Jetty 4.2.22, Http Base 5.1.4, Http Bridge 5.1.4, Http Base 4.2.12, Http Bridge 4.2.16 (December 11th, 2023) * Apache Felix iPOJO Manipulator 1.13.0 (December 8th, 2023)
svn commit: r66810 [3/3] - /release/felix/
Added: release/felix/org.apache.felix.http.jetty-5.1.8.pom
==
--- release/felix/org.apache.felix.http.jetty-5.1.8.pom (added)
+++ release/felix/org.apache.felix.http.jetty-5.1.8.pom Fri Jan 26 06:42:46 2024
@@ -0,0 +1,471 @@
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+org.apache.felix
+felix-parent
+8
+../../pom/pom.xml
+
+
+Apache Felix Http Jetty
+This is an implementation of the R8.1 OSGi Servlet Service,
the R7 OSGi Http Service and the R7 OSGi Http Whiteboard
Specification
+
+org.apache.felix.http.jetty
+5.1.8
+bundle
+
+
+
scm:git:https://github.com/apache/felix-dev.git
+
scm:git:https://github.com/apache/felix-dev.git
+https://gitbox.apache.org/repos/asf?p=felix-dev.git
+ org.apache.felix.http.jetty-5.1.8
+
+
+
+11
+11.0.19
+true
+
+
+
+
+
+
+
+org.codehaus.gmaven
+groovy-maven-plugin
+2.1.1
+
+
+groovy-magic
+prepare-package
+
+execute
+
+
+
+
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+5.1.9
+true
+
+
+
${project.artifactId}
+${project.version}
+
+${jetty.version}
+
+
+org.apache.felix.http.jetty.internal.JettyActivator
+
+
+org.osgi.service.http,
+org.osgi.service.http.context,
+org.osgi.service.http.runtime,
+org.osgi.service.http.runtime.dto,
+org.osgi.service.http.whiteboard,
+org.osgi.service.servlet.context,
+org.osgi.service.servlet.runtime,
+org.osgi.service.servlet.runtime.dto,
+org.osgi.service.servlet.whiteboard,
+!org.eclipse.jetty,
+!org.eclipse.jetty.version,
+org.eclipse.jetty.*,
+org.apache.felix.http.jetty,
+org.apache.felix.http.jakartawrappers,
+org.apache.felix.http.javaxwrappers
+
+
+org.apache.felix.http.base.*,
+org.apache.felix.http.jetty.*,
+org.eclipse.jetty,
+org.eclipse.jetty.version
+
+
+org.apache.commons.*
+
+
+sun.misc;resolution:=optional,
+sun.nio.ch;resolution:=optional,
+javax.imageio;resolution:=optional,
+javax.sql;resolution:=optional,
+org.ietf.jgss;resolution:=optional,
+
org.osgi.service.cm;resolution:=optional;version="[1.3,2)",
+
org.osgi.service.event;resolution:=optional;version="[1.2,2)",
+
org.osgi.service.log;resolution:=optional;version="[1.3,2)",
+
org.osgi.service.metatype;resolution:=optional;version="[1.1,2)",
+
org.osgi.service.useradmin;resolution:=optional;version="[1.1,2)",
+org.osgi.service.http;version="[1.2.1,1.3)",
+org.osgi.service.http.context;version="[1.1,1.2)",
+org.osgi.service.http.runtime;version="[1.1,1.2)",
+
org.osgi.service.http.runtime.dto;version="[1.1,1.2)",
+org.slf4j;version="[1.0,3.0)",
+*
+
+
+org.osgi.service.cm;version="[1.3,2)",
+org.osgi.service.event;version="[1.2,2)",
+org.osgi.service.log;version="[1.3,2)",
+org.osgi.service.metatype;version="[1.4,2)"
+
svn commit: r66810 [1/3] - /release/felix/
Author: cziegeler Date: Fri Jan 26 06:42:46 2024 New Revision: 66810 Log: http releases Added: release/felix/org.apache.felix.http.base-4.2.14-javadoc.jar (with props) release/felix/org.apache.felix.http.base-4.2.14-javadoc.jar.asc release/felix/org.apache.felix.http.base-4.2.14-javadoc.jar.sha1 release/felix/org.apache.felix.http.base-4.2.14-javadoc.jar.sha512 release/felix/org.apache.felix.http.base-4.2.14-source-release.tar.gz (with props) release/felix/org.apache.felix.http.base-4.2.14-source-release.tar.gz.asc release/felix/org.apache.felix.http.base-4.2.14-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.base-4.2.14-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.base-4.2.14-source-release.zip (with props) release/felix/org.apache.felix.http.base-4.2.14-source-release.zip.asc release/felix/org.apache.felix.http.base-4.2.14-source-release.zip.sha1 release/felix/org.apache.felix.http.base-4.2.14-source-release.zip.sha512 release/felix/org.apache.felix.http.base-4.2.14-sources.jar (with props) release/felix/org.apache.felix.http.base-4.2.14-sources.jar.asc release/felix/org.apache.felix.http.base-4.2.14-sources.jar.sha1 release/felix/org.apache.felix.http.base-4.2.14-sources.jar.sha512 release/felix/org.apache.felix.http.base-4.2.14.jar (with props) release/felix/org.apache.felix.http.base-4.2.14.jar.asc release/felix/org.apache.felix.http.base-4.2.14.jar.sha1 release/felix/org.apache.felix.http.base-4.2.14.jar.sha512 release/felix/org.apache.felix.http.base-4.2.14.pom release/felix/org.apache.felix.http.base-4.2.14.pom.asc release/felix/org.apache.felix.http.base-4.2.14.pom.sha1 release/felix/org.apache.felix.http.base-4.2.14.pom.sha512 release/felix/org.apache.felix.http.base-5.1.6-javadoc.jar (with props) release/felix/org.apache.felix.http.base-5.1.6-javadoc.jar.asc release/felix/org.apache.felix.http.base-5.1.6-javadoc.jar.sha1 release/felix/org.apache.felix.http.base-5.1.6-javadoc.jar.sha512 release/felix/org.apache.felix.http.base-5.1.6-source-release.tar.gz (with props) release/felix/org.apache.felix.http.base-5.1.6-source-release.tar.gz.asc release/felix/org.apache.felix.http.base-5.1.6-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.base-5.1.6-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.base-5.1.6-source-release.zip (with props) release/felix/org.apache.felix.http.base-5.1.6-source-release.zip.asc release/felix/org.apache.felix.http.base-5.1.6-source-release.zip.sha1 release/felix/org.apache.felix.http.base-5.1.6-source-release.zip.sha512 release/felix/org.apache.felix.http.base-5.1.6-sources.jar (with props) release/felix/org.apache.felix.http.base-5.1.6-sources.jar.asc release/felix/org.apache.felix.http.base-5.1.6-sources.jar.sha1 release/felix/org.apache.felix.http.base-5.1.6-sources.jar.sha512 release/felix/org.apache.felix.http.base-5.1.6.jar (with props) release/felix/org.apache.felix.http.base-5.1.6.jar.asc release/felix/org.apache.felix.http.base-5.1.6.jar.sha1 release/felix/org.apache.felix.http.base-5.1.6.jar.sha512 release/felix/org.apache.felix.http.base-5.1.6.pom release/felix/org.apache.felix.http.base-5.1.6.pom.asc release/felix/org.apache.felix.http.base-5.1.6.pom.sha1 release/felix/org.apache.felix.http.base-5.1.6.pom.sha512 release/felix/org.apache.felix.http.bridge-4.2.18-light.jar (with props) release/felix/org.apache.felix.http.bridge-4.2.18-light.jar.asc release/felix/org.apache.felix.http.bridge-4.2.18-light.jar.sha1 release/felix/org.apache.felix.http.bridge-4.2.18-light.jar.sha512 release/felix/org.apache.felix.http.bridge-4.2.18-source-release.tar.gz (with props) release/felix/org.apache.felix.http.bridge-4.2.18-source-release.tar.gz.asc release/felix/org.apache.felix.http.bridge-4.2.18-source-release.tar.gz.sha1 release/felix/org.apache.felix.http.bridge-4.2.18-source-release.tar.gz.sha512 release/felix/org.apache.felix.http.bridge-4.2.18-source-release.zip (with props) release/felix/org.apache.felix.http.bridge-4.2.18-source-release.zip.asc release/felix/org.apache.felix.http.bridge-4.2.18-source-release.zip.sha1 release/felix/org.apache.felix.http.bridge-4.2.18-source-release.zip.sha512 release/felix/org.apache.felix.http.bridge-4.2.18-sources.jar (with props) release/felix/org.apache.felix.http.bridge-4.2.18-sources.jar.asc release/felix/org.apache.felix.http.bridge-4.2.18-sources.jar.sha1 release/felix/org.apache.felix.http.bridge-4.2.18-sources.jar.sha512 release/felix/org.apache.felix.http.bridge-4.2.18.jar (with props) release/felix/org.apache.felix.http.bridge-4.2.18.jar.asc release/felix/org.apache.felix.http.bridge-4.2.18.jar.sha1 release/felix/org.apache.felix.http.bridge-4.2.18
svn commit: r66810 [2/3] - /release/felix/
Added: release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.asc == --- release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.asc (added) +++ release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAdMACgkQP89Sn/Ly +egb+kw/8C9/qBHowg5vLJDAZvQ6Qgzw7FeSolNzwns5BMDIU/XzVPYUUZMcf423e +6+Y8L8GY4fR/JRSdxi/5xrQZLA5DXwqkeIX3/ss4yYib0IbakzoBh/KQihUJ36cw +r3B3ck2rov0rh0/1ayiKrPZJqT6vKhjuhPhoTnPoASbCupeMpxqsB8tYFiNrbDo7 +7ZaiQfds7YTqqkLFj89X3itBJ1+gv0xJw1i2uo9v4t1kVYOLSkQKd5Vbg6FgkHxp +wiPyiDbWB8L+RSm9Slh0kAf6H+3NNQ05uqZnAl5wW25ajTSheIP5DJ9E4sYQWET/ +d6Kx+CZA5BDln7WFhuvUKd0OmpiSROytP0rQOcNo8XUBRuzNl4aGJpwA/cOGF3wB +C0PMWyromE7tcyBFyQWNPdx0sLn0DcilnD3puLes/3qSxzmOgPQr/AKIywPr+ahM +46HdZmtaH1MjeIVsHISsmMtxtfQij2zRLBjDmbhV/PEUaZw8j3v3kBHSjWy2vfHf +C3idL6+QsWjEnYB9a92JcSWXHhuC7uTkNGJAApQMP8j3aYPgcV/qEZYL9uPqd2RB +KqZE1zyoYHZ5s73M7FEHZ6VOoamA5HAkI6RKGRWdHcRLmGjfN2+9gR3GX45sBcPm +bqxKw4p7Hyu6jWr2JBDsLxnGW8BQqQzQHO+o8jjvxVFLKb+w/zg= +=Noku +-END PGP SIGNATURE- Added: release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.sha1 == --- release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.sha1 (added) +++ release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +52320ef4299914cd2f6242a8b90345fc673fb2b6 \ No newline at end of file Added: release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.sha512 == --- release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.sha512 (added) +++ release/felix/org.apache.felix.http.bridge-5.1.6-source-release.tar.gz.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +c17e7776832ef2331f110eb5e858d537db6503f9e767598375cd7932806995be07bc923419aaac77350f02a9f27eaf4dcc0a1a40002838dff93e8574b3a979f3 \ No newline at end of file Added: release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip == Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip -- svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.asc == --- release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.asc (added) +++ release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAdMACgkQP89Sn/Ly +egb6RA/+NHa48NF+SVaoyEPwc6j8E9CNAv09IFJ8qlalYHJ6z8mnFv4SL86+NSTq +y8RF1weQ6IWoV6SfXSBahaIlFY30Op1H/Dnl+SDxwuHEwUimR2BPJ1Q/5be+XmBP +oMxGoDxtLMlNHudoiPTHQ5qqQP232P5lCz7E7ZLry2RGFkJ/RzCSl9nkzj7AYlqp +HPNkJ0d0LqQcFSwJvYWNhMrHgfaKUOWBEtQAa5dwcsLMK9jkoE1wFv9vUihFdLE0 +qH8YnmZUSTukJMNVqs3jtpygWbnjPYP215JqJAxWMFTSQnQH4hYSLxixoZjYZxDE +MtFMnUdgO+ntyocDPl98Pag95ilRy7s+66SFU/thIoWUhp8msoYGR33GPf5PP93v +mYZN4Ca1FzMXSiYQYoD9wmehQgIHHMedpLoR8rUPUqBqfxEsiojqO5AGz6jr1sEu +j5sjN/DhXGBCcRx7siVptA+N1BCHNIJXryeXL58IzGz7jJ3Si/feXJNCn97py+G7 +Jh99wx7MoQ6nrMKXOA9YNHk9Qhl63+PyBXzJLec4k5Fpu4ckix36fsN3V9DM/py/ +UwwaF8vZfjxt3q7jXZdYwPGduSEQamwUU9w9SqJQvz1VvMHsTNOGZ+wy8x4RBEHZ +aQuXCCXXXNonOCXueLawgOZivMTr/bgKGC3WXnWfgsaeIQ1aj+Q= +=wYgw +-END PGP SIGNATURE- Added: release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.sha1 == --- release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.sha1 (added) +++ release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +538803e7a8436dd4c54a911c8ab28dc24cd9fff3 \ No newline at end of file Added: release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.sha512 == --- release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.sha512 (added) +++ release/felix/org.apache.felix.http.bridge-5.1.6-source-release.zip.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +268e8234af0f7da3a2affa33290d7b706646303ecaa40e9a8e85278adbadaef50fd618cf170dad9662da0d89472785c2b873964b1986496990c4af862877c5e2 \ No newline at end of file Added: release/felix/org.apache.felix.http.bridge-5.1.6-sources.jar == Binary file - no diff available. Propchange:
(felix-dev) branch master updated: Fix escaping of special xml characters
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 9474ac9fca Fix escaping of special xml characters 9474ac9fca is described below commit 9474ac9fcaf43da27e0061645ed9ed721aa0fda0 Author: Carsten Ziegeler AuthorDate: Mon Jan 22 13:27:02 2024 +0100 Fix escaping of special xml characters --- configurator/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configurator/pom.xml b/configurator/pom.xml index 35afb087b3..3d0b1770cb 100644 --- a/configurator/pom.xml +++ b/configurator/pom.xml @@ -75,7 +75,7 @@ osgi.extender;osgi.extender="osgi.configurator";version:Version="1.0" - osgi.implementation;filter:='(&(osgi.implementation=osgi.cm)(version>=1.6.0)(!(version>=2.0.0)))' + osgi.implementation;filter:='((osgi.implementation=osgi.cm)(version=1.6.0)(!(version=2.0.0)))'
(felix-dev) branch master updated: Adds Requirement for Configuration Admin (#290)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new c5b3fcaf48 Adds Requirement for Configuration Admin (#290) c5b3fcaf48 is described below commit c5b3fcaf48a6a00453d96dafe57984faaa913856 Author: Jürgen Albert AuthorDate: Mon Jan 22 13:00:13 2024 +0100 Adds Requirement for Configuration Admin (#290) --- configurator/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configurator/pom.xml b/configurator/pom.xml index 85d2763f73..35afb087b3 100644 --- a/configurator/pom.xml +++ b/configurator/pom.xml @@ -74,6 +74,9 @@ osgi.extender;osgi.extender="osgi.configurator";version:Version="1.0" + + osgi.implementation;filter:='(&(osgi.implementation=osgi.cm)(version>=1.6.0)(!(version>=2.0.0)))' +
(felix-dev) annotated tag org.apache.felix.http.jetty12-1.0.2 updated (946514d910 -> cb5b978bb1)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty12-1.0.2 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty12-1.0.2 was modified! *** from 946514d910 (commit) to cb5b978bb1 (tag) tagging 946514d910e2f00b971753a3534eb248ff5d4c35 (commit) replaces org.apache.felix.http.jetty-5.1.8 by Carsten Ziegeler on Mon Jan 22 06:51:01 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty12-1.0.2 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 6ad0f6f9c0 [maven-release-plugin] prepare for next development iteration 6ad0f6f9c0 is described below commit 6ad0f6f9c020edc85db4287cba96512534005c82 Author: Carsten Ziegeler AuthorDate: Mon Jan 22 06:51:02 2024 +0100 [maven-release-plugin] prepare for next development iteration --- http/jetty12/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 35aced0680..8432bc0fce 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -30,7 +30,7 @@ This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification org.apache.felix.http.jetty12 -1.0.2 +1.0.3-SNAPSHOT bundle
(felix-dev) branch master updated (3090cdb246 -> 946514d910)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 3090cdb246 [maven-release-plugin] prepare for next development iteration add 946514d910 [maven-release-plugin] prepare release org.apache.felix.http.jetty12-1.0.2 No new revisions were added by this update. Summary of changes: http/jetty12/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch master updated (79bd787d1f -> d1eb7d06f5)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 79bd787d1f [maven-release-plugin] prepare for next development iteration add d1eb7d06f5 [maven-release-plugin] prepare release org.apache.felix.http.jetty-5.1.8 No new revisions were added by this update. Summary of changes: http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 3090cdb246 [maven-release-plugin] prepare for next development iteration 3090cdb246 is described below commit 3090cdb2469e90a40a619b4832a5fe116dae86a9 Author: Carsten Ziegeler AuthorDate: Mon Jan 22 06:49:42 2024 +0100 [maven-release-plugin] prepare for next development iteration --- http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 20fb45e828..933869a09e 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -30,14 +30,14 @@ This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification org.apache.felix.http.jetty -5.1.8 +5.1.9-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.jetty-5.1.8 + HEAD
(felix-dev) annotated tag org.apache.felix.http.jetty-5.1.8 updated (d1eb7d06f5 -> da0ccfa524)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty-5.1.8 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty-5.1.8 was modified! *** from d1eb7d06f5 (commit) to da0ccfa524 (tag) tagging d1eb7d06f56f75096a3a9baf0b8e9cee9a3d21a4 (commit) replaces org.apache.felix.http.bridge-5.1.6 by Carsten Ziegeler on Mon Jan 22 06:49:41 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty-5.1.8 --- No new revisions were added by this update. Summary of changes:
(felix-dev) annotated tag org.apache.felix.http.bridge-5.1.6 updated (a7108a8bc4 -> 926504eb0e)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.bridge-5.1.6 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.bridge-5.1.6 was modified! *** from a7108a8bc4 (commit) to 926504eb0e (tag) tagging a7108a8bc4e487ca2007d6e9e60e91c6b6f9684d (commit) replaces org.apache.felix.http.base-5.1.6 by Carsten Ziegeler on Mon Jan 22 06:48:49 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.bridge-5.1.6 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new 79bd787d1f [maven-release-plugin] prepare for next development iteration 79bd787d1f is described below commit 79bd787d1fda49cfc8aa272cf7fafe59e97eeadb Author: Carsten Ziegeler AuthorDate: Mon Jan 22 06:48:51 2024 +0100 [maven-release-plugin] prepare for next development iteration --- http/bridge/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml index 4ef206f05c..736cf0a7a1 100644 --- a/http/bridge/pom.xml +++ b/http/bridge/pom.xml @@ -29,14 +29,14 @@ Apache Felix Http Bridge This is an implementation of the OSGi Servlet Service, the OSGi Http Service and the OSGi Http Whiteboard Specification used when run as a web application org.apache.felix.http.bridge -5.1.6 +5.1.7-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.bridge-5.1.6 + HEAD
(felix-dev) branch master updated (df1b333344 -> a7108a8bc4)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from df1b44 [maven-release-plugin] prepare for next development iteration add a7108a8bc4 [maven-release-plugin] prepare release org.apache.felix.http.bridge-5.1.6 No new revisions were added by this update. Summary of changes: http/bridge/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) annotated tag org.apache.felix.http.base-5.1.6 updated (23ed193831 -> 9aacf1bc3e)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.base-5.1.6 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.base-5.1.6 was modified! *** from 23ed193831 (commit) to 9aacf1bc3e (tag) tagging 23ed193831b9b80d0bd316cd1a884167e0a1d771 (commit) replaces org.apache.felix.scr-2.2.10 by Carsten Ziegeler on Mon Jan 22 06:47:58 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.base-5.1.6 --- No new revisions were added by this update. Summary of changes:
(felix-dev) branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new df1b44 [maven-release-plugin] prepare for next development iteration df1b44 is described below commit df1b4485fd3f5d2f262715e75b91bd542921 Author: Carsten Ziegeler AuthorDate: Mon Jan 22 06:47:59 2024 +0100 [maven-release-plugin] prepare for next development iteration --- http/base/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/base/pom.xml b/http/base/pom.xml index f76cd28464..bac38d3165 100644 --- a/http/base/pom.xml +++ b/http/base/pom.xml @@ -28,14 +28,14 @@ Apache Felix Http Base org.apache.felix.http.base -5.1.6 +5.1.7-SNAPSHOT jar scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.base-5.1.6 + HEAD
(felix-dev) branch master updated (f76e80df0f -> 23ed193831)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git from f76e80df0f Prepare release add 23ed193831 [maven-release-plugin] prepare release org.apache.felix.http.base-5.1.6 No new revisions were added by this update. Summary of changes: http/base/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) branch master updated: Prepare release
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/master by this push: new f76e80df0f Prepare release f76e80df0f is described below commit f76e80df0ffd850446d27ae04ebad60102d8422e Author: Carsten Ziegeler AuthorDate: Mon Jan 22 06:47:30 2024 +0100 Prepare release --- http/bridge/pom.xml | 2 +- http/itest/pom.xml | 4 ++-- http/jetty/pom.xml | 2 +- http/jetty12/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml index 801c372886..a6e11983c3 100644 --- a/http/bridge/pom.xml +++ b/http/bridge/pom.xml @@ -184,7 +184,7 @@ org.apache.felix org.apache.felix.http.base -5.1.5-SNAPSHOT +5.1.6 org.apache.felix diff --git a/http/itest/pom.xml b/http/itest/pom.xml index bd7f557a06..b2c57f36db 100644 --- a/http/itest/pom.xml +++ b/http/itest/pom.xml @@ -33,7 +33,7 @@ 11 2.1.0 -5.1.7-SNAPSHOT +5.1.9-SNAPSHOT org.apache.felix.http.jetty 4.13.1 2.6.14 @@ -45,7 +45,7 @@ 17 3.0.0 -1.0.1-SNAPSHOT +1.0.3-SNAPSHOT org.apache.felix.http.jetty12 diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 934ed9b435..5ffb4c9ded 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -431,7 +431,7 @@ org.apache.felix org.apache.felix.http.base -5.1.5-SNAPSHOT +5.1.6 org.apache.felix diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index bff610fb04..be26fd73b6 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -435,7 +435,7 @@ org.apache.felix org.apache.felix.http.base -5.1.5-SNAPSHOT +5.1.6 org.apache.felix
(felix-dev) branch http-4.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git The following commit(s) were added to refs/heads/http-4.x by this push: new f4ea96ce8d [maven-release-plugin] prepare for next development iteration f4ea96ce8d is described below commit f4ea96ce8d0122264c0d9dacae81932e9fcde244 Author: Carsten Ziegeler AuthorDate: Mon Jan 22 06:42:27 2024 +0100 [maven-release-plugin] prepare for next development iteration --- http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml index 6264689914..16287d7ca6 100644 --- a/http/jetty/pom.xml +++ b/http/jetty/pom.xml @@ -30,14 +30,14 @@ This is an implementation of the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification org.apache.felix.http.jetty -4.2.24 +4.2.25-SNAPSHOT bundle scm:git:https://github.com/apache/felix-dev.git scm:git:https://github.com/apache/felix-dev.git https://gitbox.apache.org/repos/asf?p=felix-dev.git - org.apache.felix.http.jetty-4.2.24 + HEAD
(felix-dev) branch http-4.x updated (09adce353b -> c0c8dd0242)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git from 09adce353b [maven-release-plugin] prepare for next development iteration add c0c8dd0242 [maven-release-plugin] prepare release org.apache.felix.http.jetty-4.2.24 No new revisions were added by this update. Summary of changes: http/jetty/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(felix-dev) annotated tag org.apache.felix.http.jetty-4.2.24 updated (c0c8dd0242 -> cbf9166e55)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.jetty-4.2.24 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.jetty-4.2.24 was modified! *** from c0c8dd0242 (commit) to cbf9166e55 (tag) tagging c0c8dd0242734681164cf0a89a5ec7768c483264 (commit) replaces org.apache.felix.http.bridge-4.2.18 by Carsten Ziegeler on Mon Jan 22 06:42:26 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.jetty-4.2.24 --- No new revisions were added by this update. Summary of changes:
(felix-dev) annotated tag org.apache.felix.http.bridge-4.2.18 updated (6d83b9d113 -> 586052d470)
This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a change to annotated tag org.apache.felix.http.bridge-4.2.18 in repository https://gitbox.apache.org/repos/asf/felix-dev.git *** WARNING: tag org.apache.felix.http.bridge-4.2.18 was modified! *** from 6d83b9d113 (commit) to 586052d470 (tag) tagging 6d83b9d113ceb678826b9818d4ba3f45a488bed1 (commit) replaces org.apache.felix.http.base-4.2.14 by Carsten Ziegeler on Mon Jan 22 06:41:28 2024 +0100 - Log - [maven-release-plugin] copy for tag org.apache.felix.http.bridge-4.2.18 --- No new revisions were added by this update. Summary of changes:
