Skip to content

Commit

Permalink
Fix-up poms
Browse files Browse the repository at this point in the history
  • Loading branch information
@kamil-sita
kamil-sita committed Jun 19, 2024
1 parent 530991e commit a56fc9c
Show file tree
Hide file tree
Showing 11 changed files with 170 additions and 156 deletions.
26 changes: 2 additions & 24 deletions core-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@
<description>core-common</description>
<properties>
<java.version>17</java.version>
<jackson.version>2.16.0</jackson.version>
</properties>
<dependencies>
<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>db-codegen</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>tflang</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -79,7 +76,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
Expand All @@ -90,53 +86,35 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>6.1.1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.9.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.15.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.19.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.19.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<!-- use 2.9.1 for Java 7 projects -->
<version>3.11.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
21 changes: 0 additions & 21 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,16 @@
<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>db-codegen</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>tflang</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>magic-scheduler</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -85,71 +82,53 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>core-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>6.1.1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.9.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.15.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.19.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.19.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<!-- use 2.9.1 for Java 7 projects -->
<version>3.11.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion db-codegen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>db-pre-codegen</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 0 additions & 2 deletions db-pre-codegen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>db-changesets</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.3.9</version>
</dependency>
</dependencies>

Expand Down
1 change: 0 additions & 1 deletion db-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>db-changesets</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
46 changes: 1 addition & 45 deletions gui-local/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,31 @@
<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>module-fx</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>module-fx-spring-boot</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>core</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>magic-scheduler</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>core-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.41.2.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -75,7 +69,6 @@
<dependency>
<groupId>org.imgscalr</groupId>
<artifactId>imgscalr-lib</artifactId>
<version>4.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -121,114 +114,77 @@
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency><!-- https://mvnrepository.com/artifact/com.fifesoft/rsyntaxtextarea -->
</dependency>
<dependency>
<groupId>com.fifesoft</groupId>
<artifactId>rsyntaxtextarea</artifactId>
<version>3.3.4</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx</artifactId>
<version>22</version>
<type>pom</type>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openjfx/javafx -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>22</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-graphics -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>22</version>
</dependency>

<!--
<dependency>
<groupId>com.pixelduke</groupId>
<artifactId>transit</artifactId>
<version>1.0.0</version>
</dependency>
-->

<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>22</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-controls -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>22</version>
</dependency>

<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-swing</artifactId>
<version>22</version>
</dependency>

<dependency>
<groupId>org.jfxtras</groupId>
<artifactId>jmetro</artifactId>
<version>11.6.15</version>
</dependency>

<dependency>
<groupId>org.controlsfx</groupId>
<artifactId>controlsfx</artifactId>
<version>11.2.1</version>
</dependency>

<dependency>
<groupId>org.testfx</groupId>
<artifactId>testfx-core</artifactId>
<version>4.0.18</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testfx</groupId>
<artifactId>testfx-junit5</artifactId>
<version>4.0.18</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.19.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.19.7</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>module-fx</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>place.sita.labelle</groupId>
<artifactId>module-fx-spring-boot</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>

</dependencies>


Expand Down
Loading

0 comments on commit a56fc9c

Please sign in to comment.