Skip to content

Commit 9c481f5

Browse files
author
Greg Meyer
authored
Merge pull request #6 from DirectProjectJavaRI/develop
Releasing 8.0.0
2 parents 813393b + f6527ba commit 9c481f5

File tree

8 files changed

+97
-81
lines changed

8 files changed

+97
-81
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ hs_err_pid*
2424
/.DS_Store
2525
/.project
2626
/.classpath
27+
/target/

‎pom.xml‎

Lines changed: 46 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.nhind</groupId>
55
<artifactId>config-service-war</artifactId>
6-
<version>6.0</version>
6+
<version>8.0.0</version>
77
<packaging>war</packaging>
88
<name>NHIN-Direct Configuration Service Web Application Module</name>
99
<description>NHIN-Direct Configuration Service Web Application Module</description>
@@ -15,12 +15,12 @@
1515
<connection>scm:git:https://github.com/DirectProjectJavaRI/config-service-war.git</connection>
1616
</scm>
1717
<prerequisites>
18-
<maven>3.0.0</maven>
18+
<maven>3.5.0</maven>
1919
</prerequisites>
2020
<parent>
2121
<groupId>org.springframework.boot</groupId>
2222
<artifactId>spring-boot-starter-parent</artifactId>
23-
<version>2.1.2.RELEASE</version>
23+
<version>2.5.2</version>
2424
<relativePath />
2525
</parent>
2626
<developers>
@@ -41,21 +41,20 @@
4141
</licenses>
4242
<properties>
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
44-
<camel.version>2.22.0</camel.version>
4544
</properties>
4645
<dependencyManagement>
4746
<dependencies>
4847
<dependency>
4948
<groupId>org.springframework.boot</groupId>
5049
<artifactId>spring-boot-dependencies</artifactId>
51-
<version>2.1.2.RELEASE</version>
50+
<version>2.5.2</version>
5251
<type>pom</type>
5352
<scope>import</scope>
5453
</dependency>
5554
<dependency>
5655
<groupId>org.springframework.cloud</groupId>
5756
<artifactId>spring-cloud-starter-parent</artifactId>
58-
<version>Greenwich.RELEASE</version>
57+
<version>2020.0.3</version>
5958
<type>pom</type>
6059
<scope>import</scope>
6160
</dependency>
@@ -65,49 +64,48 @@
6564
<dependency>
6665
<groupId>org.nhind</groupId>
6766
<artifactId>config-service-jar</artifactId>
68-
<version>6.0</version>
67+
<version>8.0.0</version>
6968
</dependency>
7069
<dependency>
7170
<groupId>org.nhind</groupId>
7271
<artifactId>config-store</artifactId>
73-
<version>6.0</version>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.apache.camel</groupId>
77-
<artifactId>camel-spring-boot-starter</artifactId>
78-
<version>${camel.version}</version>
79-
</dependency>
72+
<version>8.0.0</version>
73+
</dependency>
8074
<dependency>
8175
<groupId>org.springframework.boot</groupId>
82-
<artifactId>spring-boot-starter-tomcat</artifactId>
83-
<scope>provided</scope>
76+
<artifactId>spring-boot-starter-tomcat</artifactId>
77+
<exclusions>
78+
<exclusion>
79+
<artifactId>tomcat-embed-websocket</artifactId>
80+
<groupId>org.apache.tomcat.embed</groupId>
81+
</exclusion>
82+
</exclusions>
8483
</dependency>
84+
<dependency>
85+
<groupId>org.springframework.cloud</groupId>
86+
<artifactId>spring-cloud-starter-bootstrap</artifactId>
87+
</dependency>
8588
<dependency>
8689
<groupId>org.springframework.boot</groupId>
8790
<artifactId>spring-boot-starter-web</artifactId>
8891
</dependency>
8992
<dependency>
9093
<groupId>org.springframework.boot</groupId>
9194
<artifactId>spring-boot-starter-webflux</artifactId>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.springframework.boot</groupId>
95-
<artifactId>spring-boot-starter-data-jpa</artifactId>
96-
</dependency>
95+
</dependency>
9796
<dependency>
9897
<groupId>org.springframework.boot</groupId>
9998
<artifactId>spring-boot-starter-security</artifactId>
100-
</dependency>
99+
</dependency>
101100
<dependency>
102-
<groupId>commons-dbcp</groupId>
103-
<artifactId>commons-dbcp</artifactId>
104-
<version>1.4</version>
105-
<scope>runtime</scope>
106-
</dependency>
101+
<groupId>com.h2database</groupId>
102+
<artifactId>h2</artifactId>
103+
<scope>runtime</scope>
104+
</dependency>
107105
<dependency>
108106
<groupId>org.apache.derby</groupId>
109107
<artifactId>derby</artifactId>
110-
<scope>runtime</scope>
108+
<scope>runtime</scope>
111109
</dependency>
112110
<dependency>
113111
<groupId>mysql</groupId>
@@ -118,15 +116,29 @@
118116
<groupId>org.postgresql</groupId>
119117
<artifactId>postgresql</artifactId>
120118
<scope>runtime</scope>
121-
</dependency>
119+
</dependency>
120+
<dependency>
121+
<groupId>dev.miku</groupId>
122+
<artifactId>r2dbc-mysql</artifactId>
123+
<scope>runtime</scope>
124+
</dependency>
125+
<dependency>
126+
<groupId>io.r2dbc</groupId>
127+
<artifactId>r2dbc-postgresql</artifactId>
128+
<scope>runtime</scope>
129+
</dependency>
130+
<dependency>
131+
<groupId>io.r2dbc</groupId>
132+
<artifactId>r2dbc-h2</artifactId>
133+
<scope>runtime</scope>
134+
</dependency>
122135
<dependency>
123136
<groupId>org.eclipse.jetty</groupId>
124137
<artifactId>test-jetty-servlet</artifactId>
125138
<version>8.2.0.v20160908</version>
126139
<scope>test</scope>
127140
</dependency>
128141
</dependencies>
129-
130142
<build>
131143
<plugins>
132144
<plugin>
@@ -163,9 +175,8 @@
163175
<plugin>
164176
<groupId>org.apache.maven.plugins</groupId>
165177
<artifactId>maven-javadoc-plugin</artifactId>
166-
<version>2.6.1</version>
167178
<configuration>
168-
<additionalparam>-Xdoclint:none</additionalparam>
179+
<additionalJOption>-Xdoclint:none</additionalJOption>
169180
<charset>UTF-8</charset>
170181
<docencoding>UTF-8</docencoding>
171182
<docfilessubdirs>true</docfilessubdirs>
@@ -184,7 +195,7 @@
184195
</execution>
185196
</executions>
186197
</plugin>
187-
<!-- for releases only
198+
<!-- for releases only
188199
<plugin>
189200
<groupId>org.apache.maven.plugins</groupId>
190201
<artifactId>maven-gpg-plugin</artifactId>
@@ -197,9 +208,9 @@
197208
</goals>
198209
</execution>
199210
</executions>
211+
<version>3.0.1</version>
200212
</plugin>
201-
-->
202-
213+
-->
203214
</plugins>
204215
</build>
205216
<distributionManagement>

