This is an automated email from the ASF dual-hosted git repository. ykinash pushed a commit to branch DATALAB-2556 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 5891d61799ddcc906935eadbf90f25e699fe870a Author: KinashYurii <[email protected]> AuthorDate: Mon Nov 8 21:02:04 2021 +0200 [DATALAB-2563] -- fixed merge conf --- services/billing-azure/pom.xml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/services/billing-azure/pom.xml b/services/billing-azure/pom.xml index 80caf44..b5a4098 100644 --- a/services/billing-azure/pom.xml +++ b/services/billing-azure/pom.xml @@ -105,11 +105,11 @@ <version>${org.mongodb.version}</version> </dependency> - <!--dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-yaml</artifactId> - <version>2.9.5</version> - </dependency--> +<!-- <dependency>--> +<!-- <groupId>com.fasterxml.jackson.dataformat</groupId>--> +<!-- <artifactId>jackson-dataformat-yaml</artifactId>--> +<!-- <version>2.12.2</version>--> +<!-- </dependency>--> <dependency> <groupId>ch.qos.logback</groupId> @@ -121,16 +121,17 @@ <artifactId>httpclient</artifactId> <version>4.5.5</version> </dependency> - <!--dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-guava</artifactId> - <version>2.11.0</version> - </dependency--> - <!--dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jsr310</artifactId> - <version>2.11.0</version> - </dependency--> + +<!-- <dependency>--> +<!-- <groupId>com.fasterxml.jackson.datatype</groupId>--> +<!-- <artifactId>jackson-datatype-guava</artifactId>--> +<!-- <version>2.11.0</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>com.fasterxml.jackson.datatype</groupId>--> +<!-- <artifactId>jackson-datatype-jsr310</artifactId>--> +<!-- <version>2.11.0</version>--> +<!-- </dependency>--> </dependencies> @@ -150,4 +151,4 @@ </plugins> </build> -</project> +</project> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
