-
Karina Cadette authored
commit fac8925e Author: David Diederich <d.diederich@opengroup.org> Date: Wed Feb 02 2022 11:21:29 GMT-0600 (Central Standard Time) Update version of default branch to 0.14.0-SNAPSHOT commit 432b83e9 Author: Alok Joshi <ajoshi19@slb.com> Date: Tue Feb 01 2022 15:24:10 GMT-0600 (Central Standard Time) Merge branch 'json_smart_fix' into 'master' Upgrade json-smart See merge request !179 commit 528f4079 Author: David Diederich <d.diederich@opengroup.org> Date: Fri Jan 28 2022 09:16:54 GMT-0600 (Central Standard Time) Merge branch 'upgrade-log4j-2.17.1' into 'master' Upgrade Log4J to 2.17.1 Closes #38 See merge request !174 commit d7d0491b Author: Alok Joshi <AJoshi19@slb.com> Date: Tue Feb 01 2022 14:17:02 GMT-0600 (Central Standard Time) update NOTICE commit 9574ec7e Author: Yunhua Koglin <kogliny@amazon.com> Date: Thu Jan 27 2022 15:15:27 GMT-0600 (Central Standard Time) Merge branch 'aws-integration' into 'master' Changes for m10 See merge request !176 commit 6e480f17 Author: David Diederich <d.diederich@opengroup.org> Date: Fri Jan 28 2022 07:51:16 GMT-0600 (Central Standard Time) Updating NOTICE commit b9c04c85 Author: Alok Joshi <AJoshi19@slb.com> Date: Tue Feb 01 2022 13:31:17 GMT-0600 (Central Standard Time) upgrade json-smart commit 7a05afe9 Author: David Diederich <d.diederich@opengroup.org> Date: Fri Jan 28 2022 06:22:14 GMT-0600 (Central Standard Time) Merge remote-tracking branch 'origin/master' into upgrade-log4j-2.17.1 commit d4ce607b Author: David Diederich <d.diederich@opengroup.org> Date: Wed Jan 26 2022 03:43:07 GMT-0600 (Central Standard Time) Updating NOTICE commit 9625c972 Author: David Diederich <d.diederich@opengroup.org> Date: Tue Jan 25 2022 12:04:24 GMT-0600 (Central Standard Time) Upgrading explicit Log4J version commit 3432a41f Author: David Diederich <d.diederich@opengroup.org> Date: Tue Jan 25 2022 10:47:00 GMT-0600 (Central Standard Time) Upgrade core library dependencies This will pick up the latest log4j 2.17.1 change, addressing CVE-2021-44832
Karina Cadette authoredcommit fac8925e Author: David Diederich <d.diederich@opengroup.org> Date: Wed Feb 02 2022 11:21:29 GMT-0600 (Central Standard Time) Update version of default branch to 0.14.0-SNAPSHOT commit 432b83e9 Author: Alok Joshi <ajoshi19@slb.com> Date: Tue Feb 01 2022 15:24:10 GMT-0600 (Central Standard Time) Merge branch 'json_smart_fix' into 'master' Upgrade json-smart See merge request !179 commit 528f4079 Author: David Diederich <d.diederich@opengroup.org> Date: Fri Jan 28 2022 09:16:54 GMT-0600 (Central Standard Time) Merge branch 'upgrade-log4j-2.17.1' into 'master' Upgrade Log4J to 2.17.1 Closes #38 See merge request !174 commit d7d0491b Author: Alok Joshi <AJoshi19@slb.com> Date: Tue Feb 01 2022 14:17:02 GMT-0600 (Central Standard Time) update NOTICE commit 9574ec7e Author: Yunhua Koglin <kogliny@amazon.com> Date: Thu Jan 27 2022 15:15:27 GMT-0600 (Central Standard Time) Merge branch 'aws-integration' into 'master' Changes for m10 See merge request !176 commit 6e480f17 Author: David Diederich <d.diederich@opengroup.org> Date: Fri Jan 28 2022 07:51:16 GMT-0600 (Central Standard Time) Updating NOTICE commit b9c04c85 Author: Alok Joshi <AJoshi19@slb.com> Date: Tue Feb 01 2022 13:31:17 GMT-0600 (Central Standard Time) upgrade json-smart commit 7a05afe9 Author: David Diederich <d.diederich@opengroup.org> Date: Fri Jan 28 2022 06:22:14 GMT-0600 (Central Standard Time) Merge remote-tracking branch 'origin/master' into upgrade-log4j-2.17.1 commit d4ce607b Author: David Diederich <d.diederich@opengroup.org> Date: Wed Jan 26 2022 03:43:07 GMT-0600 (Central Standard Time) Updating NOTICE commit 9625c972 Author: David Diederich <d.diederich@opengroup.org> Date: Tue Jan 25 2022 12:04:24 GMT-0600 (Central Standard Time) Upgrading explicit Log4J version commit 3432a41f Author: David Diederich <d.diederich@opengroup.org> Date: Tue Jan 25 2022 10:47:00 GMT-0600 (Central Standard Time) Upgrade core library dependencies This will pick up the latest log4j 2.17.1 change, addressing CVE-2021-44832
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
pom.xml 3.14 KiB
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-2020, Schlumberger
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-notification-testing</artifactId>
<version>0.14.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>notification-test-azure</artifactId>
<version>0.14.0-SNAPSHOT</version>
<name>notification-test-azure</name>
<description>Integration tests Azure for notification</description>
<packaging>jar</packaging>
<properties>
<java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
</properties>
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.notification</groupId>
<artifactId>notification-test-core</artifactId>
<version>0.14.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>0.0.22</version>
<exclusions>
<exclusion>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
</exclusion>
<exclusion>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.3.5.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
<version>0.9.7.RELEASE</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>