Exclude all org.antlr.runtime EBR versions

The 4.x versions are available as OSGi bundles. Provide recipes for both 3.2 and for the latest 3.x, current 3.5.3.
eclipse-orbit · Sep 29, 2023 · 85f7256 · 85f7256
1 parent 63304d0
commit 85f7256
Show file tree

Hide file tree

Showing 12 changed files with 141 additions and 11 deletions.
diff --git a/maven-bnd/site-minimal/category.xml b/maven-bnd/site-minimal/category.xml
@@ -32,6 +32,10 @@
    <feature id="org.eclipse.orbit.maven.junit.source"/>
    <feature id="org.eclipse.orbit.maven.lucene"/>
    <feature id="org.eclipse.orbit.maven.lucene.source"/>
+   <feature id="org.eclipse.orbit.maven.org.antlr.3.2"/>
+   <feature id="org.eclipse.orbit.maven.org.antlr.3.2.source"/>
+   <feature id="org.eclipse.orbit.maven.org.antlr.3.x"/>
+   <feature id="org.eclipse.orbit.maven.org.antlr.3.x.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.ant"/>
    <feature id="org.eclipse.orbit.maven.org.apache.ant.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.axis"/>

diff --git a/maven-bnd/site/category.xml b/maven-bnd/site/category.xml
@@ -32,6 +32,10 @@
    <feature id="org.eclipse.orbit.maven.junit.source"/>
    <feature id="org.eclipse.orbit.maven.lucene"/>
    <feature id="org.eclipse.orbit.maven.lucene.source"/>
+   <feature id="org.eclipse.orbit.maven.org.antlr.3.2"/>
+   <feature id="org.eclipse.orbit.maven.org.antlr.3.2.source"/>
+   <feature id="org.eclipse.orbit.maven.org.antlr.3.x"/>
+   <feature id="org.eclipse.orbit.maven.org.antlr.3.x.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.ant"/>
    <feature id="org.eclipse.orbit.maven.org.apache.ant.source"/>
    <feature id="org.eclipse.orbit.maven.org.apache.axis"/>

diff --git a/maven-bnd/tp/MavenBND.target b/maven-bnd/tp/MavenBND.target
@@ -1643,7 +1643,7 @@ Export-Package:         *;version="${version}"
     </location>
 
 
-!-- _____________________________________________________ com.zaxxer ___________________________________________________________________________________________________-->
+<!-- _____________________________________________________ com.zaxxer ___________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
       <feature id="org.eclipse.orbit.maven.com.zaxxer" label="Orbit Maven BND com.zaxxer" provider-name="Eclipse Orbit" version="4.30.0.v20230929-1000">
@@ -1686,7 +1686,7 @@ Export-Package:         *;version="${version}"
     </location>
 
 
-!-- _____________________________________________________ org.apache.xmlbeans ___________________________________________________________________________________________________-->
+<!-- _____________________________________________________ org.apache.xmlbeans ___________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
       <feature id="org.eclipse.orbit.maven.org.apache.xmlbeans" label="Orbit Maven BND org.apache.xmlbeans" provider-name="Eclipse Orbit" version="4.30.0.v20230929-1100">
@@ -1729,6 +1729,94 @@ Export-Package:         *;version="${version}"
     </location>
 
 
