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 @@ +<!-- + 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.8</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.8</tag> + </scm> + + <properties> + <felix.java.version>11</felix.java.version> + <jetty.version>11.0.19</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.6</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.8.pom.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty-5.1.8.pom.asc (added) +++ release/felix/org.apache.felix.http.jetty-5.1.8.pom.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAgsACgkQP89Sn/Ly +egYH+g/9EkYCfdYgIHe1C5L24ulhN1TizMHMrNMgDzWwW03LAz3FXIsrIOv4to1C +KKbADSxxdMbL+J4BRRvQwnmWkCKnyVMtRaW2NNoRSzNH/yo0y0opQsjdAVCjdbWx +4Kv7QG44ocKxmuSCJ05yJagV/D/WgWNg5eucAsDX3P2HknIQTIjf/56pPbdWrvDc +KqNQ/udvQH+UYBk4Vcq0sjz8eqYZD0cAu7E8PxuzeomK1rdp9LWuqpxlXS8U6VM2 +muB+a8qlHIxmxlFabxUG7NNcsL6HjYTrtErIMd5y6pUQDeOztmQUEE+JcK4MxmpM +HcuoOSaaMs50JaIQaaLmWFzTpPsvt72fd4bL07mPoZjNXHISr6mn9LQO24Y0xWpt +lfh7Y0a/G+TpDUIsW2XY0qOref/vgjeMfdxijFo+hXaamrVgaiTsfOJ/BAaJwkNo +lU/d13MVciPQrGlHXtvsCiYZRmzllPuEBXKiixhw+rp7mzyeEu1GiWSoWFPnoqqe +aBqCU8l5thop43pw0yEeJebG4nporTi5suAnZcbzXyc6/bZkUg0IY7XOZFP2WXop +HmJGCoEdh77i493SkVDIqjh22PGyyprMkgiQrPiDgNlhtHgNw+EQ1eO4O9STnn/X +mU7nvz2aWj+VZpr0rWCRv11RFoZRNtIhc60cJW0pbxCuNFcWEP0= +=vVc6 +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty-5.1.8.pom.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty-5.1.8.pom.sha1 (added) +++ release/felix/org.apache.felix.http.jetty-5.1.8.pom.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +a2002f3f2acf6e4f151b3c1ec3c4506a20a283f3 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty-5.1.8.pom.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty-5.1.8.pom.sha512 (added) +++ release/felix/org.apache.felix.http.jetty-5.1.8.pom.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +c419b7f0714f04e09c115e1490e7b1892d41d09cd2a93328b31c234d8620df075741d7f258645e86822ffcec803a0bba03245c6ddbaaba1961bcd11180ef38c5 org.apache.felix.http.jetty-5.1.8.pom Added: release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAmEACgkQP89Sn/Ly +egbOeA/+PXL6bwueCsHoTJyynrJ1QOxpGNCvZeAApHvm6+RqvSSy8BCWXCAOBH4m +9yj18rVpc/FmmMsQ062mp2gbcFZkn+wRLM1YqBj6tgoaMFKP73Z2HwlU0gHEt4U6 +WOZjCWw5IxZJFBoZcaFQMQ6rk7od9zssRY2JtAWVCUaxQEZWax4NCk9WMwqXXLDZ +PpEv63qdIVWCGsI4H+1zxIvl4VLXGY46ifUvlmC96BLJqbYdpd0Bp0yNZloD/7NQ +G68uYeS09F81k3v/TcR+QcineKZoe2/DX/yTVqttAdWUqMi05AlwjIe0qvL9+b8w +zxekMKlCnaR6io33qC4xl0tCBaU5ev8J7UdSDPS/Hw71gEEtFaGl4DjQDHcFe2bt +T+UEyx4kMGODeW1oc1sV3NEUivh87Pp23Z5bFu8nC7UqSdPynKkb6BkS4+huaf5t +Y6hoMgUhA1nwxRdh3s7WcR/IbNJsGJKeej+ARM7wZ7GqRG1dPP03dhA9UvKeyVEM +HBmt5Ul+Iick/bD/pq8V7O2/qieVl82mtLHmkTM7oIXP6nonF7CYlVFt6+sfaLqq +pSm+fEZET3oCxjADPQ4W68E3APPG5AZMVD5fFR0LxUmGoSpEMlTbEkNL0SA2AUhX +K4oY1WsEIDCTnYAEjq141jnbjCvuyeBD4FIhH2u6BD+T7tjTpLM= +=rlRA +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +055549f810d9fb204d573c4d7a3f00bdb78a88a0 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-javadoc.jar.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +224e27993727e13be282ada14e55f5872e31f32530a5cca0b002297f34c355f2e26e58ac3c701c0732583ff987d1ff67244c16748a91d77eb6f5b7ec531c43e0 org.apache.felix.http.jetty12-1.0.2-javadoc.jar Added: release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAmEACgkQP89Sn/Ly +egb8+Q/+OsPvUJdObrNwfZvTxBhiIFHiMLTcGGc0oHGYxO2Vrs7cBi8dYJ6owvFQ +DNl4Yl9Eid4Ta8Is3ITKaQwlRmG94dke8kMa4gED5Jpa0vqFOlVZPJ2Y/tU/M+ul +2z1195p+vxktaNqm5LCQrJZUJBZfNWVoCXH9rKv3KdqiGMz2ogOqCQ00XUmmPAhF +MUy+awqDmccwXD7K398Qo/6lWm/z5zLXuTZlmLKsvNLKmfVv0A3Nw/3x24jIXqFY +5nIccszt3igFNQRFJOFrB0fyb0i/afV6jUCF3Lsn7A2TC5CP1tjFf0HXXhhj+SXu +CNflqYZlDAdfEWO6MgvZ5GazyJtNXTvWF7Q/dtk9Y/sCQCwJpgtMZQiRzDLEV9k8 +g6oKJx5DtEZuq3i0xb6YcDS2JI1W63HhlXPJvT6wmNXf51XGSiRMOgID+UlHkASE +KytG3eMRpfl0RVMtOGhW0ci7ul4+RB3O/79uDLLKweC+vPC2vRhH5h/WpA84Vgu1 +31ZAwnACeSiLctSjwydBdIZ0ntcbCqZ0ZJgTINHvQ4v9DgCrug0ZrTXbC3DuoJlt +oYDsRRIpxEWpgYGc/zqc1bk+xrmVm5AOnYbqqrDs08vcPnEX/QXBCmvW4bWN+Kdl +0HAzpKFqy/3vww6CLChAcQ/4P9E61uYEU2JFrE49tw81p7VMP8M= +=tClk +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +adab64029fcdc9e5aaf35a980571ea3f9ec33789 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-light.jar.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +7e8f2d5e2c3931bacb371bee958a461f21c0a1380174054eacb1057e2e025bfdb9db660fe2af75e391e84b1a6c4ae889c5eaf99ef60d210944623a4547e7f819 org.apache.felix.http.jetty12-1.0.2-light.jar Added: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz ------------------------------------------------------------------------------ svn:mime-type = application/x-gzip Added: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAmEACgkQP89Sn/Ly +egZeQg//bRA/4hdBw+h7KWD3TDC1P9rGqSPxPgIPqurSZjgyxSqfPzCDBnfWlf2m +TB6YyiITaOEP8qVR+dO/mI9AXVBwYrbXTVJ6Fe11Zsw573x59ZIq6v/ejzof6x0U +GClM1mKKphHDW2PP67GutB95cCpAoGgTn8uCcAYDGv5uxjq/aYws66EXi6eWnWtL +Yr5w2AkzhdsV/yVkcVF17Lp42r6BqloiR7Lf1eddtkWuyG4kveXOOdbjDHJnFahr +w8HfQMfXhXhuQqSviLzco6jWV4xm4RgYW5wXRqB3m+530SXibeZDrRSL1M3d50VV +uLY48mQpL3DrJObHIXp3oMZzkUCBpfM9P12yTSBdSkr6PadKc0uivcs2Nwa5d4gn +8hCThLvsjz24RhCfvMYjEorJ+iOrsypskXMxRBLmeODwircpfa4XI42wpUtbxujC +2laFSbKSutf4SAZ76uLBy5S8FnIgs3f5fQLg+cPGpXCFsyJ5/DGY6Rifsit9OJRU +tgiThk3FaiMvlQWxwOiEhmnO+k1kfJjQMwhFkb9l5qWVCHDSCZfIvG1uB43NQyG6 +M5eL8P//BFeT8+aPOGEZkUMU3n6kStsVyOanEUvyDpnBgkhwZosjx4OJ+ZZ9Qwh1 +jBXiexhQxhyPFEw9X0cF9xX4u+p25WE1XvC671kpMJKdIm3u3FU= +=sgeJ +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +c5a4319c2533e24699bab19b60bd7614cccbe279 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.tar.gz.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +1212538c7b6a6f0943fb5ed42d3e2731b7942f83f74d5a2b5f1a16a13e15c89c987cfb5d117813a2d0f44edc8dcd945812eb173053a9e35cd773ca4f489a7175 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAmAACgkQP89Sn/Ly +egaDdhAAhP0Jjwt8vr2Iaxf2RQPTN1vtLxeDgueFcHN4SToVaearg2gaWpp5znPl +njiCDKSQjK40WFZddXYl8GcroxRi2XNtnNT6Gr9F+WHeHj58Cm/EaYoIIg79MQp5 +QMQxG+r2ZS425FNpaPQ7boiI5ZTzIF8OpSnRVwn9eArruSWWjvqnGX18gZiOgqDl +SuYZTNKYoSMK2tE3beQtoeY6vA1jTXf01rolW+T/LHbYZaitOQ1v49pRY+Kfy35N +SvS+X0cliqJ04HD4AeeeGYcizMHxxJ1blirtKtC842lpq0e2gx3H9z5960CDGTUd +4M//Vqstw3yo0RGsl5d4lRqnX+rBBPTgbdp5n2ZuAoZrFqQ/lEYQS6H+fzDB3XPd +yeEb1D4UVZlQXN/o7KN/4k2N9wQ2qXtwEjPR26wy8R3cc/FlBNgCQOkqLfqCn7ab +iIjeeqfXSN8pddr+kBtL9dSA1L82AOezmaiTORKpt/d2or7Cvswg6Xj0ewAlj4X0 +8uX9dFDgJ0XNyXeKL2nC3DXNSOo338b2wrAErtPVWY2uZYCXi8hWrEPw+vK9yf70 +/lkR+NqjscavmOaHHWZ62YbBrOfmMreKelLp4nLYA+5kS3rvWtWOAD8SLp9fPC9m +KoHqkwGlPtDIV0HHifLvr1VGTwepscm1F9OmYAIHeskesLeYNk4= +=FOz+ +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +f3e142945dff14a05b5e3ea3cb248009ecd2ad99 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-source-release.zip.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +a6acaa9ff32d3bafcf64e6fb38b1a77638b43804a7ee04ccb7f0ba8cebeb623260cfff3971252b400ec89ca0119fb61fdfa5d0cf364226f04cd1d85d2d9caf80 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAmEACgkQP89Sn/Ly +egbBkQ/+KOb6/hTwxMA/68phRd0rvOiqdp0bRH+Us+PBpSRrMxtYG3MmyWlT3/h2 +E5HjBWDjMYdURO5XnhOObx/zAnIQ2JWWH+S1E9aPDEEr6+ACCHeQL7ACE15o51N7 +C1Ko3E4FrFBvhORA9idbMGpfkpShggB9YZkKsf9WdvAJRAftmnHZgKg733Mt5pxK +y1sRtL6nmJeUPiXAS+XX7r62FBHxpNAs2oLxgp0WN0NPgvTiaXLL3O7mwb/bvQvI +dwzeNCEy2mxFTAbnmN5Wn1c1+y1rYAs1+KzplGODeD+k4N1L3KFsVqV3K0NHIgnA +X/kLtdx8rdO99cS1Nxxx5Fqn+RK/2W5lkdULIWo2AuhDxIQ3c+hLtYYGoTH7vsAv +tH5Xaph32emzQGFrYgRqnotsV+Yd7nl8mTKhvPhgKaGH0HkQlr4dVxnSq3uDUwWG +989rMzy9XiOgw3KqCJL6oGf+AkvlcgG8QZbGbmfQ75NExrrQZw0OhnBC+heFToOl +cHmx3Ipwuv57znUAJPz/LzhNDavnaZXTwMk+uzs0zdGiJnmbi+cN0Vr1eip5SoRK +X7aQY+WUFS7w8Sy+ebpDX3az8I9ra23ydtJZnHaNXRZKpkx9aKxBj6Lm7+twNzmC +8y4bnuEvZLgemqeR705cf3zKlhBQhLX9BfoB1TlpGI//tUhXQYY= +=9gCM +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +a23c5313dc386596976a5c2777442ae58d1b2253 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2-sources.jar.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +2fd6dac2fc83f8d100ec3bf33e02ce0404c92cb026130202003394b9d7c19fb3b7c034470c86773af424b80e9592e448a9c5ba744adf4af7f08581434a20616b org.apache.felix.http.jetty12-1.0.2-sources.jar Added: release/felix/org.apache.felix.http.jetty12-1.0.2.jar ============================================================================== Binary file - no diff available. Propchange: release/felix/org.apache.felix.http.jetty12-1.0.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: release/felix/org.apache.felix.http.jetty12-1.0.2.jar.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2.jar.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2.jar.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAmAACgkQP89Sn/Ly +egbg+Q/+NtD0i7jlbtRa+S6h+RCSKPeyz6OUgfn5/WxkTmMibzk8Scjkm3t7MZna +k4je1kQ+1ZgBJlu2hMvKQ0zza42Uau1LJRQGXAx94t4nqVJi/vmyAvvc6dvCN8kF +Amng9uR3izgRDAdZGWjpaV3sVOTE8jl9P/H2HUwD9aOIXP2y7ERcQCrp4zu3Q2OY +/gHkFVu1b9fqhIDjx/VNvKkvzaVr3JamFshokENFQRLCFnit4bXs5FJzxQ+ma2G6 +szBnYV0khT7gLcG+EgBleObZfXN01PQ6sGe0eRJrCkLtL6pJZU3pgRy/GY+kppBT +C5TjKuYF6hEC5nOeMgH4qrePm6pYw+IEjfdDxAoS8V9nACPlRgqTBg7OIv8Xd6Gx +NA60Y3UhDKn4+XN3RCAp+5OpkEkuTcKSJuNX7biDCSTxUctXZWb3L76djOgtkoZk +nTb/2zHDZ/arQkBzf+XeKnG0K0VCVJ8siuW6iQIOR/SLlVuKPPfI67OIFHMGExXN +/FuRB73j8Q8iizI+DMx/cFAwcaAhDUvwynsgGeE9qVjZNFBcIHfPDYD+Qv4wBsLW +xi+iBmQ2wXs3pPFq1TYtJZUZDoYsu0Unyq0tLXKl7Ee98l8YNQueWHrjNGaKKAQp +jU2CdOcR03VClI6RSqFpkxhOkYYnOS75lEoSOHzrcvt7/ucK0As= +=n01F +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.2.jar.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2.jar.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2.jar.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +dadebe74322c1bb8fd2aa0fa53a889fbddba966c \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2.jar.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2.jar.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2.jar.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +cbbcc24f5c83948af736ee6a713531e451f50a83f6854cd1f2a882ea17d8c5bdeb027ef777dd6ae8c2e820ecdf8f799b50b839b3b8837e8201aa8d8f655dac08 org.apache.felix.http.jetty12-1.0.2.jar Added: release/felix/org.apache.felix.http.jetty12-1.0.2.pom ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2.pom (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2.pom Fri Jan 26 06:42:46 2024 @@ -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.2</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.2</tag> + </scm> + + <properties> + <felix.java.version>17</felix.java.version> + <jetty.version>12.0.5</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.6</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.2.pom.asc ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2.pom.asc (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2.pom.asc Fri Jan 26 06:42:46 2024 @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEX9UUWovQMXqU3HcTP89Sn/LyegYFAmWuAmAACgkQP89Sn/Ly +egYhhRAAgcfWMnCBdhdVbWNVCYhcCCZHG4nmtSHNhESJ8+HTij7Xt1l+QZFdNWkH +DLeKQwqq5w3jbMTAKUy4r1T31olp6nsCsj2DaS7jgH/myYK02o7Sx3AdmX7HKjOK +ZsZ6i254latzUKwN3MSAsd/83ZZBDG9m4CIiVOQHF1m9+a4rm1tWnBbx3poBHcxf +BRKaEe3LIZn0ypsfi1BWkTFQ3AeF/i69uH6uy3QpwrTvUWLj0E6f6DuA4OqZ95M3 +0lXQHwb+wmaAI/2Za4oXK7D31jxvOP4cXhUqHy74GFZezTSJSk0HrTd7U0X41/wU +XpD98DgVTM8oZybV4PhM234fsqdzeqqLS8jEv/cYFTIb5uC7CYguos6zbD/5RN1g +BLx03GLPbtxWN9ynYpi439BX3dvVkdyblOgY0hMNFG4mlqdEYrXrSmKXL3mT48Hj +ha4n3bLXOMU3WCSscS4l9Pc5UNw+jTFtaq1x3pIGwgSP2fMZwyCj+UIeABL+aijD +P77Uy7bxaueUAnhzJcF8s/fCX9MhgNmBznTQwNP9Akl5nY/MfV3omX3mk21UXAaT +jmQNalLTbVuxyVvnzH0vvnv8tZlwghq43h9rbKozMBE2RSukcuWg82DpTWTnvpo4 +XAwHwVlGkM6oFYxxpRX4M7cGi1DrGRcHIzXEcQg+L+LdZx+HXMc= +=BeIW +-----END PGP SIGNATURE----- Added: release/felix/org.apache.felix.http.jetty12-1.0.2.pom.sha1 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2.pom.sha1 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2.pom.sha1 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +8fa7589116ddcf544091f3b3cdfac41fc62f70b3 \ No newline at end of file Added: release/felix/org.apache.felix.http.jetty12-1.0.2.pom.sha512 ============================================================================== --- release/felix/org.apache.felix.http.jetty12-1.0.2.pom.sha512 (added) +++ release/felix/org.apache.felix.http.jetty12-1.0.2.pom.sha512 Fri Jan 26 06:42:46 2024 @@ -0,0 +1 @@ +21b25c0178800da2462e2cdd84f0bea61ba5a3fe6b043517ed6ad0d5143d8ae628241723601bc7fccff29c4bd4acc26bdc4b41c389db23f0cdf370b0da51a2de org.apache.felix.http.jetty12-1.0.2.pom