Skip to content

Commit 159f0e5

Browse files
gm2552gm2552
authored
Merge pull request #6 from DirectProjectJavaRI/develop
Releasing direct-project-stock 8.1.0
2 parents fd03793 + d587745 commit 159f0e5

21 files changed

Lines changed: 142 additions & 1358 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/.project
2+
/target/

‎pom.xml‎

Lines changed: 48 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>direct-project-stock</artifactId>
66
<packaging>pom</packaging>
77
<name>The direct project stock assembly.</name>
8-
<version>6.0-RC1</version>
8+
<version>8.1.0</version>
99
<description>Stock assembly for the direct project using the Apache James mail server and the Apache Tomcat web container.</description>
1010
<inceptionYear>2010</inceptionYear>
1111
<url>https://github.com/DirectProjectJavaRI/direct-project-stock</url>
@@ -36,7 +36,7 @@
3636
<parent>
3737
<groupId>org.springframework.boot</groupId>
3838
<artifactId>spring-boot-dependencies</artifactId>
39-
<version>2.1.2.RELEASE</version>
39+
<version>2.5.2</version>
4040
</parent>
4141
<scm>
4242
<url>scm:git:https://github.com/DirectProjectJavaRI/direct-project-stock.git</url>
@@ -53,98 +53,106 @@
5353
<dependency>
5454
<groupId>org.springframework.boot</groupId>
5555
<artifactId>spring-boot-dependencies</artifactId>
56-
<version>2.1.2.RELEASE</version>
56+
<version>2.5.2</version>
5757
<type>pom</type>
5858
<scope>import</scope>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.springframework.cloud</groupId>
6262
<artifactId>spring-cloud-starter-parent</artifactId>
63-
<version>Greenwich.RELEASE</version>
63+
<version>2020.0.3</version>
6464
<type>pom</type>
6565
<scope>import</scope>
6666
</dependency>
6767
</dependencies>
6868
</dependencyManagement>
6969
<dependencies>
70+
<dependency>
71+
<groupId>org.springframework.boot</groupId>
72+
<artifactId>spring-boot-starter</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.springframework.boot</groupId>
76+
<artifactId>spring-boot-starter-security</artifactId>
77+
</dependency>
7078
<dependency>
7179
<groupId>org.nhind</groupId>
7280
<artifactId>direct-msg-monitor-web</artifactId>
7381
<type>war</type>
74-
<version>6.0</version>
75-
</dependency>
82+
<version>8.1.0</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.nhind</groupId>
86+
<artifactId>direct-msg-monitor-model</artifactId>
87+
<version>8.1.0</version>
88+
</dependency>
7689
<dependency>
7790
<groupId>org.nhind</groupId>
7891
<artifactId>config-service-war</artifactId>
7992
<type>war</type>
80-
<version>6.0</version>
93+
<version>8.1.0</version>
8194
</dependency>
8295
<dependency>
8396
<groupId>org.nhind</groupId>
8497
<artifactId>config-service-client</artifactId>
85-
<version>6.0</version>
98+
<version>8.1.0</version>
8699
</dependency>
87100
<dependency>
88101
<groupId>org.nhind</groupId>
89102
<artifactId>config-ui</artifactId>
90103
<type>war</type>
91-
<version>6.0</version>
104+
<version>8.1.0</version>
92105
</dependency>
93106
<dependency>
94107
<groupId>org.nhind</groupId>
95108
<artifactId>xd</artifactId>
96109
<type>war</type>
97-
<version>6.0</version>
110+
<version>8.1.0</version>
98111
</dependency>
99112
<dependency>
100113
<groupId>org.nhind</groupId>
101114
<artifactId>xd-common</artifactId>
102-
<version>6.0</version>
115+
<version>8.1.0</version>
103116
</dependency>
104117
<dependency>
105118
<groupId>org.nhind</groupId>
106119
<artifactId>xdmail</artifactId>
107-
<version>6.0</version>
120+
<version>8.1.0</version>
108121
</dependency>
109122
<dependency>
110123
<groupId>org.nhind</groupId>
111124
<artifactId>agent</artifactId>
112-
<version>6.0</version>
125+
<version>8.1.0</version>
113126
</dependency>
114127
<dependency>
115128
<groupId>org.nhind</groupId>
116129
<artifactId>gateway</artifactId>
117-
<version>6.0</version>
130+
<version>8.1.0</version>
118131
</dependency>
119132
<dependency>
120133
<groupId>org.nhind</groupId>
121134
<artifactId>direct-common</artifactId>
122-
<version>6.0</version>
135+
<version>8.1.0</version>
123136
</dependency>
124137
<dependency>
125138
<groupId>org.nhind</groupId>
126139
<artifactId>direct-common-audit</artifactId>
127-
<version>6.0</version>
140+
<version>8.1.0</version>
128141
</dependency>
129142
<dependency>
130143
<groupId>org.nhind</groupId>
131144
<artifactId>dns-sboot</artifactId>
132-
<version>6.0</version>
145+
<version>8.1.0</version>
133146
</dependency>
134147
<dependency>
135148
<groupId>org.nhind</groupId>
136149
<artifactId>config-manager</artifactId>
137-
<version>6.0</version>
150+
<version>8.1.0</version>
138151
</dependency>
139-
<dependency>
140-
<groupId>org.nhind</groupId>
141-
<artifactId>xdmail</artifactId>
142-
<version>6.0</version>
143-
</dependency>
144152
<dependency>
145153
<groupId>org.nhind</groupId>
146154
<artifactId>direct-policy</artifactId>
147-
<version>6.0</version>
155+
<version>8.1.0</version>
148156
</dependency>
149157
<dependency>
150158
<groupId>org.springframework.cloud</groupId>
@@ -156,17 +164,14 @@
156164
<extension>
157165
<groupId>org.apache.maven.wagon</groupId>
158166
<artifactId>wagon-webdav-jackrabbit</artifactId>
159-
<version>3.1.0</version>
160167
</extension>
161168
<extension>
162169
<groupId>org.apache.maven.wagon</groupId>
163170
<artifactId>wagon-ssh-external</artifactId>
164-
<version>3.1.0</version>
165171
</extension>
166172
<extension>
167173
<groupId>org.apache.maven.wagon</groupId>
168174
<artifactId>wagon-ssh</artifactId>
169-
<version>3.1.0</version>
170175
</extension>
171176
</extensions>
172177
<plugins>
@@ -228,7 +233,8 @@
228233
<include name="dnsjava*" />
229234
<include name="dsn*" />
230235
<include name="jcs*" />
231-
<include name="mail*" />
236+
<include name="javax.mail*" />
237+
<include name="slf4j-api*" />
232238
</fileset>
233239
</copy>
234240

