Add bundles that were never migrated to EBR

Add commons-httpclient 3.1. Add httpclient-win 4.5.14. Add dnsjava 3.5.3.
eclipse-orbit · Apr 1, 2024 · 0189961 · 0189961
1 parent c93cce2
commit 0189961
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 2 deletions.
diff --git a/maven-bnd/site-minimal/category.xml b/maven-bnd/site-minimal/category.xml
@@ -50,12 +50,16 @@
    <feature id="org.eclipse.orbit.maven.org.apache.axis.ant.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.batik"/>
    <feature id="org.eclipse.orbit.maven.org.apache.batik.source"/>
+   <feature id="org.eclipse.orbit.maven.org.apache.commons.httpclient"/>
+   <feature id="org.eclipse.orbit.maven.org.apache.commons.httpclient.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.client5.httpclient5"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.client5.httpclient5.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.client5.httpclient5-win"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.client5.httpclient5-win.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.core5"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.core5.source"/>
+   <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.httpclient-win"/>
+   <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.httpclient-win.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.poi"/>
    <feature id="org.eclipse.orbit.maven.org.apache.poi.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.ws.commons.util"/>

diff --git a/maven-bnd/site/category.xml b/maven-bnd/site/category.xml
@@ -50,12 +50,16 @@
    <feature id="org.eclipse.orbit.maven.org.apache.axis.ant.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.batik"/>
    <feature id="org.eclipse.orbit.maven.org.apache.batik.source"/>
+   <feature id="org.eclipse.orbit.maven.org.apache.commons.httpclient"/>
+   <feature id="org.eclipse.orbit.maven.org.apache.commons.httpclient.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.client5.httpclient5"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.client5.httpclient5.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.client5.httpclient5-win"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.client5.httpclient5-win.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.core5"/>
    <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.core5.source"/>
+   <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.httpclient-win"/>
+   <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.httpclient-win.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.poi"/>
    <feature id="org.eclipse.orbit.maven.org.apache.poi.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.ws.commons.util"/>

diff --git a/maven-bnd/tp/MavenBND.target b/maven-bnd/tp/MavenBND.target
@@ -733,6 +733,49 @@ Export-Package:         org.apache.axis;split=ant;mandatory:=split;version="${ve
     </location>
 
 
+<!-- _____________________________________________________ org.apache.commons.httpclient ___________________________________________________________________________________________________-->
+
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+      <feature id="org.eclipse.orbit.maven.org.apache.commons.httpclient" label="Orbit Maven BND org.apache.commons.httpclient" provider-name="Eclipse Orbit" version="4.32.0.v20240401-1000">
+        <description>This feature's dependencies are pulled directly from Maven central and wrapped via BND recipe as OSGi artifacts.</description>
+        <copyright>
+Copyright (c) 2024 Eclipse contributors and others.
+
+This program and the accompanying materials
+are made available under the terms of the Eclipse Public License 2.0
+which accompanies this distribution, and is available at
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+        </copyright>
+        <license url="https://www.eclipse.org/legal/epl-2.0/"/>
+      </feature>
+      <dependencies>
+        <dependency>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+          <version>3.1</version>
+          <type>jar</type>
+        </dependency>
+      </dependencies>
+      <instructions>
+<!-- SHA1 fc529c569eca13306741de09f4aaed99651c81de -->
+<![CDATA[
+Bundle-Name:            Bundle ${mvnGroupId} : ${mvnArtifactId}
+version:                ${versionmask;===;${version_cleanup;${mvnVersion}}}
+Bundle-SymbolicName:    org.apache.commons.httpclient
+Bundle-Version:         ${version}.v20240401-1000
+Automatic-Module-Name:  org.apache.commons.httpclient
+Eclipse-Wrapped-Bundle: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
+Import-Package:         *
+Export-Package:         *;version="${version}";-noimport:=true
+-noextraheaders:        true
+-removeheaders:         Private-Package
+]]>
+      </instructions>
+    </location>
+
+
 <!-- ______________________________________________________ org.apache.httpcomponents.core5 __________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
@@ -828,6 +871,51 @@ Export-Package:         *;version="${version}";-noimport:=true
     </location>
 
 
