Skip to content

Commit 5892ca3

Browse files
author
Greg Meyer
authored
Merge pull request #6 from DirectProjectJavaRI/develop
Releasing 8.0.0
2 parents c91c761 + c996b79 commit 5892ca3

15 files changed

+214
-246
lines changed

‎.gitignore‎

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

‎pom.xml‎

Lines changed: 58 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>org.nhind</groupId>
55
<artifactId>config-ui</artifactId>
66
<packaging>war</packaging>
7-
<version>6.0.1</version>
7+
<version>8.0.0</version>
88
<name>NHIN Direct Java Configuration UI</name>
99
<description>NHIN Direct Java Configuration UI</description>
1010
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/config/config-ui/${project.version}</url>
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.springframework.boot</groupId>
1717
<artifactId>spring-boot-starter-parent</artifactId>
18-
<version>2.1.3.RELEASE</version>
18+
<version>2.5.2</version>
1919
<relativePath />
2020
</parent>
2121
<developers>
@@ -50,30 +50,34 @@
5050
<url>http://nhindirect.org/BSDLicense</url>
5151
</license>
5252
</licenses>
53-
53+
<properties>
54+
<urlrewritefilte.version>3.1.0</urlrewritefilte.version>
55+
<commons-fileupload.version>1.2.2</commons-fileupload.version>
56+
<cglib-nodep.version>2.2</cglib-nodep.version>
57+
</properties>
5458
<prerequisites>
55-
<maven>3.0.0</maven>
59+
<maven>3.5.0</maven>
5660
</prerequisites>
5761
<dependencyManagement>
5862
<dependencies>
5963
<dependency>
6064
<groupId>org.springframework.boot</groupId>
6165
<artifactId>spring-boot-dependencies</artifactId>
62-
<version>2.1.3.RELEASE</version>
66+
<version>2.5.2</version>
6367
<type>pom</type>
6468
<scope>import</scope>
6569
</dependency>
6670
<dependency>
6771
<groupId>io.pivotal.spring.cloud</groupId>
6872
<artifactId>spring-cloud-services-dependencies</artifactId>
69-
<version>2.1.1.RELEASE</version>
73+
<version>3.3.0</version>
7074
<type>pom</type>
7175
<scope>import</scope>
7276
</dependency>
7377
<dependency>
7478
<groupId>org.springframework.cloud</groupId>
7579
<artifactId>spring-cloud-starter-parent</artifactId>
76-
<version>Greenwich.SR1</version>
80+
<version>2020.0.3</version>
7781
<type>pom</type>
7882
<scope>import</scope>
7983
</dependency>
@@ -88,27 +92,23 @@
8892
<groupId>org.springframework.boot</groupId>
8993
<artifactId>spring-boot-starter-tomcat</artifactId>
9094
<scope>provided</scope>
91-
</dependency>
95+
</dependency>
9296
<dependency>
9397
<groupId>org.apache.tomcat.embed</groupId>
9498
<artifactId>tomcat-embed-jasper</artifactId>
9599
</dependency>
96100
<dependency>
97101
<groupId>org.springframework.boot</groupId>
98102
<artifactId>spring-boot-starter-security</artifactId>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.springframework.cloud</groupId>
102-
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
103-
</dependency>
103+
</dependency>
104104
<dependency>
105105
<groupId>org.springframework.boot</groupId>
106106
<artifactId>spring-boot-configuration-processor</artifactId>
107107
</dependency>
108108
<dependency>
109-
<groupId>org.springframework.security</groupId>
110-
<artifactId>spring-security-taglibs</artifactId>
111-
</dependency>
109+
<groupId>org.springframework.cloud</groupId>
110+
<artifactId>spring-cloud-starter-bootstrap</artifactId>
111+
</dependency>
112112
<dependency>
113113
<groupId>org.springframework.cloud</groupId>
114114
<artifactId>spring-cloud-starter-config</artifactId>
@@ -119,6 +119,10 @@
119119
</exclusion>
120120
</exclusions>
121121
</dependency>
122+
<dependency>
123+
<groupId>org.springframework.security</groupId>
124+
<artifactId>spring-security-taglibs</artifactId>
125+
</dependency>
122126
<dependency>
123127
<groupId>io.pivotal.spring.cloud</groupId>
124128
<artifactId>spring-cloud-services-starter-config-client</artifactId>
@@ -128,47 +132,24 @@
128132
<artifactId>jackson-mapper-asl</artifactId>
129133
</exclusion>
130134
</exclusions>
131-
</dependency>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.projectlombok</groupId>
138+
<artifactId>lombok</artifactId>
139+
</dependency>
132140
<dependency>
133141
<groupId>org.tuckey</groupId>
134142
<artifactId>urlrewritefilter</artifactId>
135-
<version>3.1.0</version>
143+
<version>${urlrewritefilte.version}</version>
136144
</dependency>
137145
<dependency>
138146
<groupId>javax.servlet</groupId>
139147
<artifactId>jstl</artifactId>
140148
</dependency>
141-
<dependency>
142-
<groupId>dnsjava</groupId>
143-
<artifactId>dnsjava</artifactId>
144-
<version>2.1.8</version>
145-
</dependency>
146-
147-
<!-- Validation support -->
148-
<dependency>
149-
<groupId>javax.validation</groupId>
150-
<artifactId>validation-api</artifactId>
151-
</dependency>
152-
<dependency>
153-
<groupId>commons-fileupload</groupId>
154-
<artifactId>commons-fileupload</artifactId>
155-
<version>1.2.2</version>
156-
<type>jar</type>
157-
</dependency>
158-
<dependency>
159-
<groupId>cglib</groupId>
160-
<artifactId>cglib-nodep</artifactId>
161-
<version>2.2</version>
162-
<type>jar</type>
163-
</dependency>
164-
<dependency>
165-
<groupId>org.apache.commons</groupId>
166-
<artifactId>commons-lang3</artifactId>
167-
</dependency>
168149
<dependency>
169150
<groupId>${project.groupId}</groupId>
170151
<artifactId>direct-common</artifactId>
171-
<version>6.0.1-SNAPSHOT</version>
152+
<version>8.0.0</version>
172153
</dependency>
173154
<dependency>
174155
<groupId>${project.groupId}</groupId>
@@ -184,30 +165,35 @@
184165
<dependency>
185166
<groupId>${project.groupId}</groupId>
186167
<artifactId>config-service-client</artifactId>
187-
<version>6.0.1-SNAPSHOT</version>
168+
<version>8.0.0</version>
188169
</dependency>
189170
<dependency>
190171
<groupId>${project.groupId}</groupId>
191172
<artifactId>config-store</artifactId>
192-
<version>6.0.1-SNAPSHOT</version>
193-
</dependency>
194-
<dependency>
195-
<groupId>${project.groupId}</groupId>
196-
<artifactId>config-service-jar</artifactId>
197-
<version>6.0.2-SNAPSHOT</version>
198-
<scope>test</scope>
173+
<version>8.0.0</version>
199174
</dependency>
175+
176+
<!-- Validation support -->
177+
<dependency>
178+
<groupId>javax.validation</groupId>
179+
<artifactId>validation-api</artifactId>
180+
</dependency>
200181
<dependency>
201-
<groupId>org.apache.mina</groupId>
202-
<artifactId>mina-core</artifactId>
203-
<version>1.0.2</version>
204-
<scope>test</scope>
205-
</dependency>
182+
<groupId>commons-fileupload</groupId>
183+
<artifactId>commons-fileupload</artifactId>
184+
<version>${commons-fileupload.version}</version>
185+
<type>jar</type>
186+
</dependency>
206187
<dependency>
207-
<groupId>junit</groupId>
208-
<artifactId>junit</artifactId>
209-
<scope>test</scope>
210-
</dependency>
188+
<groupId>cglib</groupId>
189+
<artifactId>cglib-nodep</artifactId>
190+
<version>${cglib-nodep.version}</version>
191+
<type>jar</type>
192+
</dependency>
193+
<dependency>
194+
<groupId>org.apache.commons</groupId>
195+
<artifactId>commons-lang3</artifactId>
196+
</dependency>
211197
</dependencies>
212198
<build>
213199
<plugins>
@@ -231,9 +217,8 @@
231217
<plugin>
232218
<groupId>org.apache.maven.plugins</groupId>
233219
<artifactId>maven-javadoc-plugin</artifactId>
234-
<version>2.9.1</version>
235220
<configuration>
236-
<additionalparam>-Xdoclint:none</additionalparam>
221+
<additionalJOption>-Xdoclint:none</additionalJOption>
237222
<charset>UTF-8</charset>
238223
<docencoding>UTF-8</docencoding>
239224
<docfilessubdirs>true</docfilessubdirs>
@@ -265,6 +250,7 @@
265250
</goals>
266251
</execution>
267252
</executions>
253+
<version>3.0.1</version>
268254
</plugin>
269255
-->
270256
</plugins>
@@ -274,15 +260,13 @@
274260
<plugin>
275261
<groupId>org.apache.maven.plugins</groupId>
276262
<artifactId>maven-project-info-reports-plugin</artifactId>
277-
<version>2.9</version>
278-
<reportSets>
279-
<reportSet>
280-
<reports>
281-
<report>dependency-convergence</report>
282-
</reports>
283-
</reportSet>
284-
</reportSets>
285-
263+
<reportSets>
264+
<reportSet>
265+
<reports>
266+
<report>dependency-convergence</report>
267+
</reports>
268+
</reportSet>
269+
</reportSets>
286270
</plugin>
287271
</plugins>
288272
</reporting>
@@ -305,10 +289,5 @@
305289
<uniqueVersion>false</uniqueVersion>
306290
</repository>
307291
</distributionManagement>
308-
<properties>
309-
<spring.security.version>3.0.5.RELEASE</spring.security.version>
310-
<cxf.maven.artifact.version>2.2.9</cxf.maven.artifact.version>
311-
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
312-
</properties>
313292
</project>
314293

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
66
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
7+
import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
78
import org.springframework.boot.builder.SpringApplicationBuilder;
89
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
9-
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
1010
import org.springframework.context.annotation.ComponentScan;
1111
import org.springframework.core.Ordered;
1212
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
1313
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
1414

