Skip to content

Commit

Permalink
Merge pull request #3 from DirectProjectJavaRI/develop
Browse files Browse the repository at this point in the history 
Updating site, pom, and javadoc for release.  Ready for 6.0 release.
  • Loading branch information
Greg Meyer authored Jan 23, 2019
2 parents bdbfa62 + 7c29639 commit d316bce
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 70 deletions.
111 changes: 42 additions & 69 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<groupId>org.nhind</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>direct-common-audit</artifactId>
<name>Direct Project additional auditing implementations</name>
<version>6.0-SNAPSHOT</version>
<description>Direct Project additional implementation for auditing interface</description>
<name>Direct Project auditing interfaces and implementations</name>
<version>6.0</version>
<description>Direct Project auditing interfaces and implementations</description>
<inceptionYear>2010</inceptionYear>
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-common-audit/${project.version}</url>
<developers>
Expand All @@ -26,8 +26,8 @@
<maven>3.0.0</maven>
</prerequisites>
<scm>
<url>http://code.google.com/p/nhin-d/source/browse/#hg/java/direct-common-audit</url>
<connection>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/direct-common-audit</connection>
<url>scm:git:https://github.com/DirectProjectJavaRI/direct-common-audit.git</url>
<connection>scm:git:https://github.com/DirectProjectJavaRI/direct-common-audit.git</connection>
</scm>
<licenses>
<license>
Expand Down Expand Up @@ -173,26 +173,7 @@
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<jdk>1.8</jdk>
<licenseLocation>
${project.basedir}/../licenses/clover.license
</licenseLocation>
</configuration>
<executions>
<execution>
<phase>pre-site</phase>
<goals>
<goal>instrument</goal>
</goals>
</execution>
</executions>
</plugin>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -213,30 +194,31 @@
</execution>
</executions>
</plugin>
<!-- for releases only
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
<configuration>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<docfilessubdirs>true</docfilessubdirs>
<detectJavaApiLink>true</detectJavaApiLink>
<detectLinks>true</detectLinks>
<source>1.6</source>
<show>public</show>
</configuration>
<executions>
<execution>
<phase>package</phase>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.6.1</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<docfilessubdirs>true</docfilessubdirs>
<detectJavaApiLink>true</detectJavaApiLink>
<detectLinks>true</detectLinks>
<source>1.8</source>
<show>public</show>
</configuration>
<executions>
<execution>
<phase>package</phase>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- for releases only
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand All @@ -263,15 +245,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>2.6.1</version>
<configuration>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<docfilessubdirs>true</docfilessubdirs>
<detectJavaApiLink>true</detectJavaApiLink>
<detectLinks>true</detectLinks>
<source>1.8</source>
<show>public</show>
<additionalparam>-Xdoclint:none</additionalparam>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<docfilessubdirs>true</docfilessubdirs>
<detectJavaApiLink>true</detectJavaApiLink>
<detectLinks>true</detectLinks>
<source>1.8</source>
<show>public</show>
</configuration>
</plugin>
<plugin>
Expand All @@ -292,7 +275,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3</version>
<version>2.3.2</version>
<configuration>
<effort>Max</effort>
<excludeFilterFile>${project.basedir}/src/report/findbugs-exclude.xml</excludeFilterFile>
Expand All @@ -309,17 +292,7 @@
<tag>@deprecated</tag>
</tags>
</configuration>
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<licenseLocation>
${project.basedir}/../licenses/clover.license
</licenseLocation>
</configuration>
</plugin>
</plugin>
</plugins>
</reporting>
<distributionManagement>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/nhindirect/common/audit/impl/package-info.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
*/

/**
* Database backed auditing implementation
* Multiple auditing implementations. This includes file, logging, and database backed implementations.
*/

package org.nhindirect.common.audit.impl;
21 changes: 21 additions & 0 deletions src/main/java/org/nhindirect/common/audit/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
/*
Copyright (c) 2010, NHIN Direct Project
All rights reserved.
Authors:
Greg Meyer [email protected]
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the distribution. Neither the name of the The NHIN Direct Project (nhindirect.org).
nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
*/

/**
* Direct project auditing API. Auditors should be obtained using one of the three methods in the {@link AuditorFactory} class.
*/
Expand Down
22 changes: 22 additions & 0 deletions src/site/apt/releaseNotes.apt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@
Greg Meyer
---

{6.0}

Changes included with release 6.0

[]

Enhancements

* Requires Java 8

* Incorporation/Upgrade to Spring 5 and SpringBoot 2.1

* Removal of Google Guice IoC framework

* Refactored auditing base classes and interfaces to be move from direct-common to this library.

[]

Bug Fixes

* NA

{1.0}

Changes included with release 1.0
Expand Down

0 comments on commit d316bce

Please sign in to comment.