OAK-6767: Remove felix SCR annotation support from parent pom (#1910)

Done
apache · Dec 18, 2024 · 437375b · 437375b
1 parent 807102d
commit 437375b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 29 deletions.
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
@@ -142,23 +142,6 @@
           <version>5.1.9</version>
           <extensions>true</extensions>
           <inherited>true</inherited>
-          <dependencies>
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.scr.bnd</artifactId>
-                <version>1.9.6</version>
-                <exclusions>
-                    <!--
-                        This SCR plugin pulls in a bnd version with a different artifactId, thus leading
-                        to two bnd artifacts existing at the same time.
-                      -->
-                    <exclusion>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>bnd</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-          </dependencies>
           <configuration>
             <exportScr>true</exportScr>
             <obrRepository>NONE</obrRepository>
@@ -171,8 +154,6 @@
               <!-- Don't default to bundle version for packages without explicit export version.
                    See FELIX-5172 -->
               <_nodefaultversion>true</_nodefaultversion>
-              <!-- Support parsing of maven-scr-plugin annotations through the felix.scr.bnd plugin -->
-              <_plugin>org.apache.felix.scrplugin.bnd.SCRDescriptorBndPlugin;destdir=${project.build.outputDirectory}</_plugin>
             </instructions>
           </configuration>
           <executions>
@@ -540,11 +521,6 @@
         <artifactId>org.osgi.annotation.versioning</artifactId>
         <version>1.1.2</version><!-- R7 version, https://docs.osgi.org/javadoc/osgi.annotation/7.0.0/org/osgi/annotation/versioning/package-summary.html -->
       </dependency>
-      <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.scr.annotations</artifactId>
-        <version>1.12.0</version>
-      </dependency>
       <dependency>
         <groupId>org.jetbrains</groupId>
         <artifactId>annotations</artifactId>

diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml
@@ -99,11 +99,6 @@
       <artifactId>org.osgi.service.component</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.scr.annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.annotation.versioning</artifactId>