Revise Maven configuration

hpi-swa · Sep 22, 2023 · 9a8f36c · 9a8f36c
1 parent 02436f0
commit 9a8f36c
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/mx.trufflesqueak/suite.py b/mx.trufflesqueak/suite.py
@@ -233,12 +233,6 @@
     "distributions": {
         "TRUFFLESQUEAK": {
             "description": "TruffleSqueak virtual machine",
-            "maven": {
-                "artifactId": "smalltalk-language",
-                "groupId": "de.hpi.swa.trufflesqueak",
-                "tag": ["default", "public"],
-            },
-            "noMavenJavadoc": True,
             "moduleInfo": {
                 "name": "de.hpi.swa.trufflesqueak",
                 "exports": [
@@ -249,6 +243,7 @@
                     "jdk.unsupported", # sun.misc.Unsafe
                 ],
             },
+            "useModulePath": True,
             "dependencies": [
                 "de.hpi.swa.trufflesqueak",
             ],
@@ -266,7 +261,12 @@
             "javaProperties": {
                 "org.graalvm.language.smalltalk.home": "<path:TRUFFLESQUEAK_HOME>",
             },
-            "useModulePath": True,
+            "maven": {
+                "artifactId": "smalltalk-language",
+                "groupId": "de.hpi.swa.trufflesqueak",
+                "tag": ["default", "public"],
+            },
+            "noMavenJavadoc": True,
         },
 
         "TRUFFLESQUEAK_HOME": {
@@ -283,11 +283,6 @@
 
         "TRUFFLESQUEAK_LAUNCHER": {
             "description": "TruffleSqueak launcher",
-            "maven": {
-                "groupId": "de.hpi.swa.trufflesqueak",
-                "artifactId": "smalltalk-launcher",
-                "tag": ["default", "public"],
-            },
             "moduleInfo": {
                 "name": "de.hpi.swa.trufflesqueak.launcher",
                 "exports": [
@@ -302,6 +297,12 @@
                 "TRUFFLESQUEAK_SHARED",
                 "sdk:LAUNCHER_COMMON",
             ],
+            "maven": {
+                "groupId": "de.hpi.swa.trufflesqueak",
+                "artifactId": "smalltalk-launcher",
+                "tag": ["default", "public"],
+            },
+            "noMavenJavadoc": True,
         },
 
         "TRUFFLESQUEAK_SHARED": {
@@ -318,6 +319,12 @@
             "distDependencies": [
                 "sdk:GRAAL_SDK",
             ],
+            "maven": {
+                "groupId": "de.hpi.swa.trufflesqueak",
+                "artifactId": "trufflesqueak-shared",
+                "tag": ["default", "public"],
+            },
+            "noMavenJavadoc": True,
         },
 
         "TRUFFLESQUEAK_TCK": {
@@ -335,6 +342,7 @@
                 "sdk:POLYGLOT_TCK",
             ],
             "testDistribution": True,
+            "maven" : False,
         },
 
         "TRUFFLESQUEAK_TEST": {
@@ -346,6 +354,7 @@
                     "de.hpi.swa.trufflesqueak.test*",
                 ],
             },
+            "useModulePath": True,
             "javaCompliance": "17+",
             "dependencies": [
                 "de.hpi.swa.trufflesqueak.test",
@@ -354,7 +363,6 @@
             "distDependencies": ["TRUFFLESQUEAK"],
             "testDistribution": True,
             "maven" : False,
-            "useModulePath": True,
         },
     },
 }