+<!-- ______________________________________________________ org.apache.httpcomponents.httpclient-win __________________________________________________________________________________________________-->
+
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+      <feature id="org.eclipse.orbit.maven.org.apache.httpcomponents.httpclient-win" label="Orbit Maven BND org.apache.httpcomponents.httpclient-win" provider-name="Eclipse Orbit" version="4.32.0.v20240401-1000">
+        <description>This feature's dependencies are pulled directly from Maven central and wrapped via BND recipe as OSGi artifacts.</description>
+        <copyright>
+Copyright (c) 2024 Eclipse contributors and others.
+
+This program and the accompanying materials
+are made available under the terms of the Eclipse Public License 2.0
+which accompanies this distribution, and is available at
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+        </copyright>
+        <license url="https://www.eclipse.org/legal/epl-2.0/"/>
+      </feature>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient-win</artifactId>
+          <version>4.5.14</version>
+          <type>jar</type>
+        </dependency>
+      </dependencies>
+      <instructions>
+<!-- SHA1 a177a7297a9111f37858f3ad63a3d966a9bf7710 -->
+<![CDATA[
+Bundle-Name:            Bundle ${mvnGroupId} : ${mvnArtifactId}
+version:                ${versionmask;===;${version_cleanup;${mvnVersion}}}
+name:                   ${mvnGroupId}.${replacestring;${mvnArtifactId};-;.}
+Bundle-SymbolicName:    ${name}
+Bundle-Version:         ${version}.v20240401-1000
+Automatic-Module-Name:  ${name}
+Eclipse-Wrapped-Bundle: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
+Eclipse-PlatformFilter: (|(osgi.os=win32)(org.eclipse.orbit.maven.bnd.buildtime=true))
+Import-Package:         *
+Export-Package:         *;version="${version}";-noimport:=true
+-noextraheaders:        true
+-removeheaders:         Private-Package
+]]>
+      </instructions>
+    </location>
+
+
 <!-- ______________________________________________________ org.apache.httpcomponents.client5.httpclient5-win __________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">

diff --git a/maven-osgi/tp/Maven.target b/maven-osgi/tp/Maven.target
@@ -3,7 +3,7 @@
 <target name="Maven" sequenceNumber="1">
   <locations>
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
-      <feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.32.0.v20240331-0900">
+      <feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.32.0.v20240401-1000">
         <description>This feature's dependencies are pulled directly from Maven central.</description>
         <copyright>
 Copyright (c) 2024 Eclipse contributors and others.
@@ -16,7 +16,7 @@ https://www.eclipse.org/legal/epl-2.0/
 SPDX-License-Identifier: EPL-2.0
         </copyright>
         <license url="https://www.eclipse.org/legal/epl-2.0/"/>
-        <!-- SHA1 5613b364d07a0411e310531720bf8667ed7e9d58 -->
+        <!-- SHA1 41070a95d1399e43f802bc1ac4519f300cab7892 -->
       </feature>
       <dependencies>
         <dependency>
@@ -386,6 +386,12 @@ SPDX-License-Identifier: EPL-2.0
           <version>1.3.1</version>
           <type>jar</type>
         </dependency>
+        <dependency>
+          <groupId>dnsjava</groupId>
+          <artifactId>dnsjava</artifactId>
+          <version>3.5.3</version>
+          <type>jar</type>
+        </dependency>
         <dependency>
           <groupId>io.github.classgraph</groupId>
           <artifactId>classgraph</artifactId>

diff --git a/maven-osgi/tp/other/MavenSupplement.target b/maven-osgi/tp/other/MavenSupplement.target
@@ -172,6 +172,12 @@
           <version>1.3.1</version>
           <type>jar</type>
         </dependency>
+        <dependency>
+          <groupId>dnsjava</groupId>
+          <artifactId>dnsjava</artifactId>
+          <version>3.5.3</version>
+          <type>jar</type>
+        </dependency>
         <dependency>
           <groupId>io.github.classgraph</groupId>
           <artifactId>classgraph</artifactId>

