Skip to content

Commit

Permalink
Fixing merge conflicts.
Browse files Browse the repository at this point in the history 
Signed-off-by: jzonthemtn <[email protected]>
  • Loading branch information
@jzonthemtn
jzonthemtn committed Nov 15, 2024
2 parents 7a7a205 + d6bc22e commit 8b1beac
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 14 deletions.
7 changes: 6 additions & 1 deletion phileas-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<artifactId>lucene-analysis-common</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-backward-codecs</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
Expand Down
15 changes: 15 additions & 0 deletions phileas-services/phileas-services-anonymization/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,26 @@
<artifactId>phileas-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
<version>${redisson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
<dependency>
<groupId>com.github.mifmif</groupId>
<artifactId>generex</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>ai.grakn</groupId>
<artifactId>redis-mock</artifactId>
Expand Down
20 changes: 20 additions & 0 deletions phileas-services/phileas-services-pdf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,26 @@
<artifactId>pdfbox</artifactId>
<version>${pdfbox.version}</version>
</dependency>
<dependency>
<groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-core</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-jpeg2000</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>jbig2-imageio</artifactId>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
35 changes: 22 additions & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,38 +77,47 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Project dependency versions -->
<antlr.version>4.13.2</antlr.version>
<aws.version>1.12.770</aws.version>
<aws.version>1.12.778</aws.version>
<commons.collections4.version>4.4</commons.collections4.version>
<commons.lang3.version>3.16.0</commons.lang3.version>
<commons.lang3.version>3.17.0</commons.lang3.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.codec.version>1.17.1</commons.codec.version>
<commons.csv.version>1.11.0</commons.csv.version>
<commons.io.version>2.16.1</commons.io.version>
<commons.csv.version>1.12.0</commons.csv.version>
<commons.io.version>2.17.0</commons.io.version>
<commons.math.version>3.6.1</commons.math.version>
<commons.text.version>1.12.0</commons.text.version>
<commons.validator.version>1.9.0</commons.validator.version>
<equals.verifier.version>3.16.2</equals.verifier.version>
<dropwizard.metrics.version>4.1.7</dropwizard.metrics.version>
<dropwizard-metrics-cloudwatch.version>1.12.7</dropwizard-metrics-cloudwatch.version>
<dropwizard-metrics-datadog.version>1.1.14</dropwizard-metrics-datadog.version>
<dropwizard-metrics-prometheus.version>1.13.1</dropwizard-metrics-prometheus.version>
<equals.verifier.version>3.17.3</equals.verifier.version>
<ff3.version>1.0.4</ff3.version>
<guava.version>33.3.0-jre</guava.version>
<guava.version>33.3.1-jre</guava.version>
<hapi.fhir.version>4.2.0</hapi.fhir.version>
<gson.version>2.11.0</gson.version>
<icu4j.version>67.1</icu4j.version>
<json.version>20240303</json.version>
<jsoup.version>1.18.1</jsoup.version>
<junit.version>5.11.0</junit.version>
<libphonenumber.version>8.13.44</libphonenumber.version>
<junit.version>5.11.3</junit.version>
<libphonenumber.version>8.13.50</libphonenumber.version>
<log4j.version>2.23.1</log4j.version>
<lucene.version>8.3.0</lucene.version>
<lucene.version>9.12.0</lucene.version>
<maven.compiler.version>3.8.1</maven.compiler.version>
<maven.failsafe.version>3.2.5</maven.failsafe.version>
<maven.surefire.version>3.2.5</maven.surefire.version>
<mockito.version>5.12.0</mockito.version>
<micrometer.version>1.13.1</micrometer.version>
<mockito.version>5.14.2</mockito.version>
<nv-i18n.version>1.27</nv-i18n.version>
<opennlp.version>2.4.0</opennlp.version>
<opennlp.version>2.5.0</opennlp.version>
<pdfbox.version>2.0.23</pdfbox.version>
<redis-mock.version>0.1.6</redis-mock.version>
<redisson.version>3.35.0</redisson.version>
<redisson.version>3.39.0</redisson.version>
<retrofit.version>2.11.0</retrofit.version>
<scala.major.version>2.12</scala.major.version>
<segment.version>2.0.1</segment.version>
<snakeyaml.version>2.3</snakeyaml.version>
<spring.boot.version>2.1.8.RELEASE</spring.boot.version>
</properties>
<build>
<pluginManagement>
Expand Down Expand Up @@ -244,7 +253,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.failsafe.version}</version>
<version>2.22.2</version>
<configuration>
<skipITs>false</skipITs>
</configuration>
Expand Down

0 comments on commit 8b1beac

Please sign in to comment.