Add module descriptors

This adds module descriptors with the correct "requires" clauses. The modules export everything (including classes in the "internal" packages), so this may need to be reviewed.
tzaeschke · Mar 13, 2018 · c7ee48d · c7ee48d
1 parent 1cb49b9
commit c7ee48d
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 2 deletions.
diff --git a/core-cpp/pom.xml b/core-cpp/pom.xml
@@ -4,8 +4,20 @@
          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>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>9</source>
+					<target>9</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-    <parent>
+	<parent>
         <groupId>org.ode4j</groupId>
         <artifactId>parent</artifactId>
         <version>0.4.0-SNAPSHOT</version>

diff --git a/core-cpp/src/main/java/module-info.java b/core-cpp/src/main/java/module-info.java
@@ -0,0 +1,28 @@
+/*************************************************************************
+ *                                                                       *
+ * Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.       *
+ * All rights reserved.  Email: russ@q12.org   Web: www.q12.org          *
+ *                                                                       *
+ * This library is free software; you can redistribute it and/or         *
+ * modify it under the terms of EITHER:                                  *
+ *   (1) The GNU Lesser General Public License as published by the Free  *
+ *       Software Foundation; either version 2.1 of the License, or (at  *
+ *       your option) any later version. The text of the GNU Lesser      *
+ *       General Public License is included with this library in the     *
+ *       file LICENSE.TXT.                                               *
+ *   (2) The BSD-style license that is included with this library in     *
+ *       the file LICENSE-BSD.TXT.                                       *
+ *                                                                       *
+ * This library is distributed in the hope that it will be useful,       *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files    *
+ * LICENSE.TXT and LICENSE-BSD.TXT for more details.                     *
+ *                                                                       *
+ *************************************************************************/
+
+module ord.ode4j.cpp {
+    requires org.ode4j;
+
+    exports org.ode4j.cpp.internal;
+    exports org.ode4j.cpp;
+}
diff --git a/core/pom.xml b/core/pom.xml
@@ -4,6 +4,18 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>9</source>
+					<target>9</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 	<parent>
 		<groupId>org.ode4j</groupId>

diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
@@ -0,0 +1,45 @@
+/*************************************************************************
+ *                                                                       *
+ * Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.       *
+ * All rights reserved.  Email: russ@q12.org   Web: www.q12.org          *
+ * Open Dynamics Engine 4J, Copyright (C) 2009-2014 Tilmann Zaeschke     *
+ * All rights reserved.  Email: ode4j@gmx.de   Web: www.ode4j.org        *
+ *                                                                       *
+ * This library is free software; you can redistribute it and/or         *
+ * modify it under the terms of EITHER:                                  *
+ *   (1) The GNU Lesser General Public License as published by the Free  *
+ *       Software Foundation; either version 2.1 of the License, or (at  *
+ *       your option) any later version. The text of the GNU Lesser      *
+ *       General Public License is included with this library in the     *
+ *       file LICENSE.TXT.                                               *
+ *   (2) The BSD-style license that is included with this library in     *
+ *       the file ODE-LICENSE-BSD.TXT and ODE4J-LICENSE-BSD.TXT.         *
+ *                                                                       *
+ * This library is distributed in the hope that it will be useful,       *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files    *
+ * LICENSE.TXT, ODE-LICENSE-BSD.TXT and ODE4J-LICENSE-BSD.TXT for more   *
+ * details.                                                              *
+ *                                                                       *
+ *************************************************************************/
+
+module org.ode4j
+{
+    requires org.slf4j;
+
+    exports org.ode4j.math;
+    exports org.ode4j.ode.internal.aabbtree;
+    exports org.ode4j.ode.internal.cpp4j.java;
+    exports org.ode4j.ode.internal.cpp4j;
+    exports org.ode4j.ode.internal.gimpact;
+    exports org.ode4j.ode.internal.joints;
+    exports org.ode4j.ode.internal.libccd;
+    exports org.ode4j.ode.internal.processmem;
+    exports org.ode4j.ode.internal.ragdoll;
+    exports org.ode4j.ode.internal.stuff;
+    exports org.ode4j.ode.internal;
+    exports org.ode4j.ode.ragdoll;
+    exports org.ode4j.ode.threading.task;
+    exports org.ode4j.ode.threading;
+    exports org.ode4j.ode;
+}
diff --git a/pom.xml b/pom.xml
@@ -108,7 +108,7 @@
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.7.12</version>
+				<version>1.8.0-beta1</version>
 			</dependency>
 
 			<dependency>