diff --git a/report/maven-bnd/merged-target/REPORT.md b/report/maven-bnd/merged-target/REPORT.md
@@ -26,11 +26,15 @@
     - [unirest-java](https://repo1.maven.org/maven2/com/konghq/unirest-java/) **[3.14.5](https://repo1.maven.org/maven2/com/konghq/unirest-java/3.14.5)**
  - [com.zaxxer](https://repo1.maven.org/maven2/com/zaxxer/)
     - [SparseBitSet](https://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/) **[1.3](https://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.3)**
+ - [commons-httpclient](https://repo1.maven.org/maven2/commons-httpclient/)
+    - [commons-httpclient](https://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/) **[3.1](https://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/3.1)**
  - [junit](https://repo1.maven.org/maven2/junit/)
     - [junit](https://repo1.maven.org/maven2/junit/junit/) **[4.13.2](https://repo1.maven.org/maven2/junit/junit/4.13.2)**
  - [org.antlr](https://repo1.maven.org/maven2/org/antlr/)
     - [antlr-runtime](https://repo1.maven.org/maven2/org/antlr/antlr-runtime/) **[3.2](https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.2)**
     - [antlr-runtime](https://repo1.maven.org/maven2/org/antlr/antlr-runtime/) **[3.5.3](https://repo1.maven.org/maven2/org/antlr/antlr-runtime/3.5.3)**
+ - [org.apache.httpcomponents](https://repo1.maven.org/maven2/org/apache/httpcomponents/)
+    - [httpclient-win](https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient-win/) **[4.5.14](https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient-win/4.5.14)**
  - [org.apache.httpcomponents.client5](https://repo1.maven.org/maven2/org/apache/httpcomponents/client5/)
     - [httpclient5](https://repo1.maven.org/maven2/org/apache/httpcomponents/client5/httpclient5/) **[5.3.1](https://repo1.maven.org/maven2/org/apache/httpcomponents/client5/httpclient5/5.3.1)**
     - [httpclient5-win](https://repo1.maven.org/maven2/org/apache/httpcomponents/client5/httpclient5-win/) **[5.2.3](https://repo1.maven.org/maven2/org/apache/httpcomponents/client5/httpclient5-win/5.2.3)**

diff --git a/report/maven-osgi/merged-target/REPORT.md b/report/maven-osgi/merged-target/REPORT.md
@@ -126,6 +126,8 @@
  - [commons-logging](https://repo1.maven.org/maven2/commons-logging/)
     - [commons-logging](https://repo1.maven.org/maven2/commons-logging/commons-logging/) **[1.2](https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2)**
     - [commons-logging](https://repo1.maven.org/maven2/commons-logging/commons-logging/) **[1.3.1](https://repo1.maven.org/maven2/commons-logging/commons-logging/1.3.1)**
+ - [dnsjava](https://repo1.maven.org/maven2/dnsjava/)
+    - [dnsjava](https://repo1.maven.org/maven2/dnsjava/dnsjava/) **[3.5.3](https://repo1.maven.org/maven2/dnsjava/dnsjava/3.5.3)**
  - [io.github.classgraph](https://repo1.maven.org/maven2/io/github/classgraph/)
     - [classgraph](https://repo1.maven.org/maven2/io/github/classgraph/classgraph/) **[4.8.168](https://repo1.maven.org/maven2/io/github/classgraph/classgraph/4.8.168)**
  - [io.github.toolfactory](https://repo1.maven.org/maven2/io/github/toolfactory/)

diff --git a/report/maven-osgi/supplement/REPORT.md b/report/maven-osgi/supplement/REPORT.md
@@ -94,6 +94,8 @@
  - [commons-logging](https://repo1.maven.org/maven2/commons-logging/)
     - [commons-logging](https://repo1.maven.org/maven2/commons-logging/commons-logging/) **[1.2](https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2)**
     - [commons-logging](https://repo1.maven.org/maven2/commons-logging/commons-logging/) **[1.3.1](https://repo1.maven.org/maven2/commons-logging/commons-logging/1.3.1)**
+ - [dnsjava](https://repo1.maven.org/maven2/dnsjava/)
+    - [dnsjava](https://repo1.maven.org/maven2/dnsjava/dnsjava/) **[3.5.3](https://repo1.maven.org/maven2/dnsjava/dnsjava/3.5.3)**
  - [io.github.classgraph](https://repo1.maven.org/maven2/io/github/classgraph/)
     - [classgraph](https://repo1.maven.org/maven2/io/github/classgraph/classgraph/) **[4.8.168](https://repo1.maven.org/maven2/io/github/classgraph/classgraph/4.8.168)**
  - [jakarta.activation](https://repo1.maven.org/maven2/jakarta/activation/)

diff --git a/report/maven-osgi/supplement/original.target b/report/maven-osgi/supplement/original.target
@@ -172,6 +172,12 @@
           <version>1.3.1</version>
           <type>jar</type>
         </dependency>
+        <dependency>
+          <groupId>dnsjava</groupId>
+          <artifactId>dnsjava</artifactId>
+          <version>3.5.3</version>
+          <type>jar</type>
+        </dependency>
         <dependency>
           <groupId>io.github.classgraph</groupId>
           <artifactId>classgraph</artifactId>

diff --git a/report/maven-osgi/supplement/updated.target b/report/maven-osgi/supplement/updated.target
@@ -172,6 +172,12 @@
           <version>1.3.1</version>
           <type>jar</type>
         </dependency>
+        <dependency>
+          <groupId>dnsjava</groupId>
+          <artifactId>dnsjava</artifactId>
+          <version>3.5.3</version>
+          <type>jar</type>
+        </dependency>
         <dependency>
           <groupId>io.github.classgraph</groupId>
           <artifactId>classgraph</artifactId>