Skip to content

Commit 1949b6c

Browse files
author
Greg Meyer
authored
Merge pull request #10 from DirectProjectJavaRI/develop
Release v 8.0.0
2 parents bf6182f + f7bbe13 commit 1949b6c

31 files changed

+343
-278
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: 76 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>direct-common</artifactId>
66
<name>Direct Project common APIs</name>
7-
<version>7.0</version>
7+
<version>8.0.0</version>
88
<description>Direct Project common APIs. Includes instrumentation, auditing, and other utility APIs</description>
99
<inceptionYear>2010</inceptionYear>
1010
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-common/${project.version}</url>
@@ -23,12 +23,26 @@
2323
<url>http://nhindirect.org</url>
2424
</organization>
2525
<prerequisites>
26-
<maven>3.0.0</maven>
26+
<maven>3.5.0</maven>
2727
</prerequisites>
28+
<properties>
29+
<jmockit.version>1.49</jmockit.version>
30+
<cf-env.version>2.4.0</cf-env.version>
31+
<guava.version>30.1.1-jre</guava.version>
32+
<jdom.version>1.1.3</jdom.version>
33+
<javax-mail.version>1.6.2</javax-mail.version>
34+
<dsn.version>1.6.7</dsn.version>
35+
<commons-text.version>1.9</commons-text.version>
36+
<commons-io.version>2.8.0</commons-io.version>
37+
<mina-core.version>2.1.4</mina-core.version>
38+
<bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
39+
<bcmail-jdk15on>1.68</bcmail-jdk15on>
40+
</properties>
2841
<parent>
2942
<groupId>org.springframework.boot</groupId>
3043
<artifactId>spring-boot-dependencies</artifactId>
31-
<version>2.2.4.RELEASE</version>
44+
<version>2.5.2</version>
45+
<relativePath />
3246
</parent>
3347
<scm>
3448
<url>scm:git:https://github.com/DirectProjectJavaRI/direct-common.git</url>
@@ -45,14 +59,14 @@
4559
<dependency>
4660
<groupId>org.springframework.boot</groupId>
4761
<artifactId>spring-boot-dependencies</artifactId>
48-
<version>2.2.2.RELEASE</version>
62+
<version>2.5.2</version>
4963
<type>pom</type>
5064
<scope>import</scope>
5165
</dependency>
5266
<dependency>
5367
<groupId>org.springframework.cloud</groupId>
5468
<artifactId>spring-cloud-starter-parent</artifactId>
55-
<version>Hoxton.SR1</version>
69+
<version>2020.0.3</version>
5670
<type>pom</type>
5771
<scope>import</scope>
5872
</dependency>
@@ -82,32 +96,37 @@
8296
<dependency>
8397
<groupId>io.pivotal.cfenv</groupId>
8498
<artifactId>java-cfenv-boot</artifactId>
85-
<version>2.1.0.RELEASE</version>
99+
<version>${cf-env.version}</version>
86100
</dependency>
87101
<dependency>
88102
<groupId>io.pivotal.cfenv</groupId>
89103
<artifactId>java-cfenv-test-support</artifactId>
90104
<scope>test</scope>
105+
<version>${cf-env.version}</version>
91106
</dependency>
107+
<dependency>
108+
<groupId>org.projectlombok</groupId>
109+
<artifactId>lombok</artifactId>
110+
</dependency>
92111
<dependency>
93112
<groupId>com.google.guava</groupId>
94113
<artifactId>guava</artifactId>
95-
<version>28.2-jre</version>
114+
<version>${guava.version}</version>
96115
</dependency>
97-
<dependency>
98-
<groupId>javax.mail</groupId>
99-
<artifactId>mail</artifactId>
100-
<version>1.4.3</version>
101-
</dependency>
102116
<dependency>
103117
<groupId>org.jdom</groupId>
104118
<artifactId>jdom</artifactId>
105-
<version>1.1</version>
106-
</dependency>
119+
<version>${jdom.version}</version>
120+
</dependency>
121+
<dependency>
122+
<groupId>com.sun.mail</groupId>
123+
<artifactId>javax.mail</artifactId>
124+
<version>${javax-mail.version}</version>
125+
</dependency>
107126
<dependency>
108127
<groupId>com.sun.mail</groupId>
109128
<artifactId>dsn</artifactId>
110-
<version>1.4.3</version>
129+
<version>${dsn.version}</version>
111130
</dependency>
112131
<dependency>
113132
<groupId>org.apache.commons</groupId>
@@ -120,65 +139,53 @@
120139
<dependency>
121140
<groupId>org.apache.commons</groupId>
122141
<artifactId>commons-text</artifactId>
123-
<version>1.4</version>
142+
<version>${commons-text.version}</version>
124143
</dependency>
125144
<dependency>
126145
<groupId>commons-io</groupId>
127146
<artifactId>commons-io</artifactId>
128-
<version>2.6</version>
147+
<version>${commons-io.version}</version>
129148
</dependency>
130149
<dependency>
131150
<groupId>org.apache.mina</groupId>
132151
<artifactId>mina-core</artifactId>
133-
<version>1.0.9</version>
152+
<version>${mina-core.version}</version>
134153
</dependency>
135154
<dependency>
136155
<groupId>org.bouncycastle</groupId>
137156
<artifactId>bcprov-jdk15on</artifactId>
138-
<version>1.64</version>
157+
<version>${bcprov-jdk15on.version}</version>
139158
</dependency>
140159
<dependency>
141160
<groupId>org.bouncycastle</groupId>
142161
<artifactId>bcmail-jdk15on</artifactId>
143-
<version>1.64</version>
162+
<version>${bcmail-jdk15on}</version>
144163
</dependency>
145-
<dependency>
146-
<groupId>org.springframework.boot</groupId>
147-
<artifactId>spring-boot-starter-web</artifactId>
148-
<scope>test</scope>
149-
</dependency>
150164
<dependency>
151165
<groupId>org.springframework.boot</groupId>
152166
<artifactId>spring-boot-starter-test</artifactId>
153167
<scope>test</scope>
154-
</dependency>
155-
<dependency>
156-
<groupId>org.mockito</groupId>
157-
<artifactId>mockito-core</artifactId>
158-
<scope>test</scope>
159-
</dependency>
160-
<dependency>
161-
<groupId>junit</groupId>
162-
<artifactId>junit</artifactId>
163-
<scope>test</scope>
164-
</dependency>
168+
</dependency>
169+
<dependency>
170+
<groupId>org.jmockit</groupId>
171+
<artifactId>jmockit</artifactId>
172+
<version>${jmockit.version}</version>
173+
<scope>test</scope>
174+
</dependency>
165175
</dependencies>
166176
<build>
167177
<extensions>
168178
<extension>
169179
<groupId>org.apache.maven.wagon</groupId>
170180
<artifactId>wagon-webdav-jackrabbit</artifactId>
171-
<version>3.1.0</version>
172181
</extension>
173182
<extension>
174183
<groupId>org.apache.maven.wagon</groupId>
175184
<artifactId>wagon-ssh-external</artifactId>
176-
<version>3.1.0</version>
177185
</extension>
178186
<extension>
179187
<groupId>org.apache.maven.wagon</groupId>
180188
<artifactId>wagon-ssh</artifactId>
181-
<version>3.1.0</version>
182189
</extension>
183190
</extensions>
184191
<resources>
@@ -203,10 +210,16 @@
203210
<plugin>
204211
<groupId>org.apache.maven.plugins</groupId>
205212
<artifactId>maven-surefire-plugin</artifactId>
213+
<configuration>
214+
<argLine>
215+
-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
216+
</argLine>
217+
</configuration>
206218
</plugin>
207219
<plugin>
208220
<groupId>org.apache.maven.plugins</groupId>
209221
<artifactId>maven-jxr-plugin</artifactId>
222+
<version>3.1.1</version>
210223
</plugin>
211224
<plugin>
212225
<groupId>org.apache.maven.plugins</groupId>
@@ -239,32 +252,27 @@
239252
</execution>
240253
</executions>
241254
</plugin>
242-
<plugin>
243-
<groupId>org.apache.maven.plugins</groupId>
244-
<artifactId>maven-jar-plugin</artifactId>
245-
<configuration>
246-
<archive>
247-
<index>true</index>
248-
</archive>
249-
</configuration>
250-
</plugin>
251-
<plugin>
252-
<groupId>org.apache.maven.plugins</groupId>
253-
<artifactId>maven-jar-plugin</artifactId>
254-
<executions>
255-
<execution>
256-
<goals>
257-
<goal>test-jar</goal>
258-
</goals>
259-
</execution>
260-
</executions>
261-
</plugin>
255+
<plugin>
256+
<groupId>org.apache.maven.plugins</groupId>
257+
<artifactId>maven-jar-plugin</artifactId>
258+
<configuration>
259+
<archive>
260+
<index>true</index>
261+
</archive>
262+
</configuration>
263+
<executions>
264+
<execution>
265+
<goals>
266+
<goal>test-jar</goal>
267+
</goals>
268+
</execution>
269+
</executions>
270+
</plugin>
262271
<plugin>
263272
<groupId>org.apache.maven.plugins</groupId>
264273
<artifactId>maven-javadoc-plugin</artifactId>
265-
<version>2.9.1</version>
266274
<configuration>
267-
<additionalparam>-Xdoclint:none</additionalparam>
275+
<additionalJOption>-Xdoclint:none</additionalJOption>
268276
<charset>UTF-8</charset>
269277
<docencoding>UTF-8</docencoding>
270278
<docfilessubdirs>true</docfilessubdirs>
@@ -285,7 +293,8 @@
285293
</goals>
286294
</execution>
287295
</executions>
288-
</plugin>
296+
</plugin>
297+
<!-- For Releases only
289298
<plugin>
290299
<groupId>org.apache.maven.plugins</groupId>
291300
<artifactId>maven-gpg-plugin</artifactId>
@@ -298,22 +307,22 @@
298307
</goals>
299308
</execution>
300309
</executions>
301-
</plugin>
310+
<version>3.0.1</version>
311+
</plugin>
312+
-->
302313
</plugins>
303314
</build>
304315
<reporting>
305316
<plugins>
306317
<plugin>
307318
<groupId>org.apache.maven.plugins</groupId>
308319
<artifactId>maven-project-info-reports-plugin</artifactId>
309-
<version>2.9</version>
310320
</plugin>
311321
<plugin>
312322
<groupId>org.apache.maven.plugins</groupId>
313323
<artifactId>maven-javadoc-plugin</artifactId>
314-
<version>2.9.1</version>
315324
<configuration>
316-
<additionalparam>-Xdoclint:none</additionalparam>
325+
<additionalJOption>-Xdoclint:none</additionalJOption>
317326
<charset>UTF-8</charset>
318327
<docencoding>UTF-8</docencoding>
319328
<docfilessubdirs>true</docfilessubdirs>
@@ -340,11 +349,11 @@
340349
<plugin>
341350
<groupId>org.apache.maven.plugins</groupId>
342351
<artifactId>maven-jxr-plugin</artifactId>
352+
<version>3.1.1</version>
343353
</plugin>
344354
<plugin>
345355
<groupId>org.codehaus.mojo</groupId>
346356
<artifactId>findbugs-maven-plugin</artifactId>
347-
<version>2.3.2</version>
348357
<configuration>
349358
<effort>Max</effort>
350359
<excludeFilterFile>${project.basedir}/src/report/findbugs-exclude.xml</excludeFilterFile>

‎src/main/java/org/nhindirect/common/cfenv/r2dbc/CfR2DBCDataSourceEnvironmentPostProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
6565
{
6666

6767
Map<String, Object> properties = new LinkedHashMap<>();
68-
final Map.Entry<String, Map<String, String>> processedUrl = processUrl(cfJdbcService.getUrl());
68+
final Map.Entry<String, Map<String, String>> processedUrl = processUrl(cfJdbcService.getJdbcUrl());
6969

7070
String url = processedUrl.getKey();
7171

0 commit comments

Comments
 (0)