Skip to content

Commit cd02289

Browse files
author
Greg Meyer
authored
Merge pull request #7 from DirectProjectJavaRI/develop
Releasing 8.0.0
2 parents d475946 + d5d38f9 commit cd02289

17 files changed

+170
-1664
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@
2222
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2323
hs_err_pid*
2424
/.project
25+
/target/
26+
/.classpath

‎pom.xml‎

Lines changed: 51 additions & 54 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-model</artifactId>
6-
<version>7.0</version>
6+
<version>8.0.0</version>
77
<packaging>jar</packaging>
88
<name>NHIN Direct Java RI - Configuration Service Data Model</name>
99
<description>NHIN Direct Java RI Configurstion Service Data Model</description>
@@ -12,11 +12,18 @@
1212
<url>scm:git:https://github.com/DirectProjectJavaRI/config-model.git</url>
1313
<connection>scm:git:https://github.com/DirectProjectJavaRI/config-model.git</connection>
1414
</scm>
15-
<parent>
15+
<properties>
16+
<dnsjava.version>3.3.1</dnsjava.version>
17+
<commons-io.version>2.8.0</commons-io.version>
18+
<commons-collections4.version>4.4</commons-collections4.version>
19+
<bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
20+
</properties>
21+
<parent>
1622
<groupId>org.springframework.boot</groupId>
1723
<artifactId>spring-boot-dependencies</artifactId>
18-
<version>2.2.4.RELEASE</version>
19-
</parent>
24+
<version>2.5.2</version>
25+
<relativePath />
26+
</parent>
2027
<developers>
2128
<developer>
2229
<name>Greg Meyer</name>
@@ -25,7 +32,7 @@
2532
</developer>
2633
</developers>
2734
<prerequisites>
28-
<maven>3.0.0</maven>
35+
<maven>3.5.0</maven>
2936
</prerequisites>
3037
<licenses>
3138
<license>
@@ -37,61 +44,56 @@
3744
<dependency>
3845
<groupId>org.nhind</groupId>
3946
<artifactId>direct-policy</artifactId>
40-
<version>7.0</version>
47+
<version>8.0.0</version>
4148
<type>jar</type>
4249
</dependency>
4350
<dependency>
4451
<groupId>commons-io</groupId>
4552
<artifactId>commons-io</artifactId>
46-
<version>2.6</version>
53+
<version>${commons-io.version}</version>
4754
</dependency>
4855
<dependency>
4956
<groupId>org.apache.commons</groupId>
5057
<artifactId>commons-collections4</artifactId>
51-
<version>4.4</version>
58+
<version>${commons-collections4.version}</version>
5259
</dependency>
5360
<dependency>
5461
<groupId>com.fasterxml.jackson.core</groupId>
5562
<artifactId>jackson-annotations</artifactId>
5663
</dependency>
57-
<dependency>
58-
<groupId>junit</groupId>
59-
<artifactId>junit</artifactId>
60-
<type>jar</type>
61-
<scope>test</scope>
62-
</dependency>
6364
<dependency>
6465
<groupId>org.bouncycastle</groupId>
6566
<artifactId>bcprov-jdk15on</artifactId>
66-
<version>1.64</version>
67-
</dependency>
67+
<version>${bcprov-jdk15on.version}</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.projectlombok</groupId>
71+
<artifactId>lombok</artifactId>
72+
</dependency>
6873
<dependency>
6974
<groupId>dnsjava</groupId>
7075
<artifactId>dnsjava</artifactId>
71-
<version>2.0.8</version>
76+
<version>${dnsjava.version}</version>
7277
</dependency>
73-
<dependency>
74-
<groupId>org.mockito</groupId>
75-
<artifactId>mockito-core</artifactId>
76-
<scope>test</scope>
77-
</dependency>
78+
<dependency>
79+
<groupId>org.junit.jupiter</groupId>
80+
<artifactId>junit-jupiter-engine</artifactId>
81+
<scope>test</scope>
82+
</dependency>
7883
</dependencies>
7984
<build>
8085
<extensions>
8186
<extension>
8287
<groupId>org.apache.maven.wagon</groupId>
8388
<artifactId>wagon-webdav-jackrabbit</artifactId>
84-
<version>3.1.0</version>
8589
</extension>
8690
<extension>
8791
<groupId>org.apache.maven.wagon</groupId>
8892
<artifactId>wagon-ssh-external</artifactId>
89-
<version>3.1.0</version>
9093
</extension>
9194
<extension>
9295
<groupId>org.apache.maven.wagon</groupId>
9396
<artifactId>wagon-ssh</artifactId>
94-
<version>3.1.0</version>
9597
</extension>
9698
</extensions>
9799
<resources>
@@ -131,6 +133,7 @@
131133
<plugin>
132134
<groupId>org.apache.maven.plugins</groupId>
133135
<artifactId>maven-jxr-plugin</artifactId>
136+
<version>3.1.1</version>
134137
</plugin>
135138
<plugin>
136139
<groupId>org.apache.maven.plugins</groupId>
@@ -152,36 +155,28 @@
152155
<target>1.8</target>
153156
</configuration>
154157
</plugin>
155-
<plugin>
156-
<groupId>org.apache.maven.plugins</groupId>
157-
<artifactId>maven-jar-plugin</artifactId>
158-
<configuration>
159-
<archive>
160-
<index>true</index>
161-
<!--
162-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
163-
-->
164-
</archive>
165-
</configuration>
166-
</plugin>
167-
<plugin>
168-
<groupId>org.apache.maven.plugins</groupId>
169-
<artifactId>maven-jar-plugin</artifactId>
170-
<executions>
171-
<execution>
172-
<goals>
173-
<goal>test-jar</goal>
174-
</goals>
175-
</execution>
176-
</executions>
177-
</plugin>
158+
<plugin>
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-jar-plugin</artifactId>
161+
<configuration>
162+
<archive>
163+
<index>true</index>
164+
</archive>
165+
</configuration>
166+
<executions>
167+
<execution>
168+
<goals>
169+
<goal>test-jar</goal>
170+
</goals>
171+
</execution>
172+
</executions>
173+
</plugin>
178174

