Skip to content

Commit 509cb6a

Browse files
author
Greg Meyer
authored
Merge pull request #4 from DirectProjectJavaRI/develop
Releasing 6.0
2 parents 97f55f4 + 4a2bea9 commit 509cb6a

8 files changed

Lines changed: 97 additions & 29 deletions

File tree

‎manifest.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ applications:
88
spring.cloud.config.label: master
99
services:
1010
- directhisp-config-server
11-
- directhisp-rabbit
12-
routes:
13-
- route: cf-tcpapps.io:3398
11+
- directhisp-rabbit

‎pom.xml‎

Lines changed: 14 additions & 25 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>direct-smtp-mq-gateway</artifactId>
6-
<version>6.0-SNAPSHOT</version>
6+
<version>6.0</version>
77
<packaging>jar</packaging>
88
<name>DirectProject Java RI Lightweight SMTP Server Gateway Standalone Spring Boot Micro-service Application</name>
99
<description>DirectProject Java RI Lightweight SMTP Server Gateway Standalone Spring Boot Micro-service Application</description>
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>org.springframework.boot</groupId>
2020
<artifactId>spring-boot-starter-parent</artifactId>
21-
<version>2.1.2.RELEASE</version>
21+
<version>2.1.9.RELEASE</version>
2222
</parent>
2323
<developers>
2424
<developer>
@@ -39,35 +39,27 @@
3939
</licenses>
4040
<properties>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
42-
</properties>
43-
<repositories>
44-
<!-- Temp repository for Spring Boot Milestone -->
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+
</properties>
5143
<dependencyManagement>
5244
<dependencies>
5345
<dependency>
5446
<groupId>org.springframework.boot</groupId>
5547
<artifactId>spring-boot-dependencies</artifactId>
56-
<version>2.1.2.RELEASE</version>
48+
<version>2.1.9.RELEASE</version>
5749
<type>pom</type>
5850
<scope>import</scope>
5951
</dependency>
6052
<dependency>
6153
<groupId>io.pivotal.spring.cloud</groupId>
6254
<artifactId>spring-cloud-services-dependencies</artifactId>
63-
<version>2.0.3.RELEASE</version>
55+
<version>2.1.4.RELEASE</version>
6456
<type>pom</type>
6557
<scope>import</scope>
6658
</dependency>
6759
<dependency>
6860
<groupId>org.springframework.cloud</groupId>
6961
<artifactId>spring-cloud-starter-parent</artifactId>
70-
<version>Greenwich.RC1</version>
62+
<version>Greenwich.SR3</version>
7163
<type>pom</type>
7264
<scope>import</scope>
7365
</dependency>
@@ -122,7 +114,7 @@
122114
<dependency>
123115
<groupId>org.nhind</groupId>
124116
<artifactId>direct-common</artifactId>
125-
<version>6.0-SNAPSHOT</version>
117+
<version>6.0.1</version>
126118
</dependency>
127119
<dependency>
128120
<groupId>org.subethamail</groupId>
@@ -187,13 +179,18 @@
187179
</plugin>
188180
<plugin>
189181
<groupId>org.springframework.boot</groupId>
190-
<artifactId>spring-boot-maven-plugin</artifactId>
182+
<artifactId>spring-boot-maven-plugin</artifactId>
183+
<configuration>
184+
<jvmArguments>
185+
-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006
186+
</jvmArguments>
187+
</configuration>
191188
</plugin>
192189
<!-- for releases only
193190
<plugin>
194191
<groupId>org.apache.maven.plugins</groupId>
195192
<artifactId>maven-javadoc-plugin</artifactId>
196-
<version>2.6.1</version>
193+
<version>2.9.1</version>
197194
<configuration>
198195
<charset>UTF-8</charset>
199196
<docencoding>UTF-8</docencoding>
@@ -282,14 +279,6 @@
282279
</tags>
283280
</configuration>
284281
</plugin>
285-
<plugin>
286-
<groupId>com.atlassian.maven.plugins</groupId>
287-
<artifactId>maven-clover2-plugin</artifactId>
288-
<version>3.0.2</version>
289-
<configuration>
290-
<licenseLocation>${project.basedir}/../../licenses/clover.license</licenseLocation>
291-
</configuration>
292-
</plugin>
293282
</plugins>
294283
</reporting>
295284
<distributionManagement>

‎src/main/resources/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ info.build.description=@project.description@
55
info.build.version=@project.version@
66

77
spring.cloud.stream.bindings.direct-smtp-gateway-message-output.destination=direct-smtp-mq-gateway
8-
spring.cloud.stream.bindings.direct-smtp-gateway-message-output.content-type=message/rfc822
8+
#spring.cloud.stream.bindings.direct-smtp-gateway-message-output.content-type=message/rfc822

‎src/site/apt/releaseNotes.apt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
~~ $Id$
2+
3+
---
4+
Release Notes
5+
---
6+
Greg Meyer
7+
---
8+
9+
{1.0.0}
10+
11+
Changes included with release 1.0.0.
12+
13+
[]
14+
15+
* Initial Release
16+
17+
* Requires Java SE 1.8 or greater.
18+

‎src/site/resources/css/site.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.source {
2+
background-color: #fff;
3+
color: #000;
4+
border-right: 1px solid #888;
5+
border-left: 1px solid #888;
6+
border-top: 1px solid #888;
7+
border-bottom: 1px solid #888;
8+
margin-right: 7px;
9+
margin-left: 7px;
10+
margin-top: 1em;
11+
overflow: auto;
12+
}
13+
14+
.source pre {
15+
margin-right: 7px;
16+
margin-left: 7px;
17+
}

‎src/site/resources/images/logo.png‎

13.3 KB
Loading

‎src/site/site.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project>
3+
<bannerLeft>
4+
<name>The Direct Project: SMTP MQ Gateway</name>
5+
<src>images/logo.png</src>
6+
<href>http://nhindirect.org/</href>
7+
</bannerLeft>
8+
<version position="left" />
9+
<publishDate position="right" format="E M-dd-yyyy HH:mm" />
10+
<body>
11+
<menu name="Documents">
12+
<item name="Release Notes" href="releaseNotes.html" />
13+
</menu>
14+
<menu name="External Links">
15+
<item name="The Direct Project Wiki" href="http://nhindirect.org" />
16+
</menu>
17+
${reports}
18+
</body>
19+
<skin>
20+
<groupId>org.apache.maven.skins</groupId>
21+
<artifactId>maven-classic-skin</artifactId>
22+
<version>1.0</version>
23+
</skin>
24+
</project>

‎src/site/xdoc/index.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document xmlns="http://maven.apache.org/XDOC/2.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
5+
<properties>
6+
<title>The Direct Project: SMTP MQ Gateway</title>
7+
<author>Greg Meyer</author>
8+
</properties>
9+
<head>
10+
<title>The Direct Project: SMTP MQ Gateway</title>
11+
</head>
12+
<body>
13+
<section name="Overview">
14+
<p>
15+
The NHIN Direct SMTP MQ module consists is the inbound SMTP interface for the DirectProject Java RI
16+
microservices architecture. It accepts inbound messages and forwards them the security and trust agent module
17+
via a Spring Cloud streams channel. It support message size limits and the ability filter incoming messages by
18+
CIDR ranges.
19+
</p>
20+
</section>
21+
</body>
22+
</document>

0 commit comments

Comments
 (0)