Added: release/felix/org.apache.felix.http.jetty-5.1.6.pom ============================================================================== --- release/felix/org.apache.felix.http.jetty-5.1.6.pom (added) +++ release/felix/org.apache.felix.http.jetty-5.1.6.pom Mon Dec 11 07:46:31 2023 @@ -0,0 +1,471 @@ +<!-- + 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. +--> +<project xmlns="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"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.felix</groupId> + <artifactId>felix-parent</artifactId> + <version>8</version> + <relativePath>../../pom/pom.xml</relativePath> + </parent> + + <name>Apache Felix Http Jetty</name> + <description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description> + + <artifactId>org.apache.felix.http.jetty</artifactId> + <version>5.1.6</version> + <packaging>bundle</packaging> + + <scm> + <connection>scm:git:https://github.com/apache/felix-dev.git</connection> + <developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection> + <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url> + <tag>org.apache.felix.http.jetty-5.1.6</tag> + </scm> + + <properties> + <felix.java.version>11</felix.java.version> + <jetty.version>11.0.18</jetty.version> + <baseline.skip>true</baseline.skip> + </properties> + + <build> + <plugins> + + <!-- Use a groovy script to preserve the META-INF/services/* files for the artifacts that are embeded in the uber jar --> + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <id>groovy-magic</id> + <phase>prepare-package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source><![CDATA[ + // make an output dir for the merged resource files + def slDir = new File(project.build.directory, "serviceloader-resources"); + slDir.mkdirs(); + + // scan each of the artifacts to preserve the information found in any META-INF/services/* files + project.artifacts.each() { artifact -> + + if (artifact.getArtifactHandler().isAddedToClasspath() && !org.apache.maven.artifact.Artifact.SCOPE_TEST.equals( artifact.getScope() )) { + def jar; + try { + jar = new java.util.jar.JarFile(artifact.file) + jar.stream().each() { entry -> + if (!entry.isDirectory() && entry.name.startsWith("META-INF/services/")) { + + // check if we already have a file with this name + def svcFile = new File(slDir, entry.name) + def svcSet = new LinkedHashSet(); + if (svcFile.exists()) { + // found existing file, so load the items from the existing file so we can merge + svcFile.eachLine { className -> + className = className.trim(); + if (!className.isEmpty()) { + svcSet.add(className); + } + } + } + + // read the content of the found entry + def lineReader; + try { + lineReader = new BufferedReader(new InputStreamReader(jar.getInputStream(entry), java.nio.charset.StandardCharsets.UTF_8)); + def className; + while ( ( className = lineReader.readLine() ) != null ) { + className = className.trim(); + if (!className.isEmpty()) { + svcSet.add(className); + } + } + } finally { + // cleanup + if (lineReader != null) { + lineReader.close() + } + } + + // write the merged data to the output file + if (!svcSet.isEmpty()) { + // make any missing folders + svcFile.getParentFile().mkdirs(); + + svcFile.withWriter('utf-8') { writer -> + svcSet.each() { item -> + writer.writeLine item; + } + + // finish up with a blank line + writer.println(); + } + } + + } + } + } finally { + // cleanup + if (jar != null) { + jar.close(); + } + } + } + + } + ]]></source> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>5.1.9</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Version>${project.version}</Bundle-Version> + <X-Jetty-Version> + ${jetty.version} + </X-Jetty-Version> + <Bundle-Activator> + org.apache.felix.http.jetty.internal.JettyActivator + </Bundle-Activator> + <Export-Package> + 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 + </Export-Package> + <Private-Package> + org.apache.felix.http.base.*, + org.apache.felix.http.jetty.*, + org.eclipse.jetty, + org.eclipse.jetty.version + </Private-Package> + <Conditional-Package> + org.apache.commons.* + </Conditional-Package> + <Import-Package> + 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)", + * + </Import-Package> + <DynamicImport-Package> + 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)" + </DynamicImport-Package> + <Provide-Capability> + osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1"; + uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard", + osgi.implementation;osgi.implementation="osgi.http";version:Version="2.0"; + uses:="jakarta.servlet,jakarta.servlet.http,org.osgi.service.servlet.context,org.osgi.service.servlet.whiteboard", + osgi.service;objectClass:List<String>="org.osgi.service.servlet.runtime.HttpServiceRuntime"; + uses:="org.osgi.service.servlet.runtime,org.osgi.service.servlet.runtime.dto", + osgi.service;objectClass:List<String>="org.osgi.service.http.runtime.HttpServiceRuntime"; + uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto", + osgi.service;objectClass:List<String>="org.osgi.service.http.HttpService"; + uses:="org.osgi.service.http", + osgi.serviceloader;osgi.serviceloader="org.eclipse.jetty.http.HttpFieldPreEncoder" + </Provide-Capability> + <Require-Capability> + osgi.contract;filter:="(&(osgi.contract=JavaServlet)(version=4.0))", + osgi.contract;filter:="(&(osgi.contract=JakartaServlet)(version=5.0))", + osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional, + osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, + osgi.serviceloader;filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, + osgi.serviceloader;filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server)";resolution:=optional;cardinality:=multiple + </Require-Capability> + <Include-Resource> + {maven-resources},${project.build.directory}/serviceloader-resources + </Include-Resource> + <_removeheaders> + Private-Package,Conditional-Package + </_removeheaders> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle</id> + <phase>package</phase> + <goals> + <goal>bundle</goal> + </goals> + </execution> + <execution> + <id>baseline</id> + <goals> + <goal>baseline</goal> + </goals> + </execution> + <execution> + <id>light-bundle</id> + <goals> + <goal>bundle</goal> + </goals> + <configuration> + <classifier>light</classifier> + <instructions> + <Bundle-Name>${project.name} Light</Bundle-Name> + <Bundle-SymbolicName>${project.artifactId}.light</Bundle-SymbolicName> + <!-- We need to override this from the base configuration --> + <Conditional-Package> + foo + </Conditional-Package> + <Export-Package> + 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.*, + org.apache.felix.http.jetty, + org.apache.felix.http.javaxwrappers, + org.apache.felix.http.jakartawrappers + </Export-Package> + <Private-Package> + org.apache.felix.http.base.*, + org.apache.felix.http.jetty.*, + org.osgi.service.servlet.* + </Private-Package> + <Import-Package> + 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.4,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)", + * + </Import-Package> + <!-- We need to override this from the base configuration to exclude the ServiceLoader capabilities --> + <Provide-Capability> + osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1"; + uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard", + osgi.implementation;osgi.implementation="osgi.http";version:Version="2.0"; + uses:="jakarta.servlet,jakarta.servlet.http,org.osgi.service.servlet.context,org.osgi.service.servlet.whiteboard", + osgi.service;objectClass:List<String>="org.osgi.service.servlet.runtime.HttpServiceRuntime"; + uses:="org.osgi.service.servlet.runtime,org.osgi.service.servlet.runtime.dto", + osgi.service;objectClass:List<String>="org.osgi.service.http.runtime.HttpServiceRuntime"; + uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto", + osgi.service;objectClass:List<String>="org.osgi.service.http.HttpService"; + uses:="org.osgi.service.http" + </Provide-Capability> + <!-- We need to override this from the base configuration to exclude the ServiceLoader capabilities --> + <Require-Capability> + osgi.contract;filter:="(&(osgi.contract=JavaServlet)(version=4.0))", + osgi.contract;filter:="(&(osgi.contract=JakartaServlet)(version=5.0))" + </Require-Capability> + <!-- We need to override this from the base configuration to exclude the ServiceLoader resources --> + <Include-Resource> + {maven-resources} + </Include-Resource> + <_removeheaders> + X-Jetty-Version,Private-Package,Conditional-Package + </_removeheaders> + </instructions> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.cm</artifactId> + <version>1.5.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.event</artifactId> + <version>1.3.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype</artifactId> + <version>1.4.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.useradmin</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-common</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-hpack</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.servlet</artifactId> + <version>2.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.http</artifactId> + <version>1.2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.http.whiteboard</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.base</artifactId> + <version>5.1.4</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.wrappers</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.11.0</version> + </dependency> + <!-- Testing --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.13.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.7.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.log</artifactId> + <version>1.3.0</version> + <scope>test</scope> + </dependency> + </dependencies> +</project>
Added: release/felix/org.apache.felix.http.jetty-5.1.6.pom.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty-5.1.6.pom.asc (added) +++ release/felix/org.apache.felix.http.jetty-5.1.6.pom.asc Mon Dec 11 07:46:31 2023 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmVyvWcACgkQP89Sn/Ly +egYyog/+MCKmWf4krMkSUq2UqMlU6RhMVbDV7dI8nVCN3wTILgPsedaEExIOj5V7 +XDee+zcznsJF3eb7AguclsogQQ1n7W/dYBk1JGToMFMnOeE4ffPhRlHuoVocQIX7 +kZhZ8xw14FvqyV22h7EN0+O98FZALAWRzOCIGrfpjhHwBEZlpP1GumqZaPFrJByF +t8cgttXsgsB0KMrSJi5U8gl3KxxfNC3WFqHWFq3puRMwADtQiPrBsiiuzjqPVDdz +67X7DZnFf842JCHrDTakMPXrdQ+sGuck+gvC+spUrpBEuF9QSq3+pLQPA8XspxPC +6Wnee2IgzEXiR4y67JB3xLBLT5NWPaQy/MWaimZ2uAEzW9C1Huy6Qg2RyHase0VU +7NZgz40Jmqwn/CQR44YtsGu2SWyodCBmGE9h7xW3GbjJc/ZG2XnGHpOJ9yKs1azn +B/wIubWXyHajP+f0jfC5aUW5EhzPexS/mRMlDVHdnn2guUplBTlX3LclfFgrn46g +t3cqAhwUJ3+MYCoZRltzkhHOdsmr3xDACMLiiNK5VyU+6BkDtRDdpPqj9HXfsbhT +77MxMl5MYWA2lXyXDRn79slM4kUUuvAHKbA6hxaFVO92Jz+VhzmmWWS+mRmuvBUV ++J2sQQWSBWiL9g1h20b0YAuADUM6ChrXfmuZMoP7YT7ftzlLOhg= +=G6f2 +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty-5.1.6.pom.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty-5.1.6.pom.sha1 (added) +++ release/felix/org.apache.felix.http.jetty-5.1.6.pom.sha1 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +9a371fe561e62a8a99d4ba3b0bd8a345bddab48d \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty-5.1.6.pom.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty-5.1.6.pom.sha512 (added) +++ release/felix/org.apache.felix.http.jetty-5.1.6.pom.sha512 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +d713e973c91419f4c0e2894e278b8945b5c75ce81c8f1efff980c0387d9e6abed86c808178808b36f648e7ce837037b14cb3eb3a09b6b6883fb5fc799754f073 org.apache.felix.http.jetty-5.1.6.pom Added: release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.asc Mon Dec 11 07:46:31 2023 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmVyvacACgkQP89Sn/Ly +egaP8A//e5SmaeCA1Lnb+H/tjxX9DEU4IidIydV+mttq9JQl+T9uGjTIh0emaLcB +UYjV4e70CZVOf+SzL1QTC7FIkH2jyRrMBftc8INTRD3jI3XiFsYQ32flT6Bx9kYj +vyCMrPW+M2ellMKbfT0/wZiPb3fR7qeHxs+cW6zfaiWz2knNwQx8459WSE1plk30 +rNmZJD6GiYNtUXUg0cshoeImwJAz1MAb5q8AcVIjtrQR908gn9yWzr3GhVwzLYrb +fOJ88yKZTlgtAZIjCI8XKRb9sEEvThrG8XstQ9N7DxcfRz6skGdjlHjNJHuq3zkr +d8Aj31xyOMcqJcgBvGDdVPR/xyvJ4VCPK1YDLW8aboysyJ/RooF3aurT0ijXGKyT +VoOFP9hJMICeCVDv8Firvy8w7qIRFBONKSiB0k2nYAYA6WeqRivo120L8OaaOxry +Q/eDGlOmoxHaQvaXCZq7YFn8gAMIVE1T5zo0T7PxIVIHJhBbVoZecWHUt46TUwQ8 +BgbFwHjakySWuxHxo9DWSwo/2k1DySrBSUbg1ZUvQgQminLhk0tBrZ5xhvvVtJSw +9I9Mk0D6gvYiJmaGw7/OIAsIQUE+D2wEPjWQoIlE9gdxNPwDmH7qI19OWu04tI0O +aYITkVV2lRbLFzx+aVn6SMQNNujkexfQOM8Ab8rVig+GtSqteGY= +=4PR1 +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.sha1 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +204843561ea0041d083cf5638cfb6eeb6691a5bf \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-javadoc.jar.sha512 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +ae74abe0ba5a3a0f68fb5000d81595b460779f69d8166c979a71f36ff2d19c62a370d627233d229d66f5533bfe4766b916d8c6f31a07111c2ad0f8d6e5579526 org.apache.felix.http.jetty12-1.0.0-javadoc.jar Added: release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.asc Mon Dec 11 07:46:31 2023 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmVyvacACgkQP89Sn/Ly +egaE1BAAjJpIXcacVO1dJe9Rqu5qCfTHnkDvRTjLUr6RisH99wjkSXgaMMfItkSE +RwpH5LPYaWk/ANDrIckY++fIH6EEDwnNr5faJGTrk0jsAXCasCWs5nQTGO7pqmf5 +riDHOy73Z21YFyIUwsqyAWazm0Wx43TCdUJg2vzgzHBuI/IB93d1jXhsaJHk3m+e +R/i3pIEu1QF20xep/b5pBMB/h52O7YcfQZ00uT0n9MOzbtVVwfY3ywWEwqscbVDl +iAfNWDgw3QCBumc4ahElIHS6M7hQXpd6o8tA90NxtN4exx9F/XeHt/ciqNW70Bw5 +GKb716SEIuApaXXWtp7Hdu6eNqIFceOY1ckZJ0oE6dluik3xzqy5zC40iitam2gL +mS+T3q9nSLZkCX8nFah11xo2OlDQQDgrfUgPCl/RWnr7uuPy/889zzzaEJPFrRh0 +cNrIUhodmyo7RBoT7yd94Ac8Y8leDIMnOQFU4c58ONnxeoEg/fLkpcSV40cBOIF1 +w+AFdCCi1q+CWmVkYWXvAfaOsemif3EU0IC7LOP1I26nkq3e0x7fCrteiviXzU62 +QygxKfitpz0tlB/Yj9g7yf29VgJSUnPKYap0XohlI6m7KekLoyf2svVch7om46J7 +KgMPK2MUIPPur6w/BhhGuUKqq9jrkHWukl6gDyw3ikoCC+N8QSo= +=BZVd +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.sha1 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +1328f86c7f4c3b380f655122e896a4f31acb16e6 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-light.jar.sha512 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +08fa69b6938609f6d1a6a968f1af651021a06370657bcc8e43ef375c8ead38e435e935d216c40d5cd04a9f9e8a619c6fcebaea015b464a802785ba4dbbb852fa org.apache.felix.http.jetty12-1.0.0-light.jar Added: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz ------------------------------------------------------------------------------ svn:mime-type = application/x-gzip Added: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.asc Mon Dec 11 07:46:31 2023 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmVyvaYACgkQP89Sn/Ly +egYxjQ//ctO2H3wqebpTMtXWwsASZNzsd3d0DEIujT3gK/PnyGWy/ecu2edHd+Mt +mID8cKRuEbCeJ8bYeWCmY2zV8RdEC/dQARwnkD746ay740l8vwh5/snp6xPhCyl6 +mUSDTKGdeBGpF5fi7Hdl4Zcy7o0n5/S6eYPofuSeiSxmPmcTj84KufqKN25bbiQ4 +0xM1mz9PgdhOkcKxYRmjPcJAXi/bzokL2eO8NVC27uCYMN7iWXguB8o5pkPjxjXL +MllNXKTpt8qrVNBWdeHI3eU0KGF2hxZtFd2Fx9jVZtKp/JPoFgOk5L9VPBhiaXvM +GzV0HbcR52Qe84HmeO572feBK/vruVSjft8JVk9JyC5DswBf6zg8XGUixRUFW9p7 +s8jR/cR4DNlcLtvH3hE5kbT3+yrVWHnWinX3N7uAcDiEXs2EgHh2XFOtYKPT7v1L +sfgi/7HPfmXbmy9zkk66gaYPEa59tScGjV0r3knQpUArqyep3kTz65QWm5AeWxWc +bGG0UJpv9eCu4PoEaXa+lls6DiimUUPEQ8+Okd1BSLgP9fEbCuC1lbUqKlFoqWfN +uONKoIJApgfdOyxBGoL4nEW8cpPRS+NaROV1L7Ym6fs5Zyee46GlP3qjg+TjBzZ0 +hMEvYB8crzNaNEFdqUlng9GOOrjQtVTCnTcR1Eh4d4nGpA1jff4= +=Czl0 +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.sha1 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +3cf15054576591d96d6f2b3a0d7e10d9d0bbfe63 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.tar.gz.sha512 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +d5bff3e989437f479f69b470b7e9464bfa28a0b89a2ee3799e4c7b84d7bcdf0c179bcb77fffb583c8d196509084c9c1af17bae96c25346b90df698ba4fdfa74b \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.asc Mon Dec 11 07:46:31 2023 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmVyvaYACgkQP89Sn/Ly +egbdMg/+OgDiH/wqdNQfUDLWhwn+ZpzAvW0kISKAt6j8fyQjs++dacGDxPxOWEZR +9IGQle/cZFJAP1eMdgJzXy6Ux2vEQ3vEkxES+ylQqKrJHWMmaRmr0CwtGFG8mnyv +K8n6CUsldJNQiJImj4AbTzmjaFULhFtxE0xRKVS1pMnNfspFyrTKmCPf8HN/QMNo +5zwG6h9+m+5/BGRQrhEq6/j7SkRIwiVd+hCUeIXrXPy4WK7QgZorGEbnzt8tYmSx +5STAdjjApR49If/kjbg9nisIZmKYw+fSdY6XRG5I3OREaDwrC50ARDsCnf+55wgR +GFx0A+U0YQ1fqu3TO8dPv7MyMrv2gsQn56Oq2wWugAF7gOKKIuqUmJEV2qQHVtSl +ShA6lVeVunO98T3gTO6N+lK2PbH+KlgQYNga8wBU9eG/IPhe9r2tV87LuNlhoDWj +96xPBTXm3cIdb5r3ELBAiWdNsJ0weBmhfNMu4vHfykXhe4CGGx1zFPFWTIBvKYK9 +D3LRu6p2vLerww6XQ1bOwkh8zYXhNCTQLOomHLUPFDHZuw+YU5hjrXwDF3YG4LuR +tzWybnOfKx0gHfU/Qcnd+3Aku7G8XdKuqpxzyiZ3HjhLYLW1YoVycxDOO1uFgao0 +h47VnRlyrfXp1bUQdskwPkI1EL02+5mi0efzk7mCHacJDyh8P0I= +=UBYk +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.sha1 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +a140698513ce30ee3c6d466659b8e114498e9065 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-source-release.zip.sha512 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +07474633e59b82c7729e41565acf911f71edc89a6dfdd79cce5fd221c8e48f40294899d5d4334724fa7235b117d297db0970648bd14fc467546bb044d18a68ba \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.asc Mon Dec 11 07:46:31 2023 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmVyvaYACgkQP89Sn/Ly +ega8qRAAqOBCKDAq1yuhapvs3REhJzZyv+xkzDmZaucEZLrpO+vKnY/s7SuKG5ei +/3aoQYj6CtCOwXls0U1IqRc3TG2pflCYEsMfYTdl1j3AjXym7pyb0klYJ/uZaKny +QwR+8hnxaCgEj8TOqNLp0WjgB+0YUPFU76eS0EhQLtFrH64mOb7r6XXoj1NN3TJc +lXqyRX+YZBwPHMOGjsxVK65pf2FHD5zuIODdbFoIQLYNb1nmETht7qGEeeFHA+qf +cscAzN9ttdCgHrFsn/frPD80yEC0+fWG44+d+v8BmuKgzk9M29MVTiAvZS0laBjt +CXWhEfhd1YdtkVooSEdEa5EBLUeLsV005dUjdP2DpyqHFDNcyV0NhqQnJ+B5HIvu +PRnSAiUhkGgzmdD6tVpmcgR9AmbGG9E5ByWdcrAYXCi5UzsObavDlM1exX4ASpNq +fjkQqnOtEoGVigtzPd8ZQV1jyfkNl9jyyEeS1/aRePSgKjto8r/CGW0Z4R0ZPwk9 +isxqPYqr8YfH9z2GD9AfiyJWISouSQhje8Cc2nGqh/pud1iMztBC9zf8GCkN3qoC +hchDV1pEcoGYMz+tQ6AVsXCVy9nx7NRRtQkzBAtsHHChX1pI+JQZrCM37dQudNhD +wJ3ylizoKAvLk7V7xk9y1GBK44Ss30erMBdBuIZLkd4NHpktP2E= +=1q8U +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.sha1 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +9bc0247c07cf43ff4f2de78d731b403dae94be91 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0-sources.jar.sha512 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +ebc09d8cdb3973e67a58d5f7a38e9f059cd601c788c61054db63e193f34df5ea0734b945f16f4f34810a75cb614ed5c15f6fe95bb2a714435c7ffa462a804039 org.apache.felix.http.jetty12-1.0.0-sources.jar Added: release/felix/org.apache.felix.http.jetty12-1.0.0.jar ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.0.jar.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0.jar.asc Mon Dec 11 07:46:31 2023 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmVyvaUACgkQP89Sn/Ly +egYyVQ//cr9y9F398i3qXIu+eHKgzW3ruzkzzeB8YXKhaPK5Ue22U9QRfb8qBK6O +9+9C1pqxdWxq19FxbRakOdVBZVr6nLcuJPhXw5yLWJ/Cgft0JuIReupf2ShhYrT7 +Ed/KLeHL/DmNAd4R5fPD4gQKyZehijmba2iv4t/4aq+0YFNK/pYe4lF1Wx/ILjQ+ +je30BwpyNmBSc7CaHuOYv+ZW0a81uQDYo3ov+zaf4d2GPTYeyDpLcSyOirFmjvQc +5bo80Q/fH3ugAIA73Zq74fzdn9E9+EdmVuY45OCEqMqL5GXSEGYztJ4dtbgbQ8O8 +pQnk52IRm1qpb9pxS3+8nHQCMQgsi+VXXQIdTNtRrP6XGkUdL8+tOt+43u4vfFM0 +kO2i/zwNe+GCdyghARekDTuxfNoSdiOntnJnyW0sbVf0mrCHjC6vwgkxMd5m2m0o +rI0bmNTEf1akkxPfx79Jd3QvjDz7BAVphJgEnLI7dXyjyuqUTVUCcIxQp3mPFoxb +JkH6OCTfE7/J4Y9UJKxaWN6WIrkPAjk/BdrV2lBkNplLLWPZyDeugroUqYV7ifL4 +/S45xKGGKkRR+p9F4a5QFDoP2xcj3d7izbaJfX+vVQUfFaHhD8qOB37gUg8dFSnC +A3w+hh2s6zBuqjWeafyU/vcohJP0zYJ7skDcWQXPniyszHk2eWo= +=CuXw +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.0.jar.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0.jar.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0.jar.sha1 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +469cf4099263c4011fd374434e5e257bb61c973b \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0.jar.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0.jar.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0.jar.sha512 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +d63c4e5f31ce7780e244a505dda198fbf0c23310ba21929e5d59d6e8a3d0ef1354bd76a142738b9e2c26a18d5e26026eb29e1bab40ba9b286239b2cc8bb8395a org.apache.felix.http.jetty12-1.0.0.jar Added: release/felix/org.apache.felix.http.jetty12-1.0.0.pom ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0.pom (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0.pom Mon Dec 11 07:46:31 2023 @@ -0,0 +1,475 @@ +<!-- + 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. +--> +<project xmlns="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"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.felix</groupId> + <artifactId>felix-parent</artifactId> + <version>8</version> + <relativePath>../../pom/pom.xml</relativePath> + </parent> + + <name>Apache Felix Http Jetty</name> + <description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description> + + <artifactId>org.apache.felix.http.jetty12</artifactId> + <version>1.0.0</version> + <packaging>bundle</packaging> + + <scm> + <connection>scm:git:https://github.com/apache/felix-dev.git</connection> + <developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection> + <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url> + <tag>org.apache.felix.http.jetty12-1.0.0</tag> + </scm> + + <properties> + <felix.java.version>17</felix.java.version> + <jetty.version>12.0.4</jetty.version> + <baseline.skip>true</baseline.skip> + </properties> + + <build> + <plugins> + + <!-- Use a groovy script to preserve the META-INF/services/* files for the artifacts that are embeded in the uber jar --> + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <id>groovy-magic</id> + <phase>prepare-package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source><![CDATA[ + // make an output dir for the merged resource files + def slDir = new File(project.build.directory, "serviceloader-resources"); + slDir.mkdirs(); + + // scan each of the artifacts to preserve the information found in any META-INF/services/* files + project.artifacts.each() { artifact -> + + if (artifact.getArtifactHandler().isAddedToClasspath() && !org.apache.maven.artifact.Artifact.SCOPE_TEST.equals( artifact.getScope() )) { + def jar; + try { + jar = new java.util.jar.JarFile(artifact.file) + jar.stream().each() { entry -> + if (!entry.isDirectory() && entry.name.startsWith("META-INF/services/")) { + + // check if we already have a file with this name + def svcFile = new File(slDir, entry.name) + def svcSet = new LinkedHashSet(); + if (svcFile.exists()) { + // found existing file, so load the items from the existing file so we can merge + svcFile.eachLine { className -> + className = className.trim(); + if (!className.isEmpty()) { + svcSet.add(className); + } + } + } + + // read the content of the found entry + def lineReader; + try { + lineReader = new BufferedReader(new InputStreamReader(jar.getInputStream(entry), java.nio.charset.StandardCharsets.UTF_8)); + def className; + while ( ( className = lineReader.readLine() ) != null ) { + className = className.trim(); + if (!className.isEmpty()) { + svcSet.add(className); + } + } + } finally { + // cleanup + if (lineReader != null) { + lineReader.close() + } + } + + // write the merged data to the output file + if (!svcSet.isEmpty()) { + // make any missing folders + svcFile.getParentFile().mkdirs(); + + svcFile.withWriter('utf-8') { writer -> + svcSet.each() { item -> + writer.writeLine item; + } + + // finish up with a blank line + writer.println(); + } + } + + } + } + } finally { + // cleanup + if (jar != null) { + jar.close(); + } + } + } + + } + ]]></source> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>5.1.9</version> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Version>${project.version}</Bundle-Version> + <X-Jetty-Version> + ${jetty.version} + </X-Jetty-Version> + <Bundle-Activator> + org.apache.felix.http.jetty.internal.JettyActivator + </Bundle-Activator> + <Export-Package> + 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 + </Export-Package> + <Private-Package> + org.apache.felix.http.base.*, + org.apache.felix.http.jetty.*, + org.eclipse.jetty.version + </Private-Package> + <Conditional-Package> + org.apache.commons.* + </Conditional-Package> + <Import-Package> + 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)", + * + </Import-Package> + <DynamicImport-Package> + 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)" + </DynamicImport-Package> + <Provide-Capability> + osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1"; + uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard", + osgi.implementation;osgi.implementation="osgi.http";version:Version="2.0"; + uses:="jakarta.servlet,jakarta.servlet.http,org.osgi.service.servlet.context,org.osgi.service.servlet.whiteboard", + osgi.service;objectClass:List<String>="org.osgi.service.servlet.runtime.HttpServiceRuntime"; + uses:="org.osgi.service.servlet.runtime,org.osgi.service.servlet.runtime.dto", + osgi.service;objectClass:List<String>="org.osgi.service.http.runtime.HttpServiceRuntime"; + uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto", + osgi.service;objectClass:List<String>="org.osgi.service.http.HttpService"; + uses:="org.osgi.service.http", + osgi.serviceloader;osgi.serviceloader="org.eclipse.jetty.http.HttpFieldPreEncoder" + </Provide-Capability> + <Require-Capability> + osgi.contract;filter:="(&(osgi.contract=JavaServlet)(version=4.0))", + osgi.contract;filter:="(&(osgi.contract=JakartaServlet)(version=6.0))", + osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional, + osgi.extender;filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, + osgi.serviceloader;filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, + osgi.serviceloader;filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server)";resolution:=optional;cardinality:=multiple + </Require-Capability> + <Include-Resource> + {maven-resources},${project.build.directory}/serviceloader-resources + </Include-Resource> + <_removeheaders> + Private-Package,Conditional-Package + </_removeheaders> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle</id> + <phase>package</phase> + <goals> + <goal>bundle</goal> + </goals> + </execution> + <execution> + <id>baseline</id> + <goals> + <goal>baseline</goal> + </goals> + </execution> + <execution> + <id>light-bundle</id> + <goals> + <goal>bundle</goal> + </goals> + <configuration> + <classifier>light</classifier> + <instructions> + <Bundle-Name>${project.name} Light</Bundle-Name> + <Bundle-SymbolicName>${project.artifactId}.light</Bundle-SymbolicName> + <!-- We need to override this from the base configuration --> + <Conditional-Package> + foo + </Conditional-Package> + <Export-Package> + 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.*, + org.apache.felix.http.jetty, + org.apache.felix.http.javaxwrappers, + org.apache.felix.http.jakartawrappers + </Export-Package> + <Private-Package> + org.apache.felix.http.base.*, + org.apache.felix.http.jetty.*, + org.osgi.service.servlet.* + </Private-Package> + <Import-Package> + 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.4,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)", + * + </Import-Package> + <!-- We need to override this from the base configuration to exclude the ServiceLoader capabilities --> + <Provide-Capability> + osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1"; + uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard", + osgi.implementation;osgi.implementation="osgi.http";version:Version="2.0"; + uses:="jakarta.servlet,jakarta.servlet.http,org.osgi.service.servlet.context,org.osgi.service.servlet.whiteboard", + osgi.service;objectClass:List<String>="org.osgi.service.servlet.runtime.HttpServiceRuntime"; + uses:="org.osgi.service.servlet.runtime,org.osgi.service.servlet.runtime.dto", + osgi.service;objectClass:List<String>="org.osgi.service.http.runtime.HttpServiceRuntime"; + uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto", + osgi.service;objectClass:List<String>="org.osgi.service.http.HttpService"; + uses:="org.osgi.service.http" + </Provide-Capability> + <!-- We need to override this from the base configuration to exclude the ServiceLoader capabilities --> + <Require-Capability> + osgi.contract;filter:="(&(osgi.contract=JavaServlet)(version=4.0))", + osgi.contract;filter:="(&(osgi.contract=JakartaServlet)(version=6.0))" + </Require-Capability> + <!-- We need to override this from the base configuration to exclude the ServiceLoader resources --> + <Include-Resource> + {maven-resources} + </Include-Resource> + <_removeheaders> + X-Jetty-Version,Private-Package,Conditional-Package + </_removeheaders> + </instructions> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.cm</artifactId> + <version>1.5.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.event</artifactId> + <version>1.3.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype</artifactId> + <version>1.4.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.useradmin</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>jetty-http2-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>jetty-http2-common</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>jetty-http2-hpack</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-session</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.servlet</artifactId> + <version>2.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.http</artifactId> + <version>1.2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.http.whiteboard</artifactId> + <version>1.1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.base</artifactId> + <version>5.1.4</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.http.wrappers</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.11.0</version> + </dependency> + <!-- Testing --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.13.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.7.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.log</artifactId> + <version>1.3.0</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> Added: release/felix/org.apache.felix.http.jetty12-1.0.0.pom.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0.pom.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0.pom.asc Mon Dec 11 07:46:31 2023 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmVyvaYACgkQP89Sn/Ly +egZ9yxAApF/HZDe4eVzZWjZzwHeD/v5LilwFkdS7Zgr1yWTOWnLjxUj2ZJrcQshj +uL5LpR5q4g3uX77le0V2mC2e9PO34WU7vLA2FnnP2EDnW5JMPIcHrqIspYNTQOdW +c2x7bbFaleKYokZeRcf1l695D0XO3BSjSmY8Onr+xq0mMoLR0i6pcxENDs+46juN +QpAuAnc24UF8zLZqiC3RdqJzOzNM/CFk6rNzIwUbqJPuB8UUu7JodoK/8Svx/i6x +GbM82RlA3iuyAg+6cmMrBNUOai2iti7cqqMXsWmcrt0WpLqe9NpQN+hkRc8kGL4j +Cru7CViw44oPaQhBGb2rKLeGrPzGwdt252JLce6r15ILE1GmJjbFv8AiDZIUSfmT +kJFaT6jEX5cU7y6PC9fOVin7bIUHZpqqcGLiXJi5VJtaycpecLXv0R1mh9hgSNnJ +D3cgWohrQr9G0WzGbPJl4Ndh7t1o2nEx1H+YI5rsWsM4Dkblf/SQHnDZeVD+FO4I +5ku9L4T8O5Zp8U1ZPDPfJFzjFyt+we3IUeWX5Mn7KhmQe3THR7jyDyTiW9GQduN+ +PJRVsGh+rsE2KtSSiStX5SnkuUAv7u0R1P2F1qlRqLLEH0m9drPZJaNFhYPDd0S1 +Q+e/e+Ty/d6E9TxwH0C0oQgWz/qMZ14dV44Cz7U4NauuPyQMMdk= +=vvxB +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.0.pom.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0.pom.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0.pom.sha1 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +fab0391d32426b2f10722432ec16ec0829c03d71 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.0.pom.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.0.pom.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.0.pom.sha512 Mon Dec 11 07:46:31 2023 @@ -0,0 +1 @@ +3b779785221f58fd8d65650c018f49f685b28b1d8b0bff833ec7bc7a423697e5510aed0d97f3590aeb7c8652ece1ee664c89c7b0105887f80ad871d852903889 org.apache.felix.http.jetty12-1.0.0.pom