+<!-- _____________________________________________________ org.antlr.3.2 ___________________________________________________________________________________________________-->
+
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+      <feature id="org.eclipse.orbit.maven.org.antlr.3.2" label="Orbit Maven BND org.antlr.3.2" provider-name="Eclipse Orbit" version="4.30.0.v20230929-1400">
+        <description>This feature's dependencies are pulled directly from Maven central and wrapped via BND recipe as OSGi artifacts.</description>
+        <copyright>
+Copyright (c) 2023 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.antlr</groupId>
+          <artifactId>antlr-runtime</artifactId>
+          <version>3.2</version> <!-- DO NOT CHANGE THIS VERSION --> 
+          <type>jar</type>
+        </dependency>
+      </dependencies>
+      <instructions>
+<!-- SHA1 8d00dd99c5f2d0e86332a479f283a11815262fee -->
+<![CDATA[
+Bundle-Name:            Bundle ${mvnGroupId} : ${mvnArtifactId}
+version:                ${versionmask;===;${version_cleanup;${mvnVersion}}}
+name:                   org.antlr.runtime
+Bundle-SymbolicName:    ${name}
+Bundle-Version:         ${version}.v20230929-1400
+Automatic-Module-Name:  ${name}
+Eclipse-Wrapped-Bundle: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
+Import-Package:         *;resolution:=optional
+Export-Package:         *;version="${version}";-noimport:=true
+-noextraheaders:        true
+-removeheaders:         Private-Package
+]]>
+      </instructions>
+    </location>
+
+
+<!-- _____________________________________________________ org.antlr.3.x ___________________________________________________________________________________________________-->
+
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+      <feature id="org.eclipse.orbit.maven.org.antlr.3.x" label="Orbit Maven BND org.antlr.3.x" provider-name="Eclipse Orbit" version="4.30.0.v20230929-1400">
+        <description>This feature's dependencies are pulled directly from Maven central and wrapped via BND recipe as OSGi artifacts.</description>
+        <copyright>
+Copyright (c) 2023 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.antlr</groupId>
+          <artifactId>antlr-runtime</artifactId>
+          <version>3.5.3</version>
+          <type>jar</type>
+        </dependency>
+      </dependencies>
+      <instructions>
+<!-- SHA1 3785d62dfab3d65fb830dd759206f041ebba4643 -->
+<![CDATA[
+Bundle-Name:            Bundle ${mvnGroupId} : ${mvnArtifactId}
+version:                ${versionmask;===;${version_cleanup;${mvnVersion}}}
+name:                   org.antlr.runtime
+Bundle-SymbolicName:    ${name}
+Bundle-Version:         ${version}.v20230929-1400
+Automatic-Module-Name:  ${name}
+Eclipse-Wrapped-Bundle: ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
+Import-Package:         *;resolution:=optional
+Export-Package:         *;version="${version}";-noimport:=true
+-noextraheaders:        true
+-removeheaders:         Private-Package
+]]>
+      </instructions>
+    </location>
+
+
 <!-- ______________________________________________________ EXCLUDE __________________________________________________________________________________________________-->
 
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">

diff --git a/maven-osgi/org.eclipse.orbit.maven.generator/MavenBNDDependencyAnalyzer.launch b/maven-osgi/org.eclipse.orbit.maven.generator/MavenBNDDependencyAnalyzer.launch
@@ -17,7 +17,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.orbit.maven.generator.DependencyAnalyzer"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.orbit.maven.generator"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-targets&#13;&#10;maven-bnd=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-bnd/tp/MavenBND.target&#13;&#10;&#13;&#10;-exclude&#13;&#10;&#13;&#10;-ignore&#13;&#10;&#13;&#10;xalan:.*:2.7.3  // Does not provide source artifacts&#13;&#10;&#13;&#10;-report&#13;&#10;${project_loc:/org.eclipse.orbit.simrel}/report/maven-bnd&#13;&#10;&#13;&#10;-cache&#13;&#10;${project_loc:/org.eclipse.orbit.maven.generator}/cache&#13;&#10;&#13;&#10;-merge&#13;&#10;${resource_loc:/org.eclipse.orbit.simrel/maven-bnd/tp/MavenBND.target}&#13;&#10;&#13;&#10;-merge-uri&#13;&#10;https://github.com/eclipse-orbit/orbit-simrel/blob/main/maven-bnd/tp/MavenBND.target&#13;&#10;&#13;&#10;-update"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-targets&#13;&#10;maven-bnd=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-bnd/tp/MavenBND.target&#13;&#10;&#13;&#10;-exclude&#13;&#10;&#13;&#10;-ignore&#13;&#10;&#13;&#10;xalan:.*:2.7.3  // Does not provide source artifacts&#13;&#10;org.antlr:antlr-runtime:(3.3|3.4|3.5|3.5.1|3.5.2|3.5.3)&#13;&#10;&#13;&#10;-report&#13;&#10;${project_loc:/org.eclipse.orbit.simrel}/report/maven-bnd&#13;&#10;&#13;&#10;-cache&#13;&#10;${project_loc:/org.eclipse.orbit.maven.generator}/cache&#13;&#10;&#13;&#10;-merge&#13;&#10;${resource_loc:/org.eclipse.orbit.simrel/maven-bnd/tp/MavenBND.target}&#13;&#10;&#13;&#10;-merge-uri&#13;&#10;https://github.com/eclipse-orbit/orbit-simrel/blob/main/maven-bnd/tp/MavenBND.target&#13;&#10;&#13;&#10;-update"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.orbit.maven.generator"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.orbit.maven.generator.redirection.maven-bnd=https://raw.githubusercontent.com/eclipse-orbit/orbit-simrel/main/maven-bnd/tp/MavenBND.target-&gt;local:${resource_loc:/org.eclipse.orbit.simrel/maven-bnd/tp/MavenBND.target}"/>
 </launchConfiguration>
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.30.0.v20230929-1320">
+      <feature id="org.eclipse.orbit.maven.osgi.all" label="Orbit Maven OSGi All" provider-name="Eclipse Orbit" version="4.30.0.v20230929-1418">
         <description>This feature's dependencies are pulled directly from Maven central.</description>
         <copyright>
 Copyright (c) 2023 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 f6b9723163faa8b91621bde5076fbe936d4987e7 -->
