Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
Notification
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSDU
OSDU Data Platform
System
Notification
Commits
40db5b23
Commit
40db5b23
authored
1 year ago
by
Solomon Ayalew
Browse files
Options
Downloads
Patches
Plain Diff
Attempt to fix Azure deploy
parent
95d5c8bd
No related branches found
No related tags found
2 merge requests
!491
Upgrade service to spring 6 and Spring-boot 3
,
!490
Solxget spring6 2
Pipeline
#249617
failed
1 year ago
Stage: build
Stage: coverage
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pom.xml
+2
-2
2 additions, 2 deletions
pom.xml
provider/notification-azure/pom.xml
+31
-25
31 additions, 25 deletions
provider/notification-azure/pom.xml
provider/notification-ibm/pom.xml
+22
-28
22 additions, 28 deletions
provider/notification-ibm/pom.xml
with
55 additions
and
55 deletions
pom.xml
+
2
−
2
View file @
40db5b23
...
...
@@ -28,7 +28,7 @@
<os-core-common.version>
0.26.0-rc2
</os-core-common.version>
<log4j2.version>
2.17.1
</log4j2.version>
<json-smart.version>
2.5.0
</json-smart.version>
<openapi.version>
1.6.14
</openapi.version>
<openapi.version>
2.3.0
</openapi.version>
<spring-webmvc.version>
6.1.4
</spring-webmvc.version>
<netty.version>
4.1.106.Final
</netty.version>
<snakeyaml-version>
2.0
</snakeyaml-version>
...
...
@@ -113,7 +113,7 @@
<!-- swagger dependency -->
<dependency>
<groupId>
org.springdoc
</groupId>
<artifactId>
springdoc-openapi-ui
</artifactId>
<artifactId>
springdoc-openapi-
starter-webmvc-
ui
</artifactId>
<version>
${openapi.version}
</version>
<exclusions>
<exclusion>
...
...
This diff is collapsed.
Click to expand it.
provider/notification-azure/pom.xml
+
31
−
25
View file @
40db5b23
...
...
@@ -87,31 +87,7 @@
<artifactId>
woodstox-core
</artifactId>
<version>
${woodstox-core.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-slf4j-impl
</artifactId>
<version>
${log4j2.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-to-slf4j
</artifactId>
<version>
${log4j2.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-api
</artifactId>
<version>
${log4j2.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-core
</artifactId>
<version>
${log4j2.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-jul
</artifactId>
<version>
${log4j2.version}
</version>
</dependency>
<dependency>
<groupId>
io.undertow
</groupId>
<artifactId>
undertow-core
</artifactId>
...
...
@@ -136,6 +112,24 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-to-slf4j
</artifactId>
<version>
${log4j2.version}
</version>
<exclusions>
<exclusion>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-api
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-api
</artifactId>
<version>
${log4j2.version}
</version>
</dependency>
<!-- OSDU Dependencies -->
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
...
...
@@ -146,11 +140,23 @@
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-common-spring6
</artifactId>
<version>
${os-core-common.version}
</version>
<exclusions>
<exclusion>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
core-lib-azure-spring6
</artifactId>
<version>
${osdu.corelibazure.version}
</version>
<exclusions>
<exclusion>
<groupId>
commons-logging
</groupId>
<artifactId>
commons-logging
</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Spring Dependencies -->
...
...
This diff is collapsed.
Click to expand it.
provider/notification-ibm/pom.xml
+
22
−
28
View file @
40db5b23
...
...
@@ -47,34 +47,28 @@
</dependencyManagement>
<dependencies>
<!-- <dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common-spring6</artifactId>
</dependency> -->
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-lib-ibm
</artifactId>
<version>
0.25.1
</version>
<exclusions>
<exclusion>
<groupId>
org.apache.lucene
</groupId>
<artifactId>
lucene-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.yaml
</groupId>
<artifactId>
snakeyaml
</artifactId>
</exclusion>
<exclusion>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
<artifactId>
jackson-dataformat-cbor
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-web
</artifactId>
</exclusion>
</exclusions>
<dependency>
<groupId>
org.opengroup.osdu
</groupId>
<artifactId>
os-core-lib-ibm
</artifactId>
<version>
0.26.0-rc8
</version>
<exclusions>
<exclusion>
<groupId>
org.apache.lucene
</groupId>
<artifactId>
lucene-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.yaml
</groupId>
<artifactId>
snakeyaml
</artifactId>
</exclusion>
<exclusion>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
<artifactId>
jackson-dataformat-cbor
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.springframework.security
</groupId>
<artifactId>
spring-security-web
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
com.fasterxml.jackson.dataformat
</groupId>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment