feat: mattbertolini#12 : prepare the MANIFEST for packaging as osgi f…

…ragment
erwindl0 · Jan 5, 2022 · aac5f89 · aac5f89
1 parent f863575
commit aac5f89
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 3 deletions.
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Liquibase Slf4j Logging
+Bundle-SymbolicName: com.mattbertolini.liquibase.logging.slf4j
+Bundle-Version: 4.0.0
+Automatic-Module-Name: com.mattbertolini.liquibase.logging.slf4j
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Export-Package: com.mattbertolini.liquibase.logging.slf4j;version="4.0.0"
+Import-Package: liquibase.logging;version="4.0.0",
+ liquibase.logging.core;version="4.0.0",
+ org.junit.jupiter.api;version="5.7.1";resolution:=optional,
+ org.mockito;version="2.23.0";resolution:=optional,
+ org.mockito.stubbing;version="2.23.0";resolution:=optional,
+ org.slf4j;version="1.7.0"
+Fragment-Host: org.liquibase.core;bundle-version="[4.0.0,5.0.0)"
diff --git a/...INF/services/liquibase.logging.LogService → ...INF/services/liquibase.logging.LogService b/...INF/services/liquibase.logging.LogService → ...INF/services/liquibase.logging.LogService
diff --git a/buildsrc/compile.xml b/buildsrc/compile.xml
@@ -63,7 +63,11 @@
     <target name="-process-test-resources" if="test.resources.dir.exsits">
         <macro:processresources dir="${src.test.resources.dir}" todir="${build.test.dir}"/>
     </target>
+
+	<target name="-process-meta-inf-resources" if="meta_inf.dir.exists">
+	    <macro:processresources dir="${meta_inf.dir}" todir="${build.main.dir}/META-INF"/>
+	</target>
 
-    <target name="-main-classes" depends="-compile-main, -process-main-resources"/>
+    <target name="-main-classes" depends="-compile-main, -process-main-resources, -process-meta-inf-resources"/>
     <target name="-test-classes" depends="-compile-test, -process-test-resources"/>
 </project>
diff --git a/buildsrc/javadoc.xml b/buildsrc/javadoc.xml
@@ -20,7 +20,7 @@
     <include file="${basedir}/buildsrc/antcontrib.xml"/>
     <include file="${basedir}/buildsrc/compile.xml"/>
 
-    <target name="-javadoc" depends="-antcontrib.-load-antcontrib, -compile.-compile-main, -compile.-process-main-resources">
+    <target name="-javadoc" depends="-antcontrib.-load-antcontrib, -compile.-compile-main, -compile.-process-main-resources, -compile.-process-meta-inf-resources">
         <ac:outofdate>
             <ac:sourcefiles>
                 <fileset dir="${src.main.java.dir}" includes="**/*.java"/>

diff --git a/buildsrc/properties.xml b/buildsrc/properties.xml
@@ -21,6 +21,7 @@
     <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
     <property name="src.test.java.dir" value="${basedir}/src/test/java"/>
     <property name="src.test.resources.dir" value="${basedir}/src/test/resources"/>
+    <property name="meta_inf.dir" value="${basedir}/META-INF"/>
     <property name="build.dir" value="${basedir}/build"/>
     <property name="dist.dir" value="${basedir}/dist"/>
     <property name="build.temp.dir" value="${build.dir}/temp"/>
@@ -51,4 +52,9 @@
             <file file="${src.test.resources.dir}"/>
         </resourceexists>
     </condition>
+    <condition property="meta_inf.dir.exists">
+        <resourceexists>
+            <file file="${meta_inf.dir}"/>
+        </resourceexists>
+    </condition>
 </project>
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
diff --git a/src/test/java/com/mattbertolini/liquibase/logging/slf4j/Slf4jLoggerTest.java b/src/test/java/com/mattbertolini/liquibase/logging/slf4j/Slf4jLoggerTest.java
@@ -20,6 +20,7 @@
 import liquibase.logging.LogMessageFilter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.stubbing.OngoingStubbing;
 import org.slf4j.Logger;
 
 import java.util.logging.Level;