Move to Jena 4.4.0 and only include cdk-iordf if you are using Java 11

cdk · Jun 4, 2022 · 618184a · 618184a
1 parent 76604f3
commit 618184a
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 25 deletions.
diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -3,17 +3,17 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <artifactId>cdk</artifactId>
         <groupId>org.openscience.cdk</groupId>
         <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>cdk-bundle</artifactId>
-    
+
     <name>cdk-bundle</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -240,11 +240,6 @@
             <artifactId>cdk-qm</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cdk-iordf</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>cdk-libiomd</artifactId>
@@ -315,17 +310,17 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>2.2</version>
                 <configuration>
-                <finalName>cdk-${project.parent.version}</finalName>
-                <filters>
-                    <filter>
-                        <artifact>*:*</artifact>
-                        <excludes>
-                            <exclude>META-INF/*.SF</exclude>
-                            <exclude>META-INF/*.DSA</exclude>
-                            <exclude>META-INF/*.RSA</exclude>
-                        </excludes>
-                    </filter>
-                </filters>
+                    <finalName>cdk-${project.parent.version}</finalName>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
                 </configuration>
                 <executions>
                     <execution>
@@ -335,7 +330,22 @@
                         </goals>
                     </execution>
                 </executions>
-      </plugin>
+            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jdk11-plus</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>cdk-iordf</artifactId>
+                    <version>${project.parent.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>
diff --git a/storage/iordf/pom.xml b/storage/iordf/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-core</artifactId>
-            <version>4.2.0</version>
+            <version>4.4.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>slf4j-log4j12</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-arq</artifactId>
-            <version>4.2.0</version>
+            <version>4.4.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>slf4j-log4j12</artifactId>

diff --git a/storage/pom.xml b/storage/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <artifactId>cdk</artifactId>
         <groupId>org.openscience.cdk</groupId>
@@ -14,7 +14,6 @@
         <module>ctab</module>
         <module>io</module>
         <module>ioformats</module>
-        <module>iordf</module>
         <module>libiocml</module>
         <module>libiomd</module>
         <module>pdb</module>
@@ -25,5 +24,15 @@
     </modules>
     <packaging>pom</packaging>
     <artifactId>cdk-storage</artifactId>
-
+    <profiles>
+        <profile>
+            <id>jdk11-plus</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <modules>
+                <module>iordf</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>