Skip to content

Commit 5b14ac0

Browse files
author
Greg Meyer
authored
Merge pull request #3 from DirectProjectJavaRI/develop
Updating pom and release notes for release. Ready for 6.0 release.
2 parents 9ea6b23 + 47eddea commit 5b14ac0

2 files changed

Lines changed: 54 additions & 66 deletions

File tree

‎pom.xml‎

Lines changed: 30 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>direct-msg-monitor</artifactId>
66
<name>Direct Project message monitor</name>
7-
<version>6.0-SNAPSHOT</version>
7+
<version>6.0</version>
88
<description>Direct Project message monitor for timely and reliable messaging</description>
99
<inceptionYear>2010</inceptionYear>
1010
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-msg-monitor/${project.version}</url>
@@ -31,23 +31,15 @@
3131
<maven>3.0.0</maven>
3232
</prerequisites>
3333
<scm>
34-
<url>http://code.google.com/p/nhin-d/source/browse/#hg/java/direct-msg-monitor</url>
35-
<connection>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/direct-msg-monitor</connection>
34+
<url>scm:git:https://github.com/DirectProjectJavaRI/direct-msg-monitor.git</url>
35+
<connection>scm:git:https://github.com/DirectProjectJavaRI/direct-msg-monitor.git</connection>
3636
</scm>
3737
<licenses>
3838
<license>
3939
<name>New BSD License</name>
4040
<url>http://nhindirect.org/BSDLicense</url>
4141
</license>
42-
</licenses>
43-
<!-- Temp repository for Spring Boot Milestone -->
44-
<repositories>
45-
<repository>
46-
<id>spring-milestone</id>
47-
<name>Spring Milestone Releases</name>
48-
<url>https://repo.spring.io/milestone/</url>
49-
</repository>
50-
</repositories>
42+
</licenses>
5143
<properties>
5244
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5345
<camel.version>2.22.0</camel.version>
@@ -64,7 +56,7 @@
6456
<dependency>
6557
<groupId>org.springframework.cloud</groupId>
6658
<artifactId>spring-cloud-starter-parent</artifactId>
67-
<version>Greenwich.RC1</version>
59+
<version>Greenwich.RELEASE</version>
6860
<type>pom</type>
6961
<scope>import</scope>
7062
</dependency>
@@ -123,12 +115,12 @@
123115
<dependency>
124116
<groupId>org.nhind</groupId>
125117
<artifactId>direct-common</artifactId>
126-
<version>6.0-SNAPSHOT</version>
118+
<version>6.0</version>
127119
</dependency>
128120
<dependency>
129121
<groupId>org.nhind</groupId>
130122
<artifactId>direct-msg-monitor-model</artifactId>
131-
<version>6.0-SNAPSHOT</version>
123+
<version>6.0</version>
132124
</dependency>
133125
<dependency>
134126
<groupId>javax.mail</groupId>
@@ -321,26 +313,7 @@
321313
</goals>
322314
</execution>
323315
</executions>
324-
</plugin>
325-
<plugin>
326-
<groupId>com.atlassian.maven.plugins</groupId>
327-
<artifactId>maven-clover2-plugin</artifactId>
328-
<version>3.1.0</version>
329-
<configuration>
330-
<jdk>1.8</jdk>
331-
<licenseLocation>
332-
${project.basedir}/../licenses/clover.license
333-
</licenseLocation>
334-
</configuration>
335-
<executions>
336-
<execution>
337-
<phase>pre-site</phase>
338-
<goals>
339-
<goal>instrument</goal>
340-
</goals>
341-
</execution>
342-
</executions>
343-
</plugin>
316+
</plugin>
344317
<plugin>
345318
<groupId>org.apache.maven.plugins</groupId>
346319
<artifactId>maven-jar-plugin</artifactId>
@@ -404,19 +377,19 @@
404377
</dependency>
405378
</dependencies>
406379
</plugin>
407-
<!-- for releases only
408380
<plugin>
409381
<groupId>org.apache.maven.plugins</groupId>
410382
<artifactId>maven-javadoc-plugin</artifactId>
411383
<version>2.6.1</version>
412384
<configuration>
413-
<charset>UTF-8</charset>
414-
<docencoding>UTF-8</docencoding>
415-
<docfilessubdirs>true</docfilessubdirs>
416-
<detectJavaApiLink>true</detectJavaApiLink>
417-
<detectLinks>true</detectLinks>
418-
<source>1.8</source>
419-
<show>public</show>
385+
<additionalparam>-Xdoclint:none</additionalparam>
386+
<charset>UTF-8</charset>
387+
<docencoding>UTF-8</docencoding>
388+
<docfilessubdirs>true</docfilessubdirs>
389+
<detectJavaApiLink>true</detectJavaApiLink>
390+
<detectLinks>true</detectLinks>
391+
<source>1.8</source>
392+
<show>public</show>
420393
</configuration>
421394
<executions>
422395
<execution>
@@ -431,6 +404,7 @@
431404
</execution>
432405
</executions>
433406
</plugin>
407+
<!-- for releases only
434408
<plugin>
435409
<groupId>org.apache.maven.plugins</groupId>
436410
<artifactId>maven-gpg-plugin</artifactId>
@@ -462,18 +436,19 @@
462436
<plugin>
463437
<groupId>org.apache.maven.plugins</groupId>
464438
<artifactId>maven-javadoc-plugin</artifactId>
465-
<version>3.0.1</version>
439+
<version>2.6.1</version>
466440
<configuration>
467-
<charset>UTF-8</charset>
468-
<docencoding>UTF-8</docencoding>
469-
<docfilessubdirs>true</docfilessubdirs>
470-
<detectJavaApiLink>true</detectJavaApiLink>
471-
<detectLinks>true</detectLinks>
472-
<source>1.8</source>
473-
<show>public</show>
474-
<excludePackageNames>
475-
org.nhindirect.monitor.dao.impl:org.nhindirect.monitor.processor.impl
476-
</excludePackageNames>
441+
<additionalparam>-Xdoclint:none</additionalparam>
442+
<charset>UTF-8</charset>
443+
<docencoding>UTF-8</docencoding>
444+
<docfilessubdirs>true</docfilessubdirs>
445+
<detectJavaApiLink>true</detectJavaApiLink>
446+
<detectLinks>true</detectLinks>
447+
<source>1.8</source>
448+
<show>public</show>
449+
<excludePackageNames>
450+
org.nhindirect.monitor.dao.impl:org.nhindirect.monitor.processor.impl:org.nhindirect.monitor.repository:org.nhindirect.monitor.springconfig
451+
</excludePackageNames>
477452
</configuration>
478453
</plugin>
479454
<plugin>
@@ -494,7 +469,6 @@
494469
<plugin>
495470
<groupId>org.codehaus.mojo</groupId>
496471
<artifactId>findbugs-maven-plugin</artifactId>
497-
<version>1.2</version>
498472
<configuration>
499473
<effort>Max</effort>
500474
<excludeFilterFile>${project.basedir}/src/report/findbugs-exclude.xml</excludeFilterFile>
@@ -511,17 +485,7 @@
511485
<tag>@deprecated</tag>
512486
</tags>
513487
</configuration>
514-
</plugin>
515-
<plugin>
516-
<groupId>com.atlassian.maven.plugins</groupId>
517-
<artifactId>maven-clover2-plugin</artifactId>
518-
<version>3.1.0</version>
519-
<configuration>
520-
<licenseLocation>
521-
${project.basedir}/../licenses/clover.license
522-
</licenseLocation>
523-
</configuration>
524-
</plugin>
488+
</plugin>
525489
</plugins>
526490
</reporting>
527491
<distributionManagement>

‎src/site/apt/releaseNotes.apt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,30 @@
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, SpringBoot 2.1, and SpringCloud Greenwich.
20+
21+
* Removed old DAO implementation and replaced with Spring Data.
22+
23+
* Removed Jersey components for REST interfaces and replaced with Spring MVC.
24+
25+
* REST interfaces use Reactive models.
26+
27+
[]
28+
29+
Bug Fixes
30+
31+
* NA
32+
933
{2.0}
1034

1135
Changes included with release 20

0 commit comments

Comments
 (0)