+        <!-- SHA1 71d22e30b8cf9b0997946dfa5705cc194c96fb0f -->
       </feature>
       <dependencies>
         <dependency>
@@ -518,6 +518,12 @@ SPDX-License-Identifier: EPL-2.0
           <version>5.13.0</version>
           <type>jar</type>
         </dependency>
+        <dependency>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-runtime</artifactId>
+          <version>4.13.1</version>
+          <type>jar</type>
+        </dependency>
         <dependency>
           <groupId>org.apache.aries.spifly</groupId>
           <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>

diff --git a/maven-osgi/tp/other/MavenSupplement.target b/maven-osgi/tp/other/MavenSupplement.target
@@ -423,6 +423,13 @@
           <type>jar</type>
         </dependency>
 
+        <dependency>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-runtime</artifactId>
+          <version>4.13.1</version>
+          <type>jar</type>
+        </dependency>
+
       </dependencies>
     </location>
   </locations>

diff --git a/orbit-aggregation/orbit.aggr b/orbit-aggregation/orbit.aggr
@@ -16,12 +16,6 @@
     <contributions description="orbit" label="orbit">
       <repositories location="https://download.eclipse.org/tools/orbit/downloads/latest-N" description="orbit">
         <bundles name="net.i2p.crypto.eddsa" versionRange="[0.3.0.v20220506-1020]"/>
-        <bundles name="org.antlr.runtime" versionRange="[3.2.0.v20220404-1927]"/>
-        <bundles name="org.antlr.runtime" versionRange="[3.5.2.v20221112-0806]"/>
-        <bundles name="org.antlr.runtime" versionRange="[4.5.1.v20160210-1233]"/>
-        <bundles name="org.antlr.runtime" versionRange="[4.7.1.v20181120-0808]"/>
-        <bundles name="org.antlr.runtime" versionRange="[4.7.2.v20221112-0806]"/>
-        <bundles name="org.antlr.runtime" versionRange="[4.10.1.v20230210-1433]"/>
         <mapRules xsi:type="aggregator:ExclusionRule" name="ca.odell.glazedlists" versionRange="[1.11.0.v20221112-0806]"/>
         <mapRules xsi:type="aggregator:ExclusionRule" name="ch.qos.logback.classic" versionRange="[1.2.3.v20221112-0806]"/>
         <mapRules xsi:type="aggregator:ExclusionRule" name="ch.qos.logback.core" versionRange="[1.2.3.v20221112-0806]"/>
@@ -132,6 +126,12 @@
         <mapRules xsi:type="aggregator:ExclusionRule" name="net.bytebuddy.byte-buddy" versionRange="[1.9.0.v20181107-1410]"/>
         <mapRules xsi:type="aggregator:ExclusionRule" name="net.jini" versionRange="[2.1.0.v20221112-0806]"/>
         <mapRules xsi:type="aggregator:ExclusionRule" name="net.sourceforge.plantuml" versionRange="[1.2019.0.v20221112-0806]"/>
+        <mapRules xsi:type="aggregator:ExclusionRule" name="org.antlr.runtime" versionRange="[3.2.0.v20220404-1927]"/>
+        <mapRules xsi:type="aggregator:ExclusionRule" name="org.antlr.runtime" versionRange="[3.5.2.v20221112-0806]"/>
+        <mapRules xsi:type="aggregator:ExclusionRule" name="org.antlr.runtime" versionRange="[4.10.1.v20230210-1433]"/>
+        <mapRules xsi:type="aggregator:ExclusionRule" name="org.antlr.runtime" versionRange="[4.5.1.v20160210-1233]"/>
+        <mapRules xsi:type="aggregator:ExclusionRule" name="org.antlr.runtime" versionRange="[4.7.1.v20181120-0808]"/>
+        <mapRules xsi:type="aggregator:ExclusionRule" name="org.antlr.runtime" versionRange="[4.7.2.v20221112-0806]"/>
         <mapRules xsi:type="aggregator:ExclusionRule" name="org.aopalliance" versionRange="[1.0.0.v20220404-1927]"/>
         <mapRules xsi:type="aggregator:ExclusionRule" name="org.apache.ant" versionRange="[1.10.12.v20211102-1452]"/>
         <mapRules xsi:type="aggregator:ExclusionRule" name="org.apache.batik.anim" versionRange="[1.16.0.v20221027-0840]"/>

