Moved the Java8 bits to the main pom, preparing for a Maven Central r…

…elease
bridgedb · Aug 31, 2024 · fa72e16 · fa72e16
1 parent f833874
commit fa72e16
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 34 deletions.
diff --git a/org.bridgedb.bio/pom.xml b/org.bridgedb.bio/pom.xml
@@ -8,7 +8,7 @@
   <parent>
   	<artifactId>bridgedb-bundle</artifactId>
   	<groupId>org.bridgedb</groupId>
-  	<version>3.1.2</version>
+  	<version>3.1.2-java8</version>
   </parent>
 
 	<build>

diff --git a/org.bridgedb.gui/pom.xml b/org.bridgedb.gui/pom.xml
@@ -7,7 +7,7 @@
   <parent>
   	<artifactId>bridgedb-bundle</artifactId>
   	<groupId>org.bridgedb</groupId>
-  	<version>3.1.2</version>
+  	<version>3.1.2-java8</version>
   </parent>
 
 	<build>

diff --git a/org.bridgedb.rdb.construct/pom.xml b/org.bridgedb.rdb.construct/pom.xml
@@ -7,7 +7,7 @@
   <parent>
   	<artifactId>bridgedb-bundle</artifactId>
   	<groupId>org.bridgedb</groupId>
-  	<version>3.1.2</version>
+  	<version>3.1.2-java8</version>
   </parent>
 
 	<build>
@@ -96,11 +96,11 @@
 			<artifactId>derbytools</artifactId>
 			<version>${derby.version}</version>
 		</dependency>
-                <dependency>
+                <!-- dependency>
                         <groupId>org.apache.derby</groupId>
                         <artifactId>derbyshared</artifactId>
                         <version>${derby.version}</version>
-                </dependency>
+                </dependency -->
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derbyclient</artifactId>

diff --git a/org.bridgedb.rdb/pom.xml b/org.bridgedb.rdb/pom.xml
@@ -7,7 +7,7 @@
   <parent>
   	<artifactId>bridgedb-bundle</artifactId>
   	<groupId>org.bridgedb</groupId>
-  	<version>3.1.2</version>
+  	<version>3.1.2-java8</version>
   </parent>
 
 	<build>
@@ -95,11 +95,11 @@
 			<artifactId>derbytools</artifactId>
 			<version>${derby.version}</version>
 		</dependency>
-                <dependency>
+                <!-- dependency>
                         <groupId>org.apache.derby</groupId>
                         <artifactId>derbyshared</artifactId>
                         <version>${derby.version}</version>
-                </dependency>
+                </dependency -->
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derbyclient</artifactId>

diff --git a/org.bridgedb.webservice.bridgerest/pom.xml b/org.bridgedb.webservice.bridgerest/pom.xml
@@ -8,7 +8,7 @@
   <parent>
   	<artifactId>bridgedb-bundle</artifactId>
   	<groupId>org.bridgedb</groupId>
-  	<version>3.1.2</version>
+  	<version>3.1.2-java8</version>
   </parent>
 
 	<build>

diff --git a/org.bridgedb/pom.xml b/org.bridgedb/pom.xml
@@ -33,7 +33,7 @@
     <parent>
   	<artifactId>bridgedb-bundle</artifactId>
   	<groupId>org.bridgedb</groupId>
-  	<version>3.1.2</version>
+  	<version>3.1.2-java8</version>
   </parent>
 
 	<build>

diff --git a/pom-java8.xml b/pom-java8.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bridgedb</groupId>
-  <artifactId>bridgedb-bundle-pv</artifactId>
+  <artifactId>bridgedb-bundle</artifactId>
   <packaging>pom</packaging>
-  <version>3.1.2</version>
+  <version>3.1.2-java8</version>
   <name>BridgeDb 4 PathVisio bundle</name>
 	<description>
 		BridgeDb is a framework for finding and mapping equivalent database
@@ -36,7 +36,7 @@
         <rdf4j.version>3.7.7</rdf4j.version>
         <servlet.version>2.5</servlet.version>
         <slf4j.version>1.6.4</slf4j.version>
-        <derby.version>10.15.2.0</derby.version>
+        <derby.version>10.14.2.0</derby.version>
         <junit-platform-surefire-provider>1.3.2</junit-platform-surefire-provider>
         <junit5.jupiter.version>5.10.0</junit5.jupiter.version>
         <junit5.excludeGroups>mysql</junit5.excludeGroups>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.bridgedb</groupId>
   <artifactId>bridgedb-bundle</artifactId>
   <packaging>pom</packaging>
-  <version>3.1.2</version>	
+  <version>3.1.2-java8</version>	
   <name>BridgeDb bundle</name>
 	<description>
 		BridgeDb is a framework for finding and mapping equivalent database
@@ -17,28 +17,9 @@
   	<module>org.bridgedb</module>
   	<module>org.bridgedb.bio</module>
   	<module>org.bridgedb.gui</module>
-  	<module>org.bridgedb.utils</module>
-  	<module>org.bridgedb.sql</module>
-  	<module>org.bridgedb.ws.core</module>
-  	<module>org.bridgedb.ws.server</module>
-  	<module>org.bridgedb.ws.client</module>
-        <module>org.bridgedb.rdf</module>
-        <module>org.bridgedb.uri.api</module>
-        <module>org.bridgedb.uri.sql</module>
-        <module>org.bridgedb.uri.loader</module>
-        <module>org.bridgedb.uri.ws.core</module>
-        <module>org.bridgedb.uri.ws.server</module>
-        <module>org.bridgedb.uri.ws.client</module>
         <module>org.bridgedb.rdb</module>
   	<module>org.bridgedb.rdb.construct</module>
   	<module>org.bridgedb.webservice.bridgerest</module>
-  	<module>org.bridgedb.webservice.biomart</module>
-  	<module>org.bridgedb.tools.batchmapper</module>
-        <module>org.bridgedb.tools.qc</module>
-        <module>org.bridgedb.tools.voidtool</module>
-        <module>org.bridgedb.tools.info</module>
-        <module>org.bridgedb.file.orthoxml</module>
-  	<module>examples</module>
   </modules>
 
     <properties>
@@ -55,7 +36,7 @@
         <rdf4j.version>4.3.8</rdf4j.version>
         <servlet.version>2.5</servlet.version>
         <slf4j.version>2.0.9</slf4j.version>
-        <derby.version>10.15.2.0</derby.version>
+        <derby.version>10.14.2.0</derby.version>
         <junit-platform-surefire-provider>1.3.2</junit-platform-surefire-provider>
         <junit5.jupiter.version>5.10.1</junit5.jupiter.version>
         <junit5.excludeGroups>mysql</junit5.excludeGroups>
@@ -317,4 +298,12 @@
     <url>https://github.com/bridgedb/BridgeDb/issues</url>
   </issueManagement>
 
+    <repositories>
+        <repository>
+            <id>mvnrepository</id>
+            <name>MVN Repository</name>
+            <url>https://mvnrepository.com/artifact/</url>
+        </repository>
+    </repositories>
+
 </project>