Skip to content

Commit

Permalink
Sort POMs with sort-pom plugin
Browse files Browse the repository at this point in the history 
The plugin will be applied from the airbase 144: airlift/airbase#370
  • Loading branch information
@wendigo
wendigo committed Jun 27, 2023
1 parent a42258d commit d79c4e5
Show file tree
Hide file tree
Showing 30 changed files with 734 additions and 743 deletions.
6 changes: 3 additions & 3 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<artifactId>airlift</artifactId>
<version>235-SNAPSHOT</version>
</parent>

<name>bom</name>
<artifactId>bom</artifactId>
<packaging>pom</packaging>

<name>bom</name>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -178,10 +178,10 @@
</configuration>
<executions>
<execution>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
<phase>process-resources</phase>
</execution>
</executions>
</plugin>
Expand Down
25 changes: 12 additions & 13 deletions bootstrap/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>bootstrap</artifactId>
<packaging>jar</packaging>
<name>bootstrap</name>

<parent>
<groupId>io.airlift</groupId>
<artifactId>airlift</artifactId>
<version>235-SNAPSHOT</version>
</parent>
<artifactId>bootstrap</artifactId>
<packaging>jar</packaging>
<name>bootstrap</name>

<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
</properties>

<dependencies>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>log</artifactId>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>log-manager</artifactId>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>configuration</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<groupId>io.airlift</groupId>
<artifactId>log</artifactId>
</dependency>

<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<groupId>io.airlift</groupId>
<artifactId>log-manager</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -66,4 +66,3 @@
</dependency>
</dependencies>
</project>

41 changes: 20 additions & 21 deletions concurrent/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>concurrent</artifactId>
<packaging>jar</packaging>
<name>concurrent</name>

<parent>
<groupId>io.airlift</groupId>
<artifactId>airlift</artifactId>
<version>235-SNAPSHOT</version>
</parent>
<artifactId>concurrent</artifactId>
<packaging>jar</packaging>
<name>concurrent</name>

<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
</properties>

<dependencies>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>units</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>log</artifactId>
</dependency>

<dependency>
<groupId>com.google.errorprone</groupId>
Expand All @@ -37,6 +28,15 @@
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>log</artifactId>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>units</artifactId>
</dependency>

<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand All @@ -49,10 +49,9 @@
<optional>true</optional>
</dependency>

<!-- for testing -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<groupId>io.airlift</groupId>
<artifactId>testing</artifactId>
<scope>test</scope>
</dependency>

Expand All @@ -63,22 +62,22 @@
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>testing</artifactId>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<artifactId>jmh-generator-annprocess</artifactId>
<scope>test</scope>
</dependency>

<!-- for testing -->
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

42 changes: 21 additions & 21 deletions configuration/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<artifactId>configuration</artifactId>
<packaging>jar</packaging>
<name>configuration</name>

<parent>
<groupId>io.airlift</groupId>
<artifactId>airlift</artifactId>
<version>235-SNAPSHOT</version>
</parent>
<artifactId>configuration</artifactId>
<packaging>jar</packaging>
<name>configuration</name>

<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>

<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<optional>true</optional>
</dependency>

<dependency>
Expand All @@ -36,21 +33,30 @@
<artifactId>guice</artifactId>
</dependency>

<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>

<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</dependency>

<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<optional>true</optional>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>

<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<optional>true</optional>
<groupId>io.airlift</groupId>
<artifactId>testing</artifactId>
<scope>test</scope>
</dependency>

<!-- for testing -->
Expand All @@ -65,12 +71,6 @@
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Loading

0 comments on commit d79c4e5

Please sign in to comment.