Skip to content

Commit 7ed2bdf

Browse files
author
Hongxin Zhang
committed
Exclude slf4j from jslack to avoid duplicate slf4j dependencies
1 parent eac85ba commit 7ed2bdf

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

.github/release-drafter.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name-template: '$NEXT_MINOR_VERSION'
2-
tag-template: '$NEXT_MINOR_VERSION'
1+
name-template: '$NEXT_PATCH_VERSION'
2+
tag-template: '$NEXT_PATCH_VERSION'
33
categories:
44
- title: '🧬 Features'
55
labels:
@@ -37,4 +37,4 @@ template: |
3737
3838
## 🕵️‍♀️ Full commit logs
3939
40-
- https://github.com/oncokb/oncokb-public/compare/$PREVIOUS_TAG...$NEXT_MINOR_VERSION
40+
- https://github.com/oncokb/oncokb-public/compare/$PREVIOUS_TAG...$NEXT_PATCH_VERSION

k8s/oncokb-public-local.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ metadata:
44
name: oncokb-public
55
namespace: default
66
spec:
7-
replicas: 1
7+
replicas: 3
88
selector:
99
matchLabels:
1010
app: oncokb-public
1111
version: 'v1'
12+
strategy:
13+
rollingUpdate:
14+
maxSurge: 4
15+
maxUnavailable: 2
16+
type: RollingUpdate
1217
template:
1318
metadata:
1419
labels:
@@ -17,7 +22,7 @@ spec:
1722
spec:
1823
containers:
1924
- name: oncokb-public
20-
image: cbioportal/oncokb-public:2.3.0
25+
image: cbioportal/oncokb-public:2.3.1
2126
env:
2227
- name: SPRING_PROFILES_ACTIVE
2328
value: prod,no-liquibase

pom.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>org.mskcc.cbio.oncokb</groupId>
77
<artifactId>public-website</artifactId>
8-
<version>2.3.0</version>
8+
<version>2.3.1</version>
99
<packaging>jar</packaging>
1010
<name>OncoKB Public Website</name>
1111

@@ -79,7 +79,7 @@
7979
<frontend-maven-plugin.version>1.9.1</frontend-maven-plugin.version>
8080
<git-commit-id-plugin.version>4.0.0</git-commit-id-plugin.version>
8181
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
82-
<jib-maven-plugin.version>2.0.0</jib-maven-plugin.version>
82+
<jib-maven-plugin.version>2.1.0</jib-maven-plugin.version>
8383
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
8484
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
8585
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
@@ -250,12 +250,6 @@
250250
<dependency>
251251
<groupId>org.springframework.boot</groupId>
252252
<artifactId>spring-boot-starter-thymeleaf</artifactId>
253-
<exclusions>
254-
<exclusion>
255-
<groupId>ch.qos.logback</groupId>
256-
<artifactId>logback-classic</artifactId>
257-
</exclusion>
258-
</exclusions>
259253
</dependency>
260254
<dependency>
261255
<groupId>org.springframework.boot</groupId>
@@ -347,6 +341,12 @@
347341
<groupId>com.github.seratch</groupId>
348342
<artifactId>jslack</artifactId>
349343
<version>${jslack.version}</version>
344+
<exclusions>
345+
<exclusion>
346+
<groupId>org.jboss.slf4j</groupId>
347+
<artifactId>slf4j-jboss-logging</artifactId>
348+
</exclusion>
349+
</exclusions>
350350
</dependency>
351351
<!-- jhipster-needle-maven-add-dependency -->
352352
</dependencies>
@@ -621,7 +621,7 @@
621621
<image>adoptopenjdk:11-jre-hotspot</image>
622622
</from>
623623
<to>
624-
<image>cbioportal/oncokb-public:2.3.0</image>
624+
<image>cbioportal/oncokb-public:2.3.1</image>
625625
</to>
626626
<container>
627627
<entrypoint>

src/main/docker/app.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
oncokb-app:
4-
image: cbioportal/oncokb-public:2.3.0
4+
image: cbioportal/oncokb-public:2.3.1
55
environment:
66
- _JAVA_OPTIONS=-Xmx512m -Xms256m
77
- SPRING_PROFILES_ACTIVE=prod,swagger

0 commit comments

Comments
 (0)