Skip to content

Commit

Permalink
squashed old branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Gross cogross committed Nov 16, 2023
1 parent 3e4037c commit 4c706b3
Show file tree
Hide file tree
Showing 42 changed files with 2,155 additions and 486 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ jobs:
$RUN_TESTS \
|| { echo "***** TESTS FAILED. Attempting retry."; $RUN_TESTS; } \
|| { echo "***** TESTS FAILED. Attempting final retry."; $RUN_TESTS; }
- name: Analyze Dependencies
run: |
mvn -V -B -e -ntp "-Dstyle.color=always" dependency:analyze package -DskipTests=true
# This step can be uncommented to support feature development. When developing a
# feature which spans multiple repos, you can update the poms to use the latest
Expand Down Expand Up @@ -158,4 +161,3 @@ jobs:
# docker tag ${IMAGE_NAME}:${TAG} ${REMOTE_IMAGE_NAME}:${TAG}
# docker images
# docker push ${REMOTE_IMAGE_NAME}:${TAG}

12 changes: 3 additions & 9 deletions common-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,12 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</artifactId>
<artifactId>accumulo-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
Expand Down
31 changes: 29 additions & 2 deletions pom.xml
View file
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,27 @@
<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.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 +121,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 +133,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 @@ -1412,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 Expand Up @@ -2144,4 +2171,4 @@
</build>
</profile>
</profiles>
</project>
</project>
34 changes: 20 additions & 14 deletions warehouse/accumulo-extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,41 @@
<artifactId>datawave-accumulo-extensions</artifactId>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-server-base</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-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<scope>provided</scope>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
<scope>provided</scope>
<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.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>gov.nsa.datawave</groupId>
<artifactId>datawave-common-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
44 changes: 9 additions & 35 deletions warehouse/assemble/webservice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,23 @@
<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-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 All @@ -37,40 +46,5 @@
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.webservices</groupId>
<artifactId>datawave-ws-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.webservices</groupId>
<artifactId>datawave-ws-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.webservices</groupId>
<artifactId>datawave-ws-common-util</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.webservices</groupId>
<artifactId>datawave-ws-map-reduce</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>gov.nsa.datawave.webservices</groupId>
<artifactId>datawave-ws-query</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
29 changes: 0 additions & 29 deletions warehouse/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
<artifactId>datawave-common</artifactId>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
Expand All @@ -21,31 +17,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
Expand Down
Loading

0 comments on commit 4c706b3

Please sign in to comment.