Commit 9db36d8b authored by Rostislav Vatolin [SLB]'s avatar Rostislav Vatolin [SLB]
Browse files

Merge branch 'update_dep' into 'master'

Remove exclusions, cleanup pom files

See merge request !111
parents 022d7731 16d89681
Pipeline #64372 failed with stages
in 27 minutes and 42 seconds
...@@ -46,11 +46,11 @@ The following software have components provided under the terms of this license: ...@@ -46,11 +46,11 @@ The following software have components provided under the terms of this license:
- Apache Commons Pool (from https://commons.apache.org/proper/commons-pool/) - Apache Commons Pool (from https://commons.apache.org/proper/commons-pool/)
- Apache Commons Text (from https://commons.apache.org/proper/commons-text) - Apache Commons Text (from https://commons.apache.org/proper/commons-text)
- Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version})
- Apache Groovy (from https://groovy-lang.org)
- Apache Groovy (from http://groovy-lang.org)
- Apache Groovy (from http://groovy-lang.org) - Apache Groovy (from http://groovy-lang.org)
- Apache Groovy (from https://groovy-lang.org) - Apache Groovy (from https://groovy-lang.org)
- Apache Groovy (from https://groovy-lang.org) - Apache Groovy (from https://groovy-lang.org)
- Apache Groovy (from http://groovy-lang.org)
- Apache Groovy (from https://groovy-lang.org)
- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul) - Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul)
...@@ -161,6 +161,8 @@ The following software have components provided under the terms of this license: ...@@ -161,6 +161,8 @@ The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/)
- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations) - JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
- Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/)
- Joda-Time (from https://www.joda.org/joda-time/)
- Joda-Time (from https://www.joda.org/joda-time/)
- KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2) - KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2)
- KeePassJava2 :: DOM (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-dom) - KeePassJava2 :: DOM (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-dom)
- KeePassJava2 :: JAXB (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-jaxb) - KeePassJava2 :: JAXB (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-jaxb)
...@@ -323,17 +325,16 @@ The following software have components provided under the terms of this license: ...@@ -323,17 +325,16 @@ The following software have components provided under the terms of this license:
- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j) - resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io)
- rxjava (from https://github.com/ReactiveX/RxJava) - rxjava (from https://github.com/ReactiveX/RxJava)
- spring-boot (from https://spring.io/projects/spring-boot) - spring-boot (from https://spring.io/projects/spring-boot)
- spring-boot-actuator (from https://spring.io/projects/spring-boot) - spring-boot-actuator (from https://spring.io/projects/spring-boot)
- spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot)
- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-autoconfigure (from https://spring.io/projects/spring-boot)
- spring-boot-dependencies (from https://spring.io/projects/spring-boot) - spring-boot-dependencies (from https://spring.io/projects/spring-boot)
- spring-boot-dependencies (from https://spring.io/projects/spring-boot)
- spring-boot-starter (from https://spring.io/projects/spring-boot) - spring-boot-starter (from https://spring.io/projects/spring-boot)
- spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot)
- spring-boot-starter-aop (from https://spring.io/projects/spring-boot) - spring-boot-starter-aop (from https://spring.io/projects/spring-boot)
...@@ -773,6 +774,8 @@ The following software have components provided under the terms of this license: ...@@ -773,6 +774,8 @@ The following software have components provided under the terms of this license:
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava) - Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Joda-Time (from https://www.joda.org/joda-time/) - Joda-Time (from https://www.joda.org/joda-time/)
- Joda-Time (from https://www.joda.org/joda-time/)
- Joda-Time (from https://www.joda.org/joda-time/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/) - LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java)
......
...@@ -43,13 +43,6 @@ ...@@ -43,13 +43,6 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.1.18.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId> <artifactId>os-core-common</artifactId>
......
...@@ -30,12 +30,6 @@ ...@@ -30,12 +30,6 @@
<groupId>org.opengroup.osdu.core.aws</groupId> <groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId> <artifactId>os-core-lib-aws</artifactId>
<version>${core-lib-aws.version}</version> <version>${core-lib-aws.version}</version>
<exclusions>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
......
...@@ -51,10 +51,6 @@ ...@@ -51,10 +51,6 @@
<groupId>org.simpleframework</groupId> <groupId>org.simpleframework</groupId>
<artifactId>simple-xml</artifactId> <artifactId>simple-xml</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- <!--
......
...@@ -57,12 +57,6 @@ ...@@ -57,12 +57,6 @@
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId> <artifactId>core-lib-gcp</artifactId>
<version>0.11.0</version> <version>0.11.0</version>
<exclusions>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -50,12 +50,6 @@ ...@@ -50,12 +50,6 @@
<artifactId>os-core-lib-aws</artifactId> <artifactId>os-core-lib-aws</artifactId>
<version>${core-lib-aws.version}</version> <version>${core-lib-aws.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
......
...@@ -58,12 +58,6 @@ ...@@ -58,12 +58,6 @@
<artifactId>os-core-lib-ibm</artifactId> <artifactId>os-core-lib-ibm</artifactId>
<version>${os-core-lib-ibm.version}</version> <version>${os-core-lib-ibm.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment