diff options
Diffstat (limited to 'parent/pom.xml')
| -rw-r--r-- | parent/pom.xml | 76 |
1 files changed, 37 insertions, 39 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 3b817d4b3ff..18fad225aad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>parent</artifactId> @@ -196,6 +196,7 @@ <configuration> <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile> <systemPropertyVariables> + <config_model.ip_check>false</config_model.ip_check> <jdisc.logger.level>INFO</jdisc.logger.level> <java.io.tmpdir>${project.build.directory}</java.io.tmpdir> </systemPropertyVariables> @@ -314,11 +315,35 @@ </build> </profile> <profile> + <id>custom-javadoc</id> + <activation> + <file><exists>src/main/javadoc</exists></file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <classifier>javadoc</classifier> + <classesDirectory>${project.basedir}/src/main/javadoc</classesDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>generate-javadoc</id> <activation> - <property> - <name>!skipJavadoc</name> - </property> + <file><missing>src/main/javadoc</missing></file> </activation> <build> <plugins> @@ -542,18 +567,6 @@ <version>${prometheus.client.version}</version> </dependency> <dependency> - <!-- TODO: Try to remove, as this overlaps with javax.activation. --> - <groupId>jakarta.activation</groupId> - <artifactId>jakarta.activation-api</artifactId> - <version>1.2.1</version> - </dependency> - <dependency> - <!-- TODO: Try to remove, as this conflicts with javax.xml.bind:jaxb-api --> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <version>2.3.2</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> @@ -586,7 +599,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.19</version> + <version>1.21</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -605,11 +618,6 @@ </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>fluent-hc</artifactId> - <version>4.3.6</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>${apache.httpclient.version}</version> </dependency> @@ -631,7 +639,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.3.6</version> + <version>${apache.httpclient.version}</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -691,8 +699,8 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - <version>1.7</version> + <artifactId>velocity-engine-core</artifactId> + <version>2.3</version> </dependency> <dependency> <groupId>org.assertj</groupId> @@ -815,16 +823,6 @@ <version>${asm.version}</version> </dependency> <dependency> - <groupId>org.tensorflow</groupId> - <artifactId>proto</artifactId> - <version>${tensorflow.version}</version> - </dependency> - <dependency> - <groupId>org.tensorflow</groupId> - <artifactId>tensorflow</artifactId> - <version>${tensorflow.version}</version> - </dependency> - <dependency> <groupId>org.twdata.maven</groupId> <artifactId>mojo-executor</artifactId> <version>2.3.0</version> @@ -863,10 +861,11 @@ zkfacade/src/main/java/org/apache/curator/**/package-info.java using something like find zkfacade/src/main/java/org/apache/curator -name package-info.java | \ - xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 4, minor = 3, micro = 0/g' + xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 5, minor = 3, micro = 0/g' --> - <curator.version>5.1.0</curator.version> + <curator.version>5.2.0</curator.version> <jna.version>4.5.2</jna.version> + <commons.codec.version>1.15</commons.codec.version> <commons.math3.version>3.6.1</commons.math3.version> <junit.version>5.7.0</junit.version> <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version> @@ -885,11 +884,10 @@ <maven-site-plugin.version>3.3</maven-site-plugin.version> <maven-source-plugin.version>3.0.1</maven-source-plugin.version> <prometheus.client.version>0.6.0</prometheus.client.version> - <onnxruntime.version>1.7.0</onnxruntime.version> + <onnxruntime.version>1.8.0</onnxruntime.version> <protobuf.version>3.11.4</protobuf.version> <spifly.version>1.3.3</spifly.version> <surefire.version>2.22.0</surefire.version> - <tensorflow.version>1.12.0</tensorflow.version> <zookeeper.client.version>3.6.3</zookeeper.client.version> <doclint>all</doclint> |