179175
<plugin>
180176
<groupId>org.apache.maven.plugins</groupId>
181177
<artifactId>maven-javadoc-plugin</artifactId>
182-
<version>2.9.1</version>
183178
<configuration>
184-
<additionalparam>-Xdoclint:none</additionalparam>
179+
<additionalJOption>-Xdoclint:none</additionalJOption>
185180
<charset>UTF-8</charset>
186181
<docencoding>UTF-8</docencoding>
187182
<docfilessubdirs>true</docfilessubdirs>
@@ -199,7 +194,8 @@
199194
</goals>
200195
</execution>
201196
</executions>
202-
</plugin>
197+
</plugin>
198+
<!-- for releases only
203199
<plugin>
204200
<groupId>org.apache.maven.plugins</groupId>
205201
<artifactId>maven-gpg-plugin</artifactId>
@@ -212,22 +208,22 @@
212208
</goals>
213209
</execution>
214210
</executions>
211+
<version>3.0.1</version>
215212
</plugin>
213+
-->
216214
</plugins>
217215
</build>
218216
<reporting>
219217
<plugins>
220218
<plugin>
221219
<groupId>org.apache.maven.plugins</groupId>
222220
<artifactId>maven-project-info-reports-plugin</artifactId>
223-
<version>2.9</version>
224221
</plugin>
225222
<plugin>
226223
<groupId>org.apache.maven.plugins</groupId>
227224
<artifactId>maven-javadoc-plugin</artifactId>
228-
<version>2.9.1</version>
229225
<configuration>
230-
<additionalparam>-Xdoclint:none</additionalparam>
226+
<additionalJOption>-Xdoclint:none</additionalJOption>
231227
<charset>UTF-8</charset>
232228
<docencoding>UTF-8</docencoding>
233229
<docfilessubdirs>true</docfilessubdirs>
@@ -251,6 +247,7 @@
251247
<plugin>
252248
<groupId>org.apache.maven.plugins</groupId>
253249
<artifactId>maven-jxr-plugin</artifactId>
250+
<version>3.1.1</version>
254251
</plugin>
255252
<plugin>
256253
<groupId>org.codehaus.mojo</groupId>

0 commit comments

Comments
 (0)