diff options
| -rw-r--r-- | parent/pom.xml | 91 | ||||
| -rw-r--r-- | vespa-hadoop/pom.xml | 92 |
2 files changed, 91 insertions, 92 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index afec99ee8c1..884b208d997 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -442,6 +442,7 @@ </build> </profile> </profiles> + <dependencyManagement> <dependencies> <!-- Please keep this list lexically sorted by groupId, then artifactId.--> @@ -1084,6 +1085,89 @@ <artifactId>json-smart</artifactId> <version>${json-smart.version}</version> </dependency> + <dependency> + <!-- Force fresh woodstox-core without security issue hadoop-3.3.4 --> + <groupId>com.fasterxml.woodstox</groupId> + <artifactId>woodstox-core</artifactId> + <version>${woodstox.version}</version> + </dependency> + <dependency> + <!-- Force fresh jersey-json without security issue hadoop-3.3.4 --> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-json</artifactId> + <version>${sun-jersey-json.version}</version> + </dependency> + <dependency> + <!-- Force fresh jettison without security issue hadoop-3.3.4 --> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>${jettison.version}</version> + </dependency> + <dependency> + <!-- Transitive dependencies from pig-0.16 up-to-date --> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + <version>${tomcat-jasper.version}</version> + </dependency> + <dependency> + <!-- Transitive dependencies from pig-0.16 up-to-date --> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + <version>${tomcat-jasper.version}</version> + </dependency> + <!-- Hadoop dependencies --> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <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.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${hadoop.version}</version> + <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.pig</groupId> + <artifactId>pig</artifactId> + <version>${pig.version}</version> + <classifier>h2</classifier> + </dependency> + <dependency> + <!-- Hadoop test dependency --> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-minicluster</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> @@ -1117,7 +1201,10 @@ <felix.version>7.0.1</felix.version> <felix.log.version>1.0.1</felix.log.version> <findbugs.version>3.0.2</findbugs.version> <!-- Should be kept in sync with guava --> + <groovy.version>3.0.13</groovy.version> + <hadoop.version>3.3.4</hadoop.version> <hdrhistogram.version>2.1.12</hdrhistogram.version> + <jettison.version>1.5.1</jettison.version> <jetty.version>9.4.49.v20220914</jetty.version> <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <jjwt.version>0.11.2</jjwt.version> @@ -1149,11 +1236,15 @@ <onnxruntime.version>1.12.1</onnxruntime.version> <!-- WARNING: sync cloud-tenant-base-dependencies-enforcer/pom.xml --> <org.json.version>20220320</org.json.version> <org.lz4.version>1.8.0</org.lz4.version> + <pig.version>0.16.0</pig.version> <prometheus.client.version>0.6.0</prometheus.client.version> <protobuf.version>3.21.7</protobuf.version> <spifly.version>1.3.5</spifly.version> + <sun-jersey-json.version>1.19.4</sun-jersey-json.version> <surefire.version>2.22.2</surefire.version> + <tomcat-jasper.version>5.5.23</tomcat-jasper.version> <wiremock.version>2.34.0</wiremock.version> + <woodstox.version>6.4.0</woodstox.version> <zookeeper.client.version>3.8.0</zookeeper.client.version> <doclint>all</doclint> diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index b497fda2aab..43f7c17967d 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -17,110 +17,29 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <hadoop.version>3.3.4</hadoop.version> - <woodstox.version>6.4.0</woodstox.version> - <sun-jersey-json.version>1.19.4</sun-jersey-json.version> - <jettison.version>1.5.1</jettison.version> - <pig.version>0.16.0</pig.version> - <tomcat-jasper.version>5.5.23</tomcat-jasper.version> </properties> - <dependencyManagement> - <dependencies> - <!-- Force newer version of jetty-util (to match Jetty version of jdisc) --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty.version}</version> - </dependency> - <!-- Force fresh woodstox-core without security issue --> - <dependency> - <groupId>com.fasterxml.woodstox</groupId> - <artifactId>woodstox-core</artifactId> - <version>${woodstox.version}</version> - </dependency> - <!-- Force fresh jersey-json without security issue --> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - <version>${sun-jersey-json.version}</version> - </dependency> - <!-- Force fresh jettison without security issue --> - <dependency> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - <version>${jettison.version}</version> - </dependency> - <!-- Below versions are to bring transitive dependencies from pig up-to-date --> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>${tomcat-jasper.version}</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>${tomcat-jasper.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>3.0.13</version> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <!-- Hadoop dependencies --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <scope>provided</scope> - <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.hadoop</groupId> <artifactId>hadoop-client</artifactId> - <version>${hadoop.version}</version> <scope>provided</scope> - <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.pig</groupId> <artifactId>pig</artifactId> - <version>${pig.version}</version> <classifier>h2</classifier> <scope>provided</scope> </dependency> <!-- These are inherited from parent. Needed for correct versions on Hadoop. --> <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <scope>compile</scope> @@ -135,18 +54,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <!-- This is a HACK due to hadoop relying on mockito in NameNodeAdapter, but not providing it. Brum, brum !! --> |