diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-01-12 17:11:01 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-01-20 14:46:37 +0100 |
| commit | ec5c06887cdfe5c31ae561a0e671fb943b324d04 (patch) | |
| tree | cae6ff947a669f846914c0db83d6748a597b2024 /container-apache-http-client-bundle | |
| parent | b7e28f7960ba06d10b4bb8b10681acbf34230b32 (diff) | |
Inline apache http client artifacts in container-apache-http-client-bundle
Allows container-apache-http-client-bundle to be used on classpath for classic fatjars.
Since the bundle is now built with Felix's bundle plugin, there is no need
to depend on jdisc_core or manually export through `@PublicApi` annotations.
Diffstat (limited to 'container-apache-http-client-bundle')
63 files changed, 66 insertions, 519 deletions
diff --git a/container-apache-http-client-bundle/pom.xml b/container-apache-http-client-bundle/pom.xml index fa29043bf5f..69ee2993798 100644 --- a/container-apache-http-client-bundle/pom.xml +++ b/container-apache-http-client-bundle/pom.xml @@ -6,7 +6,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>container-apache-http-client-bundle</artifactId> - <packaging>container-plugin</packaging> + <packaging>jar</packaging> <version>8-SNAPSHOT</version> <parent> @@ -19,26 +19,6 @@ <maven.javadoc.skip>true</maven.javadoc.skip> <!-- Javadoc plugin fails because of no source code in module --> </properties> <dependencies> - <!-- provided --> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>annotations</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <!-- Not directly used in this module, but needed to get Import-Packages for JDK packages it exports. --> - <groupId>com.yahoo.vespa</groupId> - <artifactId>jdisc_core</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <!-- compile --> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -68,9 +48,72 @@ <build> <plugins> <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>parse-version</id> + <goals> + <goal>parse-version</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> + <Export-Package>org.apache.hc.*;version=1.0.0;-noimport:=true,org.apache.http.*;version=1.0.0;-noimport:=true</Export-Package> + <Embed-Dependency>*;scope=compile;type=!pom;inline=true</Embed-Dependency> + <Import-Package>!javax.servlet,javax.*,org.slf4j,org.ietf.jgss</Import-Package> + <Embed-Transitive>true</Embed-Transitive> + <_nouses>true</_nouses> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/async/methods/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/async/methods/package-info.java deleted file mode 100644 index 8b217f0578d..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/async/methods/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.async.methods; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/async/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/async/package-info.java deleted file mode 100644 index 83f5762444a..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/async/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.async; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/classic/methods/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/classic/methods/package-info.java deleted file mode 100644 index 7c82b197119..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/classic/methods/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.classic.methods; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/classic/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/classic/package-info.java deleted file mode 100644 index 532c27c9b5a..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/classic/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.classic; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/config/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/config/package-info.java deleted file mode 100644 index 313b1866ce8..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/config/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.config; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java deleted file mode 100644 index e4093ae8ff0..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/entity/mime/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.entity.mime; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/entity/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/entity/package-info.java deleted file mode 100644 index 3c5070fead7..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/entity/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.entity; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/async/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/async/package-info.java deleted file mode 100644 index dd92b9aaa46..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/async/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.impl.async; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/classic/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/classic/package-info.java deleted file mode 100644 index 0ffb0cbf6a5..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/classic/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.impl.classic; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java deleted file mode 100644 index efb91b99559..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/io/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.impl.io; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/nio/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/nio/package-info.java deleted file mode 100644 index db3b6a74639..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/nio/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.impl.nio; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/package-info.java deleted file mode 100644 index 1d35c278069..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/impl/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.impl; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/io/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/io/package-info.java deleted file mode 100644 index 16f3e0024df..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/io/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.io; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/nio/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/nio/package-info.java deleted file mode 100644 index 4c7870bd8fc..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/nio/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.nio; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/package-info.java deleted file mode 100644 index 34ea128ee59..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/protocol/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/protocol/package-info.java deleted file mode 100644 index e738d7a2584..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/protocol/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.protocol; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/routing/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/routing/package-info.java deleted file mode 100644 index 8913ac6018c..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/routing/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.routing; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/socket/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/socket/package-info.java deleted file mode 100644 index 6225e5e5380..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/socket/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.socket; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/ssl/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/ssl/package-info.java deleted file mode 100644 index 53a10ebfb26..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/client5/http/ssl/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.client5.http.ssl; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/concurrent/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/concurrent/package-info.java deleted file mode 100644 index 2d773373168..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/concurrent/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.concurrent; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/config/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/config/package-info.java deleted file mode 100644 index b8bab52fad3..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/config/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.config; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/entity/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/entity/package-info.java deleted file mode 100644 index 345f98f54bb..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/entity/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.io.entity; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/package-info.java deleted file mode 100644 index 467552b396b..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.io; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/support/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/support/package-info.java deleted file mode 100644 index f16edec069e..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/io/support/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.io.support; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/message/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/message/package-info.java deleted file mode 100644 index 2ca5e52ed71..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/message/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.message; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/package-info.java deleted file mode 100644 index 6fb3d1503fb..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.nio; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/ssl/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/ssl/package-info.java deleted file mode 100644 index 72aa8926e2a..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/ssl/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.nio.ssl; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/support/classic/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/support/classic/package-info.java deleted file mode 100644 index bc75f02739a..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/support/classic/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.nio.support.classic; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/support/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/support/package-info.java deleted file mode 100644 index 897701dfc66..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/nio/support/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.nio.support; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/package-info.java deleted file mode 100644 index f459c8d3073..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/protocol/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/protocol/package-info.java deleted file mode 100644 index 6642f8b6cb3..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http/protocol/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http.protocol; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http2/config/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http2/config/package-info.java deleted file mode 100644 index a18cb1fef90..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http2/config/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http2.config; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http2/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http2/package-info.java deleted file mode 100644 index c1758fe9953..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/http2/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.http2; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/net/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/net/package-info.java deleted file mode 100644 index 539f73af724..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/net/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.net; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/reactor/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/reactor/package-info.java deleted file mode 100644 index 23dc8720328..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/reactor/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.reactor; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/util/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/util/package-info.java deleted file mode 100644 index 751476df3e0..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/hc/core5/util/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.hc.core5.util; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/annotation/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/annotation/package-info.java deleted file mode 100644 index 3cb10df7ce5..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/annotation/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.annotation; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/auth/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/auth/package-info.java deleted file mode 100644 index 57f137aa29c..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/auth/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.auth; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/config/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/client/config/package-info.java deleted file mode 100644 index d3807d427db..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/config/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.client.config; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/entity/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/client/entity/package-info.java deleted file mode 100644 index f80fbc49d2a..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/entity/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.client.entity; - -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/methods/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/client/methods/package-info.java deleted file mode 100644 index e007fb89cd4..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/methods/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.client.methods; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/client/package-info.java deleted file mode 100644 index a1c4eab54a0..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.client; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/protocol/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/client/protocol/package-info.java deleted file mode 100644 index 0b9caa14ec1..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/protocol/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.client.protocol; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/utils/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/client/utils/package-info.java deleted file mode 100644 index 9cd4511e181..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/client/utils/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.client.utils; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/config/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/config/package-info.java deleted file mode 100644 index 233ada47d23..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/config/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.config; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/package-info.java deleted file mode 100644 index 0f664f33462..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.conn; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/routing/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/routing/package-info.java deleted file mode 100644 index c63700eef07..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/routing/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.conn.routing; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/socket/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/socket/package-info.java deleted file mode 100644 index e0b1ddd0b82..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/socket/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.conn.socket; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/ssl/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/ssl/package-info.java deleted file mode 100644 index a504710acdd..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/conn/ssl/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.conn.ssl; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/mime/content/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/mime/content/package-info.java deleted file mode 100644 index 9c42dc4ef22..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/mime/content/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.entity.mime.content; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/mime/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/mime/package-info.java deleted file mode 100644 index d0b7aeaac49..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/mime/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.entity.mime; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/package-info.java deleted file mode 100644 index 56c9aad6ecf..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/entity/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.entity; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/client/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/client/package-info.java deleted file mode 100644 index a983ce40d48..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/client/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.impl.client; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/conn/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/conn/package-info.java deleted file mode 100644 index 3cdfb470f1c..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/conn/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.impl.conn; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/io/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/io/package-info.java deleted file mode 100644 index 06de1099da4..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/io/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.impl.io; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/package-info.java deleted file mode 100644 index 21ae86beed2..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/impl/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.impl; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/message/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/message/package-info.java deleted file mode 100644 index 7906ec7422b..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/message/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.message; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/package-info.java deleted file mode 100644 index c19a4c59322..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/params/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/params/package-info.java deleted file mode 100644 index 8761bdd7a11..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/params/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.params; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/pool/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/pool/package-info.java deleted file mode 100644 index 2a9fecfa761..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/pool/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.pool; - -import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/protocol/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/protocol/package-info.java deleted file mode 100644 index 40a0d235423..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/protocol/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.protocol; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-apache-http-client-bundle/src/main/java/org/apache/http/util/package-info.java b/container-apache-http-client-bundle/src/main/java/org/apache/http/util/package-info.java deleted file mode 100644 index 07686712234..00000000000 --- a/container-apache-http-client-bundle/src/main/java/org/apache/http/util/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @author bjorncs - */ -@ExportPackage -package org.apache.http.util; - -import com.yahoo.osgi.annotation.ExportPackage; |