Skip to content

Commit 7cfcaae

Browse files
amattu2amattu2
authored
Merge pull request #153 from CBIIT/3.1.0
3.1.0 Release
2 parents 4d551d6 + 5441ba1 commit 7cfcaae

10 files changed

Lines changed: 743 additions & 269 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.apt_generated
22
.apt_generated_tests
33
.classpath
4+
.devcontainer/
45
.DS_Store
56
.factorypath
67
.idea

‎Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Build stage
2-
3-
FROM maven:3.9.6-eclipse-temurin-17 as build
4-
2+
FROM maven:3.9.6-eclipse-temurin-17 AS build
53

64
WORKDIR /usr/src/app
75
COPY . .
@@ -17,6 +15,9 @@ RUN apt-get update && apt-get install unzip
1715
RUN rm -rf /usr/local/tomcat/webapps.dist
1816
RUN rm -rf /usr/local/tomcat/webapps/ROOT
1917

18+
# Modify the server.xml file to block error reporting
19+
RUN sed -i 's|</Host>| <Valve className="org.apache.catalina.valves.ErrorReportValve"\n showReport="false"\n showServerInfo="false" />\n\n </Host>|' conf/server.xml
20+
2021
# expose ports
2122
EXPOSE 8080
2223

‎pom.xml‎

Lines changed: 143 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,36 @@
1717
<parent>
1818
<groupId>org.springframework.boot</groupId>
1919
<artifactId>spring-boot-starter-parent</artifactId>
20-
<version>3.0.13</version>
20+
<version>3.4.5</version>
2121
</parent>
2222

2323

2424
<properties>
2525
<java.version>17</java.version>
26-
<spring.version>6.0.14</spring.version>
27-
<spring.restdocs.version>3.0.1</spring.restdocs.version>
28-
<snakeyaml.version>2.0</snakeyaml.version>
26+
<spring.version>6.2.6</spring.version>
27+
<spring.restdocs.version>3.0.3</spring.restdocs.version>
28+
<snakeyaml.version>2.3</snakeyaml.version>
29+
<kotlin.version>2.1.0</kotlin.version>
2930
</properties>
3031

