Skip to content

Commit d316bce

Browse files
author
Greg Meyer
authored
Merge pull request #3 from DirectProjectJavaRI/develop
Updating site, pom, and javadoc for release. Ready for 6.0 release.
2 parents bdbfa62 + 7c29639 commit d316bce

File tree

4 files changed

+86
-70
lines changed

4 files changed

+86
-70
lines changed

‎pom.xml‎

Lines changed: 42 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<groupId>org.nhind</groupId>
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>direct-common-audit</artifactId>
6-
<name>Direct Project additional auditing implementations</name>
7-
<version>6.0-SNAPSHOT</version>
8-
<description>Direct Project additional implementation for auditing interface</description>
6+
<name>Direct Project auditing interfaces and implementations</name>
7+
<version>6.0</version>
8+
<description>Direct Project auditing interfaces and implementations</description>
99
<inceptionYear>2010</inceptionYear>
1010
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-common-audit/${project.version}</url>
1111
<developers>
@@ -26,8 +26,8 @@
2626
<maven>3.0.0</maven>
2727
</prerequisites>
2828
<scm>
29-
<url>http://code.google.com/p/nhin-d/source/browse/#hg/java/direct-common-audit</url>
30-
<connection>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/direct-common-audit</connection>
29+
<url>scm:git:https://github.com/DirectProjectJavaRI/direct-common-audit.git</url>
30+
<connection>scm:git:https://github.com/DirectProjectJavaRI/direct-common-audit.git</connection>
3131
</scm>
3232
<licenses>
3333
<license>
@@ -173,26 +173,7 @@
173173
</goals>
174174
</execution>
175175
</executions>
176-
</plugin>
177-
<plugin>
178-
<groupId>com.atlassian.maven.plugins</groupId>
179-
<artifactId>maven-clover2-plugin</artifactId>
180-
<version>3.1.0</version>
181-
<configuration>
182-
<jdk>1.8</jdk>
183-
<licenseLocation>
184-
${project.basedir}/../licenses/clover.license
185-
</licenseLocation>
186-
</configuration>
187-
<executions>
188-
<execution>
189-
<phase>pre-site</phase>
190-
<goals>
191-
<goal>instrument</goal>
192-
</goals>
193-
</execution>
194-
</executions>
195-
</plugin>
176+
</plugin>
196177
<plugin>
197178
<groupId>org.apache.maven.plugins</groupId>
198179
<artifactId>maven-jar-plugin</artifactId>
@@ -213,30 +194,31 @@
213194
</execution>
214195
</executions>
215196
</plugin>
216-
<!-- for releases only
217-
<plugin>
218-
<groupId>org.apache.maven.plugins</groupId>
219-
<artifactId>maven-javadoc-plugin</artifactId>
220-
<version>2.6.1</version>
221-
<configuration>
222-
<charset>UTF-8</charset>
223-
<docencoding>UTF-8</docencoding>
224-
<docfilessubdirs>true</docfilessubdirs>
225-
<detectJavaApiLink>true</detectJavaApiLink>
226-
<detectLinks>true</detectLinks>
227-
<source>1.6</source>
228-
<show>public</show>
229-
</configuration>
230-
<executions>
231-
<execution>
232-
<phase>package</phase>
233-
<id>attach-javadocs</id>
234-
<goals>
235-
<goal>jar</goal>
236-
</goals>
237-
</execution>
238-
</executions>
239-
</plugin>
197+
<plugin>
198+
<groupId>org.apache.maven.plugins</groupId>
199+
<artifactId>maven-javadoc-plugin</artifactId>
200+
<version>2.6.1</version>
201+
<configuration>
202+
<additionalparam>-Xdoclint:none</additionalparam>
203+
<charset>UTF-8</charset>
204+
<docencoding>UTF-8</docencoding>
205+
<docfilessubdirs>true</docfilessubdirs>
206+
<detectJavaApiLink>true</detectJavaApiLink>
207+
<detectLinks>true</detectLinks>
208+
<source>1.8</source>
209+
<show>public</show>
210+
</configuration>
211+
<executions>
212+
<execution>
213+
<phase>package</phase>
214+
<id>attach-javadocs</id>
215+
<goals>
216+
<goal>jar</goal>
217+
</goals>
218+
</execution>
219+
</executions>
220+
</plugin>
221+
<!-- for releases only
240222
<plugin>
241223
<groupId>org.apache.maven.plugins</groupId>
242224
<artifactId>maven-gpg-plugin</artifactId>
@@ -263,15 +245,16 @@
263245
<plugin>
264246
<groupId>org.apache.maven.plugins</groupId>
265247
<artifactId>maven-javadoc-plugin</artifactId>
266-
<version>3.0.1</version>
248+
<version>2.6.1</version>
267249
<configuration>
268-
<charset>UTF-8</charset>
269-
<docencoding>UTF-8</docencoding>
270-
<docfilessubdirs>true</docfilessubdirs>
271-
<detectJavaApiLink>true</detectJavaApiLink>
272-
<detectLinks>true</detectLinks>
273-
<source>1.8</source>
274-
<show>public</show>
250+
<additionalparam>-Xdoclint:none</additionalparam>
251+
<charset>UTF-8</charset>
252+
<docencoding>UTF-8</docencoding>
253+
<docfilessubdirs>true</docfilessubdirs>
254+
<detectJavaApiLink>true</detectJavaApiLink>
255+
<detectLinks>true</detectLinks>
256+
<source>1.8</source>
257+
<show>public</show>
275258
</configuration>
276259
</plugin>
277260
<plugin>
@@ -292,7 +275,7 @@
292275
<plugin>
293276
<groupId>org.codehaus.mojo</groupId>
294277
<artifactId>findbugs-maven-plugin</artifactId>
295-
<version>2.3</version>
278+
<version>2.3.2</version>
296279
<configuration>
297280
<effort>Max</effort>
298281
<excludeFilterFile>${project.basedir}/src/report/findbugs-exclude.xml</excludeFilterFile>
@@ -309,17 +292,7 @@
309292
<tag>@deprecated</tag>
310293
</tags>
311294
</configuration>
312-
</plugin>
313-
<plugin>
314-
<groupId>com.atlassian.maven.plugins</groupId>
315-
<artifactId>maven-clover2-plugin</artifactId>
316-
<version>3.1.0</version>
317-
<configuration>
318-
<licenseLocation>
319-
${project.basedir}/../licenses/clover.license
320-
</licenseLocation>
321-
</configuration>
322-
</plugin>
295+
</plugin>
323296
</plugins>
324297
</reporting>
325298
<distributionManagement>