@@ -281,81 +287,10 @@
281287
</execution>
282288
</executions>
283289
</plugin>
284-
<!-- DOXIA does not yet copy resources to the generated-site or site location. Bug
285-
DOXIA-355 was submitted in July of 09 and is listed to be resolved in DOXIA 1.2.
286-
This plugin a is work around for copying the resources from the book source to
287-
the generate site. -->
288-
<plugin>
289-
<groupId>org.apache.maven.plugins</groupId>
290-
<artifactId>maven-antrun-plugin</artifactId>
291-
<executions>
292-
<execution>
293-
<id>book</id>
294-
<phase>pre-site</phase>
295-
<configuration>
296-
<tasks>
297-
<copy todir="${project.build.directory}/generated-site/xdoc/users-guide/images/">
298-
<fileset dir="${basedir}/src/books/users-guide/images/" />
299-
</copy>
300-
<copy todir="${project.build.directory}/site/users-guide/images/">
301-
<fileset dir="${basedir}/src/books/users-guide/images/" />
302-
</copy>
303-
</tasks>
304-
</configuration>
305-
<goals>
306-
<goal>run</goal>
307-
</goals>
308-
</execution>
309-
</executions>
310-
</plugin>
311-
<plugin>
312-
<groupId>org.apache.maven.doxia</groupId>
313-
<artifactId>doxia-maven-plugin</artifactId>
314-
<version>1.2</version>
315-
<executions>
316-
<execution>
317-
<phase>pre-site</phase>
318-
<goals>
319-
<goal>render-books</goal>
320-
</goals>
321-
</execution>
322-
</executions>
323-
<configuration>
324-
<books>
325-
<book>
326-
<directory>src/books/users-guide</directory>
327-
<descriptor>src/books/users-guide.xml</descriptor>
328-
<formats>
329-
<format>
330-
<id>xdoc</id>
331-
</format>
332-
</formats>
333-
</book>
334-
</books>
335-
</configuration>
336-
<dependencies>
337-
<dependency>
338-
<groupId>org.codehaus.plexus</groupId>
339-
<artifactId>plexus-utils</artifactId>
340-
<version>1.5.12</version>
341-
</dependency>
342-
<dependency>
343-
<groupId>org.apache.maven.doxia</groupId>
344-
<artifactId>doxia-decoration-model</artifactId>
345-
<version>1.2</version>
346-
</dependency>
347-
<dependency>
348-
<groupId>org.apache.maven.doxia</groupId>
349-
<artifactId>doxia-module-confluence</artifactId>
350-
<version>1.2</version>
351-
</dependency>
352-
</dependencies>
353-
</plugin>
354-
355290
<plugin>
356291
<groupId>org.apache.maven.plugins</groupId>
357292
<artifactId>maven-javadoc-plugin</artifactId>
358-
<version>2.6.1</version>
293+
<version>2.9.1</version>
359294
<configuration>
360295
<additionalparam>-Xdoclint:none</additionalparam>
361296
<charset>UTF-8</charset>
@@ -376,7 +311,7 @@
376311
</execution>
377312
</executions>
378313
</plugin>
379-
<!-- for releases only
314+
<!-- for releases only
380315
<plugin>
381316
<groupId>org.apache.maven.plugins</groupId>
382317
<artifactId>maven-gpg-plugin</artifactId>
@@ -389,27 +324,17 @@
389324
</goals>
390325
</execution>
391326
</executions>
392-
</plugin>
393-
-->
327+
</plugin>
328+
-->
329+
<plugin>
330+
<groupId>org.sonatype.central</groupId>
331+
<artifactId>central-publishing-maven-plugin</artifactId>
332+
<version>0.8.0</version>
333+
<extensions>true</extensions>
334+
<configuration>
335+
<publishingServerId>central</publishingServerId>
336+
</configuration>
337+
</plugin>
394338
</plugins>
395-
</build>
396-
<distributionManagement>
397-
<site>
398-
<id>nhind-site</id>
399-
<name>NHIN Direct API publication site</name>
400-
<url>sftp://api.nhindirect.org/x/www/api.nhindirect.org/java/site/assembly/stock/${project.version}</url>
401-
</site>
402-
<snapshotRepository>
403-
<id>sonatype-snapshot</id>
404-
<name>Sonatype OSS Maven SNAPSHOT Repository</name>
405-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
406-
<uniqueVersion>false</uniqueVersion>
407-
</snapshotRepository>
408-
<repository>
409-
<id>sonatype-release</id>
410-
<name>Sonatype OSS Maven Release Repositor</name>
411-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
412-
<uniqueVersion>false</uniqueVersion>
413-
</repository>
414-
</distributionManagement>
339+
</build>
415340
</project>

‎src/books/.DS_Store‎

-6 KB
Binary file not shown.

‎src/books/users-guide.xml‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/books/users-guide/.DS_Store‎

-6 KB
Binary file not shown.

‎src/books/users-guide/depl-config-store.confluence‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)