3132
<dependencies>
3233
<!-- Spring Boot -->
34+
<dependency>
35+
<groupId>org.apache.logging.log4j</groupId>
36+
<artifactId>log4j-api</artifactId>
37+
<version>2.24.3</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.apache.logging.log4j</groupId>
41+
<artifactId>log4j-core</artifactId>
42+
<version>2.24.3</version>
43+
<exclusions>
44+
<exclusion>
45+
<groupId>org.apache.logging.log4j</groupId>
46+
<artifactId>log4j-api</artifactId>
47+
</exclusion>
48+
</exclusions>
49+
</dependency>
3350
<dependency>
3451
<groupId>org.springframework.boot</groupId>
3552
<artifactId>spring-boot-starter</artifactId>
@@ -43,6 +60,21 @@
4360
<dependency>
4461
<groupId>org.springframework.boot</groupId>
4562
<artifactId>spring-boot-starter-log4j2</artifactId>
63+
<version>3.4.3</version>
64+
<exclusions>
65+
<exclusion>
66+
<groupId>org.apache.logging.log4j</groupId>
67+
<artifactId>log4j-slf4j2-impl</artifactId>
68+
</exclusion>
69+
<exclusion>
70+
<groupId>org.apache.logging.log4j</groupId>
71+
<artifactId>log4j-core</artifactId>
72+
</exclusion>
73+
<exclusion>
74+
<groupId>org.apache.logging.log4j</groupId>
75+
<artifactId>log4j-jul</artifactId>
76+
</exclusion>
77+
</exclusions>
4678
</dependency>
4779
<dependency>
4880
<groupId>org.springframework.boot</groupId>
@@ -81,7 +113,7 @@
81113
<dependency>
82114
<groupId>org.springframework</groupId>
83115
<artifactId>spring-web</artifactId>
84-
<version>6.0.17</version>
116+
<version>${spring.version}</version>
85117
</dependency>
86118
<dependency>
87119
<groupId>org.springframework.restdocs</groupId>
@@ -94,6 +126,11 @@
94126
</exclusion>
95127
</exclusions>
96128
</dependency>
129+
<dependency>
130+
<groupId>commons-logging</groupId>
131+
<artifactId>commons-logging</artifactId>
132+
<version>1.3.5</version>
133+
</dependency>
97134
<dependency>
98135
<groupId>org.springframework.restdocs</groupId>
99136
<artifactId>spring-restdocs-mockmvc</artifactId>
@@ -110,24 +147,29 @@
110147
<dependency>
111148
<groupId>com.graphql-java</groupId>
112149
<artifactId>graphql-java</artifactId>
113-
<version>21.3</version>
150+
<version>21.5</version>
114151
</dependency>
115152
<!-- GSON -->
116153
<dependency>
117154
<groupId>com.google.code.gson</groupId>
118155
<artifactId>gson</artifactId>
119-
<version>2.9.1</version>
120156
<scope>compile</scope>
121157
</dependency>
122158
<dependency>
123-
<groupId>com.github.ben-manes.caffeine</groupId>
124-
<artifactId>caffeine</artifactId>
159+
<groupId>com.github.ben-manes.caffeine</groupId>
160+
<artifactId>caffeine</artifactId>
161+
<exclusions>
162+
<exclusion>
163+
<groupId>com.google.errorprone</groupId>
164+
<artifactId>error_prone_annotations</artifactId>
165+
</exclusion>
166+
</exclusions>
125167
</dependency>
126168
<!-- Unirest Java -->
127169
<dependency>
128170
<groupId>com.konghq</groupId>
129171
<artifactId>unirest-java</artifactId>
130-
<version>3.14.1</version>
172+
<version>3.14.5</version>
131173
</dependency>
132174
<!-- Redis java client -->
133175
<dependency>
@@ -139,7 +181,7 @@
139181
<dependency>
140182
<groupId>org.apache.tomcat.embed</groupId>
141183
<artifactId>tomcat-embed-core</artifactId>
142-
<version>10.1.13</version>
184+
<version>11.0.6</version>
143185
</dependency>
144186
<!-- JUnit -->
145187
<dependency>
@@ -167,27 +209,43 @@
167209
<version>1.5.1</version>
168210
<scope>test</scope>
169211
</dependency>
212+
<dependency>
213+
<groupId>com.fasterxml.jackson.dataformat</groupId>
214+
<artifactId>jackson-dataformat-yaml</artifactId>
215+
<version>2.15.2</version>
216+
</dependency>
170217
<!-- Neo4j Graphql -->
171218
<dependency>
172219
<groupId>org.neo4j</groupId>
173220
<artifactId>neo4j-graphql-java</artifactId>
174-
<version>1.8.0</version>
221+
<version>1.9.0</version>
175222
<exclusions>
176223
<exclusion>
177224
<groupId>com.graphql-java</groupId>
178225
<artifactId>graphql-java</artifactId>
179226
</exclusion>
180227
</exclusions>
181228
</dependency>
229+
<dependency>
230+
<groupId>io.netty</groupId>
231+
<artifactId>netty-handler</artifactId>
232+
<version>4.1.119.Final</version>
233+
</dependency>
182234
<dependency>
183235
<groupId>org.neo4j.driver</groupId>
184236
<artifactId>neo4j-java-driver</artifactId>
185-
<version>4.4.9</version>
237+
<version>5.28.2</version>
238+
<exclusions>
239+
<exclusion>
240+
<groupId>io.netty</groupId>
241+
<artifactId>netty-handler</artifactId>
242+
</exclusion>
243+
</exclusions>
186244
</dependency>
187245
<dependency>
188246
<groupId>org.neo4j</groupId>
189247
<artifactId>neo4j-cypher-dsl</artifactId>
190-
<version>2023.0.0</version>
248+
<version>2023.9.5</version>
191249
</dependency>
192250
<dependency>
193251
<groupId>org.jetbrains</groupId>
@@ -198,66 +256,84 @@
198256
<dependency>
199257
<groupId>org.opensearch.client</groupId>
200258
<artifactId>opensearch-rest-client</artifactId>
201-
<version>2.5.0</version>
202-
<exclusions>
203-
<exclusion>
204-
<groupId>org.apache.httpcomponents</groupId>
205-
<artifactId>httpclient</artifactId>
206-
</exclusion>
207-
<exclusion>
208-
<groupId>org.apache.httpcomponents</groupId>
209-
<artifactId>httpcore</artifactId>
210-
</exclusion>
211-
<exclusion>
212-
<groupId>org.apache.httpcomponents</groupId>
213-
<artifactId>httpcore-nio</artifactId>
214-
</exclusion>
259+
<version>2.18.0</version>
260+
<exclusions>
261+
<exclusion>
262+
<groupId>org.apache.httpcomponents</groupId>
263+
<artifactId>httpclient</artifactId>
264+
</exclusion>
265+
<exclusion>
266+
<groupId>org.apache.httpcomponents</groupId>
267+
<artifactId>httpcore</artifactId>
268+
</exclusion>
269+
<exclusion>
270+
<groupId>org.apache.httpcomponents</groupId>
271+
<artifactId>httpcore-nio</artifactId>
272+
</exclusion>
215273
<exclusion>
216274
<groupId>commons-logging</groupId>
217275
<artifactId>commons-logging</artifactId>
218276
</exclusion>
219-
</exclusions>
277+
</exclusions>
220278
</dependency>
221-
<dependency>
222-
<groupId>org.apache.httpcomponents</groupId>
223-
<artifactId>httpclient</artifactId>
224-
<version>4.5.14</version>
225-
</dependency>
226-
227-
<dependency>
228-
<groupId>org.apache.httpcomponents</groupId>
229-
<artifactId>httpcore-nio</artifactId>
230-
<version>4.4.16</version>
231-
</dependency>
232-
233-
<dependency>
234-
<groupId>org.apache.httpcomponents</groupId>
235-
<artifactId>httpcore</artifactId>
236-
<version>4.4.16</version>
237-
</dependency>
238-
<dependency>
239-
<groupId>org.opensearch.client</groupId>
240-
<artifactId>opensearch-rest-high-level-client</artifactId>
241-
<version>2.5.0</version>
279+
<dependency>
280+
<groupId>org.apache.httpcomponents</groupId>
281+
<artifactId>httpclient</artifactId>
282+
<version>4.5.13</version>
283+
<exclusions>
284+
<exclusion>
285+
<groupId>commons-logging</groupId>
286+
<artifactId>commons-logging</artifactId>
287+
</exclusion>
288+
</exclusions>
289+
</dependency>
290+
<dependency>
291+
<groupId>org.apache.httpcomponents</groupId>
292+
<artifactId>httpcore-nio</artifactId>
293+
<version>4.4.16</version>
294+
</dependency>
295+
<dependency>
296+
<groupId>org.apache.httpcomponents</groupId>
297+
<artifactId>httpcore</artifactId>
298+
<version>4.4.16</version>
299+
</dependency>
300+
<dependency>
301+
<groupId>org.opensearch.client</groupId>
302+
<artifactId>opensearch-rest-high-level-client</artifactId>
303+
<version>2.18.0</version>
242304
<exclusions>
243305
<exclusion>
244306
<groupId>joda-time</groupId>
245307
<artifactId>joda-time</artifactId>
246308
</exclusion>
309+
<exclusion>
310+
<groupId>com.fasterxml.jackson.dataformat</groupId>
311+
<artifactId>jackson-dataformat-yaml</artifactId>
312+
</exclusion>
313+
<exclusion>
314+
<groupId>org.apache.logging.log4j</groupId>
315+
<artifactId>log4j-api</artifactId>
316+
</exclusion>
247317
</exclusions>
248-
</dependency>
318+
</dependency>
249319
<!-- AWS Java SDK -->
250320
<dependency>
251321
<groupId>com.amazonaws</groupId>
252322
<artifactId>aws-java-sdk-core</artifactId>
253-
<version>1.12.642</version>
323+
<version>1.12.782</version>
254324
<scope>compile</scope>
325+
<exclusions>
326+
<exclusion>
327+
<groupId>commons-logging</groupId>
328+
<artifactId>commons-logging</artifactId>
329+
</exclusion>
330+
</exclusions>
255331
</dependency>
256332
<!-- Lombok -->
257333
<dependency>
258334
<groupId>org.projectlombok</groupId>
259335
<artifactId>lombok</artifactId>
260-
<version>1.18.22</version>
336+
<version>1.18.30</version>
261337
<scope>provided</scope>
262338
</dependency>
263339
<!-- Jakarta -->
@@ -280,23 +356,26 @@
280356
<plugin>
281357
<groupId>org.springframework.boot</groupId>
282358
<artifactId>spring-boot-maven-plugin</artifactId>
359+
<configuration>
360+
<jvmArguments>-Xms1g -Xmx2g</jvmArguments>
361+
</configuration>
283362
</plugin>
284363
<plugin>
285364
<groupId>org.apache.maven.plugins</groupId>
286365
<artifactId>maven-enforcer-plugin</artifactId>
287366
<version>3.0.0-M2</version>
288367
<executions>
289-
<execution>
290-
<id>enforce</id>
291-
<configuration>
292-
<rules>
293-
<dependencyConvergence/>
294-
</rules>
295-
</configuration>
296-
<goals>
297-
<goal>enforce</goal>
298-
</goals>
299-
</execution>
368+
<execution>
369+
<id>enforce</id>
370+
<configuration>
371+
<rules>
372+
<dependencyConvergence/>
373+
</rules>
374+
</configuration>
375+
<goals>
376+
<goal>enforce</goal>
377+
</goals>
378+
</execution>
300379
</executions>
301380
</plugin>
302381
</plugins>

‎src/main/java/gov/nih/nci/bento‎

0 commit comments

Comments
 (0)