From 753d67cbf9514b49a17f012802e688aa2b328493 Mon Sep 17 00:00:00 2001 From: David Phillips Date: Sat, 17 Aug 2024 21:14:29 -0700 Subject: [PATCH] Sort dependencies and modules in POM --- aot/pom.xml | 34 ++++----- cli/pom.xml | 1 - fuzz/pom.xml | 20 +++--- jmh/pom.xml | 5 +- pom.xml | 131 ++++++++++++++++++++++------------- runtime-tests/pom.xml | 11 +-- runtime/pom.xml | 10 +-- test-gen-plugin/pom.xml | 33 ++++----- wabt/pom.xml | 6 +- wasi-test-gen-plugin/pom.xml | 28 ++++---- wasi/pom.xml | 18 ++--- wasm-support-plugin/pom.xml | 12 ++-- wasm/pom.xml | 11 +-- 13 files changed, 182 insertions(+), 138 deletions(-) diff --git a/aot/pom.xml b/aot/pom.xml index 779577c91..8a3e92093 100644 --- a/aot/pom.xml +++ b/aot/pom.xml @@ -23,19 +23,6 @@ com.dylibso.chicory wasm - - com.dylibso.chicory - wabt - test - - - org.junit.jupiter - junit-jupiter-api - - - org.junit.jupiter - junit-jupiter-engine - org.ow2.asm asm @@ -49,14 +36,30 @@ asm-util true + + com.approvaltests + approvaltests + test + + + com.dylibso.chicory + wabt + test + com.dylibso.chicory wasm-corpus test - com.approvaltests - approvaltests + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test @@ -234,5 +237,4 @@ - diff --git a/cli/pom.xml b/cli/pom.xml index bfaafe42c..4d9df2fc8 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -109,5 +109,4 @@ - diff --git a/fuzz/pom.xml b/fuzz/pom.xml index f693fcd1b..40b423e15 100644 --- a/fuzz/pom.xml +++ b/fuzz/pom.xml @@ -26,33 +26,36 @@ com.dylibso.chicory wasm - - - com.dylibso.chicory - cli - runtime + commons-io + commons-io - org.apache.commons commons-lang3 + + - commons-io - commons-io + com.dylibso.chicory + cli + runtime + org.junit.jupiter junit-jupiter-api + test org.junit.jupiter junit-jupiter-engine + test org.junit.jupiter junit-jupiter-params + test @@ -72,5 +75,4 @@ - diff --git a/jmh/pom.xml b/jmh/pom.xml index 75e58fe8f..896ce8d92 100644 --- a/jmh/pom.xml +++ b/jmh/pom.xml @@ -16,11 +16,11 @@ com.dylibso.chicory - runtime + aot com.dylibso.chicory - aot + runtime org.openjdk.jmh @@ -68,5 +68,4 @@ - diff --git a/pom.xml b/pom.xml index e6a7fed7d..424a1b00f 100644 --- a/pom.xml +++ b/pom.xml @@ -34,19 +34,19 @@ - wabt - wasm-support-plugin - test-gen-plugin - wasi-test-gen-plugin + aot + bom + cli log - wasm runtime runtime-tests + test-gen-plugin + wabt wasi + wasi-test-gen-plugin + wasm wasm-corpus - cli - aot - bom + wasm-support-plugin @@ -104,6 +104,7 @@ 3.3.1 3.4.0 3.1.2 + 3.5.0 3.7.1 3.12.1 3.1.2 @@ -116,14 +117,30 @@ + + + + org.ow2.asm + asm-bom + ${asm.version} + pom + import + + + com.dylibso.chicory - log + aot ${project.version} com.dylibso.chicory - wasm + cli + ${project.version} + + + com.dylibso.chicory + log ${project.version} @@ -133,7 +150,7 @@ com.dylibso.chicory - aot + wabt ${project.version} @@ -143,7 +160,7 @@ com.dylibso.chicory - cli + wasm ${project.version} @@ -151,19 +168,19 @@ wasm-corpus ${project.version} + + - com.dylibso.chicory - wabt - ${project.version} + com.google.jimfs + jimfs + 1.3.0 - + - org.ow2.asm - asm-bom - ${asm.version} - pom - import + commons-io + commons-io + ${commons-io.version} @@ -179,17 +196,25 @@ commons-lang3 ${commons-lang.version} + + - commons-io - commons-io - ${commons-io.version} + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} - + - com.google.jimfs - jimfs - 1.3.0 + com.approvaltests + approvaltests + ${approvaltests.version} + test @@ -211,25 +236,6 @@ ${junit.version} test - - - com.approvaltests - approvaltests - ${approvaltests.version} - test - - - - - org.openjdk.jmh - jmh-core - ${jmh.version} - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - @@ -291,6 +297,11 @@ maven-javadoc-plugin ${maven-javadoc-plugin.version} + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin.version} + org.apache.maven.plugins maven-dependency-plugin @@ -378,10 +389,30 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + + true + false + + + + + + + + enforce + + enforce + + validate + + + org.apache.maven.plugins maven-dependency-plugin - ${maven-dependency-plugin.version} true true @@ -446,6 +477,9 @@ false + true + scope,groupId,artifactId + groupId,artifactId @@ -549,5 +583,4 @@ - diff --git a/runtime-tests/pom.xml b/runtime-tests/pom.xml index d8cefbf10..b0b4afa15 100644 --- a/runtime-tests/pom.xml +++ b/runtime-tests/pom.xml @@ -29,17 +29,19 @@ wasm test + + com.dylibso.chicory + wasm-corpus + test + org.junit.jupiter junit-jupiter-api + test org.junit.jupiter junit-jupiter-engine - - - com.dylibso.chicory - wasm-corpus test @@ -218,5 +220,4 @@ - diff --git a/runtime/pom.xml b/runtime/pom.xml index eccb6d41c..18044188b 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -18,17 +18,19 @@ com.dylibso.chicory wasm + + com.dylibso.chicory + wasm-corpus + test + org.junit.jupiter junit-jupiter-api + test org.junit.jupiter junit-jupiter-engine - - - com.dylibso.chicory - wasm-corpus test diff --git a/test-gen-plugin/pom.xml b/test-gen-plugin/pom.xml index eefa12b44..c0e3e082b 100644 --- a/test-gen-plugin/pom.xml +++ b/test-gen-plugin/pom.xml @@ -18,16 +18,6 @@ com.dylibso.chicory wabt - - com.github.javaparser - javaparser-core - ${javaparser.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - com.fasterxml.jackson.core jackson-annotations @@ -38,11 +28,27 @@ jackson-databind ${jackson.version} + + com.github.javaparser + javaparser-core + ${javaparser.version} + + + org.apache.commons + commons-compress + ${commons-compress.version} + org.eclipse.jgit org.eclipse.jgit ${jgit.version} + + org.apache.maven + maven-core + ${maven-plugin-api.version} + provided + org.apache.maven maven-plugin-api @@ -55,13 +61,8 @@ ${maven-plugin-annotations.version} provided - - org.apache.maven - maven-core - ${maven-plugin-api.version} - provided - + diff --git a/wabt/pom.xml b/wabt/pom.xml index 770f94c1d..f785ece43 100644 --- a/wabt/pom.xml +++ b/wabt/pom.xml @@ -16,7 +16,7 @@ com.dylibso.chicory - wasi + log com.dylibso.chicory @@ -24,7 +24,7 @@ com.dylibso.chicory - log + wasi com.dylibso.chicory @@ -37,10 +37,12 @@ org.junit.jupiter junit-jupiter-api + test org.junit.jupiter junit-jupiter-engine + test diff --git a/wasi-test-gen-plugin/pom.xml b/wasi-test-gen-plugin/pom.xml index 6598429f1..b18bcafc0 100644 --- a/wasi-test-gen-plugin/pom.xml +++ b/wasi-test-gen-plugin/pom.xml @@ -14,11 +14,6 @@ A Maven Plugin to generate tests from the WebAssembly wasi-testsuite - - com.github.javaparser - javaparser-core - ${javaparser.version} - com.fasterxml.jackson.core jackson-annotations @@ -30,15 +25,26 @@ ${jackson.version} - org.eclipse.jgit - org.eclipse.jgit - ${jgit.version} + com.github.javaparser + javaparser-core + ${javaparser.version} org.apache.maven.shared file-management 3.1.0 + + org.eclipse.jgit + org.eclipse.jgit + ${jgit.version} + + + org.apache.maven + maven-core + ${maven-plugin-api.version} + provided + org.apache.maven maven-plugin-api @@ -51,12 +57,6 @@ ${maven-plugin-annotations.version} provided - - org.apache.maven - maven-core - ${maven-plugin-api.version} - provided - diff --git a/wasi/pom.xml b/wasi/pom.xml index 0fdc3d711..3668f126f 100644 --- a/wasi/pom.xml +++ b/wasi/pom.xml @@ -26,14 +26,6 @@ com.dylibso.chicory wasm - - org.junit.jupiter - junit-jupiter-api - - - org.junit.jupiter - junit-jupiter-engine - com.dylibso.chicory wasm-corpus @@ -44,6 +36,16 @@ jimfs test + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + diff --git a/wasm-support-plugin/pom.xml b/wasm-support-plugin/pom.xml index 303d9f647..7135751cd 100644 --- a/wasm-support-plugin/pom.xml +++ b/wasm-support-plugin/pom.xml @@ -19,6 +19,12 @@ javaparser-core ${javaparser.version} + + org.apache.maven + maven-core + ${maven-plugin-api.version} + provided + org.apache.maven maven-plugin-api @@ -31,12 +37,6 @@ ${maven-plugin-annotations.version} provided - - org.apache.maven - maven-core - ${maven-plugin-api.version} - provided - diff --git a/wasm/pom.xml b/wasm/pom.xml index 1b5e9206c..4dd031c51 100644 --- a/wasm/pom.xml +++ b/wasm/pom.xml @@ -14,17 +14,19 @@ WebAssembly tools + + com.dylibso.chicory + wasm-corpus + test + org.junit.jupiter junit-jupiter-api + test org.junit.jupiter junit-jupiter-engine - - - com.dylibso.chicory - wasm-corpus test @@ -45,5 +47,4 @@ -