1515
@SpringBootApplication
16-
@EnableEurekaClient
17-
@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
16+
@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class, R2dbcAutoConfiguration.class})
1817
@ComponentScan(basePackages = {"org.nhindirect.config.spring.config", "org.nhindirect.config.ui"})
1918
public class ConfigUIApplication extends SpringBootServletInitializer implements WebMvcConfigurer
2019
{

‎src/main/java/org/nhindirect/config/spring/config/ConfigServiceClientConfig.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,14 @@
2727
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2929
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
30-
import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
3130
import org.springframework.cloud.openfeign.EnableFeignClients;
3231
import org.springframework.cloud.openfeign.FeignAutoConfiguration;
33-
import org.springframework.cloud.openfeign.ribbon.FeignRibbonClientAutoConfiguration;
3432
import org.springframework.context.annotation.Bean;
3533
import org.springframework.context.annotation.Configuration;
3634

3735
@Configuration
3836
@EnableFeignClients({"org.nhind.config.rest.feign"})
39-
@ImportAutoConfiguration({RibbonAutoConfiguration.class, FeignRibbonClientAutoConfiguration.class, FeignAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class})
37+
@ImportAutoConfiguration({FeignAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class})
4038
public class ConfigServiceClientConfig
4139
{
4240

‎src/main/java/org/nhindirect/config/spring/config/KeyStoreConfig.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
import org.nhindirect.common.crypto.impl.BootstrappedKeyStoreProtectionManager;
55
import org.nhindirect.common.crypto.impl.BootstrappedPKCS11Credential;
66
import org.nhindirect.common.crypto.impl.StaticCachedPKCS11TokenKeyStoreProtectionManager;
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
97
import org.springframework.beans.factory.annotation.Value;
108
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
119
import org.springframework.context.annotation.Bean;
1210
import org.springframework.context.annotation.Configuration;
1311

12+
import lombok.extern.slf4j.Slf4j;
13+
1414
@Configuration
15+
@Slf4j
1516
public class KeyStoreConfig
16-
{
17-
private static final Logger LOGGER = LoggerFactory.getLogger(KeyStoreConfig.class);
17+
{
1818

1919
@Value("${direct.config.keystore.keyStorePin:som3randomp!n}")
2020
private String keyStorePin;
@@ -47,7 +47,7 @@ public class KeyStoreConfig
4747
@ConditionalOnProperty(name="direct.config.keystore.hsmpresent", havingValue="true")
4848
public KeyStoreProtectionManager hsmKeyStoreProtectionManager()
4949
{
50-
LOGGER.info("HSM configured. Attempting to connect to device.");
50+
log.info("HSM configured. Attempting to connect to device.");
5151

5252
try
5353
{
@@ -75,7 +75,7 @@ public KeyStoreProtectionManager hsmKeyStoreProtectionManager()
7575
@ConditionalOnProperty(name="direct.config.keystore.hsmpresent", havingValue="false", matchIfMissing=true)
7676
public KeyStoreProtectionManager nonHSMKeyStoreProtectionManager()
7777
{
78-
LOGGER.info("No HSM configured.");
78+
log.info("No HSM configured.");
7979

8080
final BootstrappedKeyStoreProtectionManager mgr = new BootstrappedKeyStoreProtectionManager(keyStorePassPhrase, privateKeyPassPhrase);
8181

0 commit comments

Comments
 (0)