Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1822 - clean up used undeclared dependencies #1826

Closed
wants to merge 3 commits into from
Closed

1822 - clean up used undeclared dependencies #1826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a2438e
1822 - clean up used undeclared dependencies
Jan 25, 2023
d06965c
builds
Oct 4, 2023
68ce05c
revert annotation to javax.annotation-api instead of jakarta
Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions common-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-in-memory-accumulo</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
Expand Down
30 changes: 29 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,25 @@
<version.commons-io>2.6</version.commons-io>
<version.commons-jexl>2.1.1</version.commons-jexl>
<version.commons-lang>2.6</version.commons-lang>
<version.commons-lang3>3.9</version.commons-lang3>
<version.commons-logging>1.2</version.commons-logging>
<version.commons-math3>3.0</version.commons-math3>
<version.commons-pool>1.6</version.commons-pool>
<version.commons-text>1.8</version.commons-text>
<version.commons-vfs2>2.3</version.commons-vfs2>
<version.curator>5.2.0</version.curator>
<version.deltaspike>1.9.0</version.deltaspike>
<version.dnsjava>2.1.8</version.dnsjava>
<version.dropwizard-metrics>3.2.6</version.dropwizard-metrics>
<version.easymock>4.0.2</version.easymock>
<version.eclipse.emf>2.15.0</version.eclipse.emf>
<version.fastutil>8.1.1</version.fastutil>
<version.geoserver>2.22.1</version.geoserver>
<version.geotools>28.1</version.geotools>
<version.geowave>1.2.0</version.geowave>
<version.google-guava>31.1-jre</version.google-guava>
<version.googlecode-findbugs>2.0.3</version.googlecode-findbugs>
<version.googlecode-gson>2.9.0</version.googlecode-gson>
<version.googlecode-json-simple>1.1.1</version.googlecode-json-simple>
<version.hadoop>3.3.5</version.hadoop>
<version.hadoop-shaded>1.1.1</version.hadoop-shaded>
Expand All @@ -67,13 +74,28 @@
<version.in-memory-accumulo>3.0.1</version.in-memory-accumulo>
<version.infinispan>9.4.21.Final</version.infinispan>
<version.jackson>2.10.0.pr1</version.jackson>
<version.jakarta.annotation-api>1.3.4</version.jakarta.annotation-api>
<version.jakarta.xml.bind-api>2.3.3</version.jakarta.xml.bind-api>
<version.javassist>3.24.0-GA</version.javassist>
<version.javastatsd>3.1.0</version.javastatsd>
<version.javax-validation>2.0.1.Final</version.javax-validation>
<version.javax.annotation-api>1.3.2</version.javax.annotation-api>
<version.javax.inject>1</version.javax.inject>
<version.javax.jaxb-api>2.2.11</version.javax.jaxb-api>
<version.javax.mail-api>1.5.4</version.javax.mail-api>
<version.javax.servlet-api>2.5</version.javax.servlet-api>
<version.javax.ws.rs-api>2.1.1</version.javax.ws.rs-api>
<version.jboss>1.0.1.Final</version.jboss>
<version.jboss-servlet-api-4.0>1.0.0.Final</version.jboss-servlet-api-4.0>
<version.jboss.logging>3.4.0.Final</version.jboss.logging>
<version.jboss.resteasy>3.0.12.Final</version.jboss.resteasy>
<version.jboss.shrinkwrap>1.2.6</version.jboss.shrinkwrap>
<version.jboss.xnio>3.7.2.Final</version.jboss.xnio>
<version.jcommander>1.72</version.jcommander>
<version.jetty>6.1.26</version.jetty>
<version.jgroups>4.0.19.Final</version.jgroups>
<version.jjwt>0.11.2</version.jjwt>
<version.jline>2.12</version.jline>
<version.jts>1.19.0</version.jts>
<version.junit>4.13.2</version.junit>
<version.junit.jupiter>5.5.2</version.junit.jupiter>
Expand All @@ -100,6 +122,7 @@
<version.mysql-connector>8.0.16</version.mysql-connector>
<version.netty>4.1.42.Final</version.netty>
<version.objenesis>2.1</version.objenesis>
<version.opencsv>2.3</version.opencsv>
<version.picketbox>5.0.3.Final</version.picketbox>
<version.powermock>2.0.9</version.powermock>
<version.protobuf>3.7.1</version.protobuf>
Expand All @@ -111,14 +134,19 @@
<version.stream>2.9.6</version.stream>
<version.surefire.plugin>3.0.0-M6</version.surefire.plugin>
<version.thrift>0.17.0</version.thrift>
<version.undertow-core>2.0.21.Final</version.undertow-core>
<version.undertow-servlet>1.2.6.Final</version.undertow-servlet>
<version.weld>3.1.1.Final</version.weld>
<version.weld-se>3.1.1.Final</version.weld-se>
<!-- Different version of weld for tests since the Arquillian embedded EE container needs an older version. -->
<version.weld-test>2.3.5.Final</version.weld-test>
<version.wildfly>17.0.1.Final</version.wildfly>
<version.wildfly-common>1.5.1.Final</version.wildfly-common>
<version.wildfly-elytron>1.9.1.Final</version.wildfly-elytron>
<version.woodstox-core>5.0.3</version.woodstox-core>
<version.woodstox-stax2>3.1.4</version.woodstox-stax2>
<version.xerces>2.12.2</version.xerces>
<version.xml-apis>1.4.01</version.xml-apis>
<version.zookeeper>3.8.1</version.zookeeper>
<!-- Unless a version is duplicated multiple times, just place the version on the dependency in dependencyManagement. -->
</properties>
Expand Down Expand Up @@ -1411,7 +1439,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
13 changes: 13 additions & 0 deletions warehouse/accumulo-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,24 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>${version.hadoop}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
Expand Down
13 changes: 13 additions & 0 deletions warehouse/assemble/webservice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-query-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>${version.hadoop}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
Expand All @@ -29,6 +38,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
Expand Down
87 changes: 85 additions & 2 deletions warehouse/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<artifactId>caffeine</artifactId>
<version>${version.caffeine}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand All @@ -43,6 +47,14 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-common</artifactId>
Expand Down Expand Up @@ -70,27 +82,45 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>type-utils</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.protostuff</groupId>
<artifactId>protostuff-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<version>${version.javax.annotation-api}</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.3</version>
<version>${version.opencsv}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
Expand All @@ -108,6 +138,11 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${version.curator}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
Expand All @@ -119,6 +154,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${version.hadoop}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
Expand All @@ -134,6 +170,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>${version.hadoop}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
Expand All @@ -150,6 +199,29 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
<version>${version.zookeeper}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand All @@ -166,6 +238,11 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${version.xml-apis}</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
Expand Down Expand Up @@ -198,6 +275,12 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${version.hamcrest}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<resources>
Expand Down
10 changes: 9 additions & 1 deletion warehouse/data-dictionary-core/pom.xml
View file
Open in desktop
cogross marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-query-core</artifactId>
Expand All @@ -18,6 +22,10 @@
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>dictionary-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>
</dependencies>
<build>
<resources>
Expand All @@ -27,4 +35,4 @@
</resource>
</resources>
</build>
</project>
</project>
10 changes: 9 additions & 1 deletion warehouse/edge-dictionary-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-query-core</artifactId>
Expand All @@ -18,6 +22,10 @@
<groupId>gov.nsa.datawave.microservice</groupId>
<artifactId>dictionary-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</dependency>
</dependencies>
<build>
<resources>
Expand All @@ -27,4 +35,4 @@
</resource>
</resources>
</build>
</project>
</project>
Loading
Loading