Skip to content

Commit

Permalink
[*] fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-karpovich committed Aug 29, 2023
1 parent f6073b4 commit 2f4e922
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 83 deletions.
33 changes: 27 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ configure(javaProjects) {
// https://github.com/spring-gradle-plugins/dependency-management-plugin#dependency-management-dsl
dependencyManagement {

imports {
mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.5'
}

dependencies {
// Enunciate annotations
dependency 'com.webcohesion.enunciate:enunciate-core-annotations:2.12.1'
Expand Down Expand Up @@ -144,15 +148,12 @@ configure(javaProjects) {
}

dependency 'org.modelmapper:modelmapper:2.3.2'
//dependency group: 'com.epam.deltix', name: 'orderbook-core', version: '1.0.18'
dependency 'com.epam.deltix:orderbook-core:1.0.18'

// ----

//dependency 'deltix:deltix-spring-api-keys:0.1.4'

// spring boot tests
dependency 'org.springframework.boot:spring-boot-starter-test:2.7.12'
dependency 'org.junit.jupiter:junit-jupiter-api:5.8.2'
//dependency 'com.nimbusds:oauth2-oidc-sdk:6.14'

Expand Down Expand Up @@ -183,9 +184,11 @@ configure(javaProjects) {
entry 'jackson-databind'
entry 'jackson-core'
entry 'jackson-annotations'
entry 'jackson-module-parameter-names'
}

dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5'
dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5'

dependency 'io.micrometer:micrometer-registry-prometheus:1.9.1'
dependency 'io.micrometer:micrometer-core:1.9.1'
Expand All @@ -207,17 +210,18 @@ configure(javaProjects) {

dependencySet(group: 'org.springframework.boot', version: '2.7.13') {
entry 'spring-boot'
entry 'spring-boot-autoconfigure'
entry 'spring-boot-configuration-processor'
entry 'spring-boot-starter'
entry 'spring-boot-starter-json'
entry 'spring-boot-autoconfigure'
entry 'spring-boot-starter-web'
entry 'spring-boot-starter-websocket'
entry 'spring-boot-starter-actuator'
entry 'spring-boot-configuration-processor'
entry 'spring-boot-starter-validation'
entry 'spring-boot-starter-test'
}

dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.78') {
dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.64') {
entry 'tomcat-embed-core'
entry 'tomcat-embed-websocket'
entry 'tomcat-embed-el'
Expand Down Expand Up @@ -254,6 +258,23 @@ configure(javaProjects) {
dependency 'org.yaml:snakeyaml:2.0'

dependency 'org.apache.bcel:bcel:6.6.0'

dependencySet(group: 'io.netty', version: '4.1.77.Final') {
entry 'netty-codec'
entry 'netty-codec-http'
entry 'netty-handler'
entry 'netty-buffer'
entry 'netty-common'
entry 'netty-transport'
entry 'netty-resolver'
entry 'netty-codec-dns'
entry 'netty-codec-socks'
entry 'netty-handler-proxy'
entry 'netty-resolver-dns'
entry 'netty-transport-native-epoll'
entry 'netty-transport-native-kqueue'
entry 'netty-transport-native-unix-common'
}
}
}

Expand Down
1 change: 1 addition & 0 deletions java/ws-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ task devguide(type: Zip, dependsOn: enunciate) {
}

jar {
zip64 = true
enabled = false
}

Expand Down
5 changes: 0 additions & 5 deletions web/frontend/.npmrc

This file was deleted.

5 changes: 0 additions & 5 deletions web/frontend/libs/@deltix/decimal-utils/.npmrc.tmp

This file was deleted.

5 changes: 0 additions & 5 deletions web/frontend/libs/@deltix/logger/.npmrc.tmp

This file was deleted.

56 changes: 0 additions & 56 deletions web/frontend/libs/@deltix/vizceral/.gitlab-ci.yml

This file was deleted.

6 changes: 0 additions & 6 deletions web/frontend/libs/@deltix/vizceral/.npmrc.tmp

This file was deleted.

0 comments on commit 2f4e922

Please sign in to comment.