Skip to content

Commit fddd261

Browse files
rijnbrijnb
authored
Merge pull request #28 from mapcode-foundation/2.4.14.0
Release 2.4.14.0
2 parents 6cfdd30 + ea3591a commit fddd261

63 files changed

Lines changed: 110 additions & 90 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,10 @@ self-hosting this service.
351351

352352
## Release Notes
353353

354+
### 2.4.14.0
355+
356+
* Updated dependencies for security vulnerabilities.
357+
354358
### 2.4.13.0
355359

356360
* Updated dependencies.

‎apidocs/swagger/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
~ Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
~
44
~ Licensed under the Apache License, Version 2.0 (the "License");
55
~ you may not use this file except in compliance with the License.

‎apidocs/swagger/oauth2-redirect.html‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
<!--
2+
~ Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
-->
16+
117
<!doctype html>
218
<html lang="en-US">
319
<body onload="run()">

‎deployment/pom.xml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
~ Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
~
44
~ Licensed under the Apache License, Version 2.0 (the "License");
55
~ you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.mapcode</groupId>
2525
<artifactId>mapcode-rest-service</artifactId>
26-
<version>2.4.13.0</version>
26+
<version>2.4.14.0</version>
2727
</parent>
2828

2929
<artifactId>deployment</artifactId>
@@ -179,24 +179,22 @@
179179
</plugin>
180180

181181
<plugin>
182-
<groupId>org.mortbay.jetty</groupId>
182+
<groupId>org.eclipse.jetty</groupId>
183183
<artifactId>jetty-maven-plugin</artifactId>
184-
<version>${maven-jetty-plugin.version}</version>
184+
<version>${jetty-maven-plugin.version}</version>
185185
<configuration>
186186
<webApp>
187187
<contextPath>${maven.httpserver.root}</contextPath>
188188
</webApp>
189+
<httpConnector>
190+
<port>${maven.httpserver.port}</port>
191+
</httpConnector>
189192
<scanIntervalSeconds>10</scanIntervalSeconds>
190193
<stopKey>stop</stopKey>
191194
<stopPort>9999</stopPort>
192-
<connectors>
193-
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
194-
<port>${maven.httpserver.port}</port>
195-
<maxIdleTime>60000</maxIdleTime>
196-
</connector>
197-
</connectors>
198195
</configuration>
199196
</plugin>
200197
</plugins>
201198
</build>
202199
</project>
200+

‎deployment/src/main/java/com/mapcode/services/cli/Main.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎deployment/src/main/java/com/mapcode/services/deployment/DeploymentModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎deployment/src/main/java/com/mapcode/services/deployment/StartupCheck.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎deployment/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
3+
~ Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.

‎deployment/src/test/java/com/mapcode/services/cli/MainTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎deployment/src/test/java/com/mapcode/services/deployment/DeploymentModuleTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
2+
* Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)