From 53f9e697b2a829067dc4b27c2b44c5de73650153 Mon Sep 17 00:00:00 2001
From: Arno Unkrig <aunkrig@users.noreply.github.com>
Date: Fri, 22 Dec 2023 22:06:52 +0100
Subject: [PATCH] Fixed issue #209: Use Java's ServiceLoader instead of
 org.codehaus.commons.compiler.properties

---
 janino/pom.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/janino/pom.xml b/janino/pom.xml
index 6fb80f62..61fef561 100644
--- a/janino/pom.xml
+++ b/janino/pom.xml
@@ -34,17 +34,17 @@
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>
-    	<groupId>org.apache.ant</groupId>
-    	<artifactId>ant</artifactId>
-    	<version>1.10.11</version>
-    	<scope>provided</scope>
-    	<optional>true</optional>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.10.11</version>
+      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
-    	<groupId>de.unkrig.jdisasm</groupId>
-    	<artifactId>jdisasm</artifactId>
-    	<version>1.0.6</version>
-    	<scope>test</scope>
+      <groupId>de.unkrig.jdisasm</groupId>
+      <artifactId>jdisasm</artifactId>
+      <version>1.0.6</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -63,8 +63,10 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-			<Export-Package>org.codehaus.janino, org.codehaus.janino.samples, org.codehaus.janino.tools, org.codehaus.janino.util, org.codehaus.janino.util.resource</Export-Package>
+            <Export-Package>org.codehaus.janino, org.codehaus.janino.samples, org.codehaus.janino.tools, org.codehaus.janino.util, org.codehaus.janino.util.resource</Export-Package>
             <Require-Bundle>org.codehaus.janino.commons-compiler</Require-Bundle>
+            <Provide-Capability>osgi.serviceloader;osgi.serviceloader="org.codehaus.commons.compiler.ICompilerFactory"</Provide-Capability>
+            <Require-Capability>osgi.extender;filter:="(&amp;(osgi.extender=osgi.serviceloader.registrar)(version&gt;=1.0)(!(version&gt;=2.0)))"</Require-Capability>
           </instructions>
         </configuration>
       </plugin>