Skip to content

Commit

Permalink
Sort dependencies and modules in POM
Browse files Browse the repository at this point in the history
  • Loading branch information
@electrum @andreaTP
electrum authored and andreaTP committed Aug 19, 2024
1 parent d9d7aa8 commit 2019a91
Show file tree
Hide file tree
Showing 13 changed files with 177 additions and 133 deletions.
34 changes: 18 additions & 16 deletions aot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,6 @@
<groupId>com.dylibso.chicory</groupId>
<artifactId>wasm</artifactId>
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>wabt</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
Expand All @@ -49,14 +36,30 @@
<artifactId>asm-util</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.approvaltests</groupId>
<artifactId>approvaltests</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>wabt</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>wasm-corpus</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.approvaltests</groupId>
<artifactId>approvaltests</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down Expand Up @@ -234,5 +237,4 @@
</plugin>
</plugins>
</build>

</project>
1 change: 0 additions & 1 deletion cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,4 @@
</plugin>
</plugins>
</build>

</project>
20 changes: 11 additions & 9 deletions fuzz/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,36 @@
<groupId>com.dylibso.chicory</groupId>
<artifactId>wasm</artifactId>
</dependency>

<!-- make sure that the executable is available -->
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>cli</artifactId>
<scope>runtime</scope>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- make sure that the executable is available -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<groupId>com.dylibso.chicory</groupId>
<artifactId>cli</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand All @@ -72,5 +75,4 @@
</plugin>
</plugins>
</build>

</project>
5 changes: 2 additions & 3 deletions jmh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<dependencies>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>runtime</artifactId>
<artifactId>aot</artifactId>
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>aot</artifactId>
<artifactId>runtime</artifactId>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
Expand Down Expand Up @@ -68,5 +68,4 @@
</plugin>
</plugins>
</build>

</project>
131 changes: 82 additions & 49 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@
</developers>

<modules>
<module>wabt</module>
<module>wasm-support-plugin</module>
<module>test-gen-plugin</module>
<module>wasi-test-gen-plugin</module>
<module>aot</module>
<module>bom</module>
<module>cli</module>
<module>log</module>
<module>wasm</module>
<module>runtime</module>
<module>runtime-tests</module>
<module>test-gen-plugin</module>
<module>wabt</module>
<module>wasi</module>
<module>wasi-test-gen-plugin</module>
<module>wasm</module>
<module>wasm-corpus</module>
<module>cli</module>
<module>aot</module>
<module>bom</module>
<module>wasm-support-plugin</module>
</modules>

<scm>
Expand Down Expand Up @@ -103,6 +103,7 @@
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
Expand All @@ -115,14 +116,30 @@

<dependencyManagement>
<dependencies>

<!-- Used by AOT compiler -->
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-bom</artifactId>
<version>${asm.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Chicory project modules -->
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>log</artifactId>
<artifactId>aot</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>wasm</artifactId>
<artifactId>cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>log</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -132,7 +149,7 @@
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>aot</artifactId>
<artifactId>wabt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -142,27 +159,27 @@
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>cli</artifactId>
<artifactId>wasm</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>wasm-corpus</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Used for WASI tests -->
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>wabt</artifactId>
<version>${project.version}</version>
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
<version>1.3.0</version>
</dependency>

<!-- Used by AOT compiler -->
<!-- Used in the infrastructure of Fuzz tests -->
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-bom</artifactId>
<version>${asm.version}</version>
<type>pom</type>
<scope>import</scope>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>

<!-- Used to build a CLI -->
Expand All @@ -178,17 +195,25 @@
<artifactId>commons-lang3</artifactId>
<version>${commons-lang.version}</version>
</dependency>

<!-- JMH tests -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>${jmh.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>${jmh.version}</version>
</dependency>

<!-- Used for WASI tests -->
<!-- Unit tests -->
<dependency>
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
<version>1.3.0</version>
<groupId>com.approvaltests</groupId>
<artifactId>approvaltests</artifactId>
<version>${approvaltests.version}</version>
<scope>test</scope>
</dependency>

<!-- Unit tests -->
Expand All @@ -210,25 +235,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.approvaltests</groupId>
<artifactId>approvaltests</artifactId>
<version>${approvaltests.version}</version>
<scope>test</scope>
</dependency>

<!-- JMH tests -->
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>${jmh.version}</version>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>${jmh.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -290,6 +296,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -377,10 +388,30 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<configuration>
<fail>true</fail>
<failFast>false</failFast>
<rules>
<banDuplicatePomDependencyVersions/>
<requireUpperBoundDeps/>
</rules>
</configuration>
<executions>
<execution>
<id>enforce</id>
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven-dependency-plugin.version}</version>
<configuration>
<failOnWarning>true</failOnWarning>
<ignoreUnusedRuntime>true</ignoreUnusedRuntime>
Expand Down Expand Up @@ -445,6 +476,9 @@
</excludes>
<sortPom>
<expandEmptyElements>false</expandEmptyElements>
<sortModules>true</sortModules>
<sortDependencies>scope,groupId,artifactId</sortDependencies>
<sortDependencyExclusions>groupId,artifactId</sortDependencyExclusions>
</sortPom>
</pom>
</configuration>
Expand Down Expand Up @@ -548,5 +582,4 @@
</modules>
</profile>
</profiles>

</project>
Loading

0 comments on commit 2019a91

Please sign in to comment.