Merge pull request #835 from hazendaz/master

Build updates - use commons logging now

Author: hazendaz

pom.xml

@@ -201,12 +201,13 @@
       <artifactId>commons-dbcp2</artifactId>
       <version>2.13.0</version>
       <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.3.5</version>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -266,12 +267,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -388,15 +383,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>pre16</id>
-      <activation>
-        <jdk>(,16)</jdk>
-      </activation>
-      <properties>
-        <derby.version>10.15.2.0</derby.version>
-      </properties>
-    </profile>
     <profile>
       <id>17</id>
       <activation>