‎src/main/java/org/nhindirect/config/boot/ConfigServiceApplication.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
import org.springframework.boot.builder.SpringApplicationBuilder;
55
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
66
import org.springframework.context.annotation.ComponentScan;
7+
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
8+
import org.springframework.scheduling.annotation.EnableScheduling;
79

810

9-
@ComponentScan({"org.nhindirect.config", "org.nhindirect.config.boot"})
11+
@ComponentScan({"org.nhindirect.config"})
1012
@SpringBootApplication
13+
@EnableR2dbcRepositories("org.nhindirect.config.repository")
14+
@EnableScheduling
1115
public class ConfigServiceApplication extends SpringBootServletInitializer
1216
{
1317
@Override

‎src/main/resources/application.properties‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/main/resources/application.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# automatically expand info properties from the Maven project using resource filtering
2+
info:
3+
build:
4+
artifact: '@project.artifactId@'
5+
name: '@project.name@'
6+
description: '@project.description@'
7+
version: '@project.version@'
8+
9+
spring:
10+
#Default username and password
11+
security:
12+
basic.enabled: true
13+
user:
14+
name: admin
15+
password: '{bcrypt}$2a$04$WQsYXSBOnycO1/7E9bKUVevWX3.Gxv2V6ZfYx9UKoy3lm9.4TjU7e'
16+
17+
#Default H2 Database Settings. This is not recommended for production use
18+
#and not fit for purpose for ephemeral deployments (you are almost guaranteed to lose your data if
19+
#using an ephemeral environment)
20+
r2dbc:
21+
url: r2dbc:h2:file:///./embedded-db/nhindconfig
22+
username: sa
23+
password:
24+
25+
sql.init.platform: h2
26+
sql.init.mode: ALWAYS

‎src/main/resources/bootstrap.properties‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/main/resources/bootstrap.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
org:
2+
apache:
3+
tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH: true
4+
catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH: true
5+
6+
spring:
7+
application:
8+
name: direct-config-service
9+
10+
jmx:
11+
default-domain: direct-config-service
12+
13+
#unique jmx names to avoid collisions when running
14+
#multiple spring boot apps in an web container
15+
endpoints:
16+
jmx:
17+
default-domain: direct-config-service
18+
uniqueNames: true
19+

‎src/main/resources/routes/routes.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)