diff --git a/report/maven-bnd/merged-target/REPORT.md b/report/maven-bnd/merged-target/REPORT.md
@@ -23,6 +23,9 @@
     - [SparseBitSet](https://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/) **[1.3](https://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.3)**
  - [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.axis](https://repo1.maven.org/maven2/org/apache/axis/)
     - [axis](https://repo1.maven.org/maven2/org/apache/axis/axis/) **[1.4](https://repo1.maven.org/maven2/org/apache/axis/axis/1.4)**
     - [axis-ant](https://repo1.maven.org/maven2/org/apache/axis/axis-ant/) **[1.4](https://repo1.maven.org/maven2/org/apache/axis/axis-ant/1.4)**

diff --git a/report/maven-osgi/merged-target/REPORT.md b/report/maven-osgi/merged-target/REPORT.md
@@ -196,6 +196,8 @@
     - [byte-buddy-agent](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/) **[1.14.8](https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.8)**
  - [net.java.dev.jna](https://repo1.maven.org/maven2/net/java/dev/jna/)
     - [jna-platform](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/) **[5.13.0](https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.13.0)**
+ - [org.antlr](https://repo1.maven.org/maven2/org/antlr/)
+    - [antlr4-runtime](https://repo1.maven.org/maven2/org/antlr/antlr4-runtime/) **[4.13.1](https://repo1.maven.org/maven2/org/antlr/antlr4-runtime/4.13.1)**
  - [org.apache.aries.spifly](https://repo1.maven.org/maven2/org/apache/aries/spifly/)
     - [org.apache.aries.spifly.dynamic.bundle](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/) **[1.3.6](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/1.3.6)**
  - [org.apache.commons](https://repo1.maven.org/maven2/org/apache/commons/)

diff --git a/report/maven-osgi/supplement/REPORT.md b/report/maven-osgi/supplement/REPORT.md
@@ -84,6 +84,8 @@
     - [jaxen](https://repo1.maven.org/maven2/jaxen/jaxen/) **[2.0.0](https://repo1.maven.org/maven2/jaxen/jaxen/2.0.0)**
  - [lpg.runtime](https://repo1.maven.org/maven2/lpg/runtime/)
     - [java](https://repo1.maven.org/maven2/lpg/runtime/java/) **[2.0.17-v201004271640](https://repo1.maven.org/maven2/lpg/runtime/java/2.0.17-v201004271640)**
+ - [org.antlr](https://repo1.maven.org/maven2/org/antlr/)
+    - [antlr4-runtime](https://repo1.maven.org/maven2/org/antlr/antlr4-runtime/) **[4.13.1](https://repo1.maven.org/maven2/org/antlr/antlr4-runtime/4.13.1)**
  - [org.apache.aries.spifly](https://repo1.maven.org/maven2/org/apache/aries/spifly/)
     - [org.apache.aries.spifly.dynamic.bundle](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/) **[1.3.6](https://repo1.maven.org/maven2/org/apache/aries/spifly/org.apache.aries.spifly.dynamic.bundle/1.3.6)**
  - [org.apache.commons](https://repo1.maven.org/maven2/org/apache/commons/)

diff --git a/report/maven-osgi/supplement/original.target b/report/maven-osgi/supplement/original.target
@@ -423,6 +423,13 @@
           <type>jar</type>
         </dependency>
 
+        <dependency>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-runtime</artifactId>
+          <version>4.13.1</version>
+          <type>jar</type>
+        </dependency>
+
       </dependencies>
     </location>
   </locations>

diff --git a/report/maven-osgi/supplement/updated.target b/report/maven-osgi/supplement/updated.target
@@ -423,6 +423,13 @@
           <type>jar</type>
         </dependency>
 
+        <dependency>
+          <groupId>org.antlr</groupId>
+          <artifactId>antlr4-runtime</artifactId>
+          <version>4.13.1</version>
+          <type>jar</type>
+        </dependency>
+
       </dependencies>
     </location>
   </locations>