‎src/main/java/org/nhindirect/common/audit/impl/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
2020
*/
2121

2222
/**
23-
* Database backed auditing implementation
23+
* Multiple auditing implementations. This includes file, logging, and database backed implementations.
2424
*/
2525

2626
package org.nhindirect.common.audit.impl;

‎src/main/java/org/nhindirect/common/audit/package-info.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
/*
2+
Copyright (c) 2010, NHIN Direct Project
3+
All rights reserved.
4+
5+
Authors:
6+
Greg Meyer gm2552@cerner.com
7+
8+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
9+
10+
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
11+
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
12+
in the documentation and/or other materials provided with the distribution. Neither the name of the The NHIN Direct Project (nhindirect.org).
13+
nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
14+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
16+
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
17+
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
18+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
19+
THE POSSIBILITY OF SUCH DAMAGE.
20+
*/
21+
122
/**
223
* Direct project auditing API. Auditors should be obtained using one of the three methods in the {@link AuditorFactory} class.
324
*/

‎src/site/apt/releaseNotes.apt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,28 @@
66
Greg Meyer
77
---
88

9+
{6.0}
10+
11+
Changes included with release 6.0
12+
13+
[]
14+
15+
Enhancements
16+
17+
* Requires Java 8
18+
19+
* Incorporation/Upgrade to Spring 5 and SpringBoot 2.1
20+
21+
* Removal of Google Guice IoC framework
22+
23+
* Refactored auditing base classes and interfaces to be move from direct-common to this library.
24+
25+
[]
26+
27+
Bug Fixes
28+
29+
* NA
30+
931
{1.0}
1032

1133
Changes included with release 1.0

0 commit comments

Comments
 (0)