Skip to content

Commit 3d2e16e

Browse files
author
Greg Meyer
authored
Merge pull request #4 from DirectProjectJavaRI/develop
Updating pom for release. Ready for 6.0 release.
2 parents 38beaf3 + 558e941 commit 3d2e16e

File tree

1 file changed

+54
-128
lines changed

1 file changed

+54
-128
lines changed

‎pom.xml‎

Lines changed: 54 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>gateway</artifactId>
66
<name>Direct Project Agent Gateways.</name>
7-
<version>6.0-SNAPSHOT</version>
7+
<version>6.0</version>
88
<description>Direct Project security agent gateways and bridges.</description>
99
<inceptionYear>2010</inceptionYear>
10-
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/gateway/${project.version}</url>
10+
<url>https://github.com/DirectProjectJavaRI/gateway</url>
1111
<developers>
1212
<developer>
1313
<name>Greg Meyer</name>
@@ -39,15 +39,7 @@
3939
<name>New BSD License</name>
4040
<url>http://nhindirect.org/BSDLicense</url>
4141
</license>
42-
</licenses>
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+
</licenses>
5143
<dependencyManagement>
5244
<dependencies>
5345
<dependency>
@@ -60,7 +52,7 @@
6052
<dependency>
6153
<groupId>org.springframework.cloud</groupId>
6254
<artifactId>spring-cloud-starter-parent</artifactId>
63-
<version>Greenwich.RC1</version>
55+
<version>Greenwich.RELEASE</version>
6456
<type>pom</type>
6557
<scope>import</scope>
6658
</dependency>
@@ -70,32 +62,32 @@
7062
<dependency>
7163
<groupId>org.nhind</groupId>
7264
<artifactId>agent</artifactId>
73-
<version>6.0-SNAPSHOT</version>
65+
<version>6.0</version>
7466
</dependency>
7567
<dependency>
7668
<groupId>org.nhind</groupId>
7769
<artifactId>direct-common</artifactId>
78-
<version>6.0-SNAPSHOT</version>
70+
<version>6.0</version>
7971
</dependency>
8072
<dependency>
8173
<groupId>org.nhind</groupId>
8274
<artifactId>direct-common-audit</artifactId>
83-
<version>6.0-SNAPSHOT</version>
75+
<version>6.0</version>
8476
</dependency>
8577
<dependency>
8678
<groupId>org.nhind</groupId>
8779
<artifactId>config-service-client</artifactId>
88-
<version>6.0-SNAPSHOT</version>
80+
<version>6.0</version>
8981
</dependency>
9082
<dependency>
9183
<groupId>org.nhind</groupId>
9284
<artifactId>direct-msg-monitor-client</artifactId>
93-
<version>6.0-SNAPSHOT</version>
85+
<version>6.0</version>
9486
</dependency>
9587
<dependency>
9688
<groupId>org.nhind</groupId>
9789
<artifactId>xd-common</artifactId>
98-
<version>6.0-SNAPSHOT</version>
90+
<version>6.0</version>
9991
<exclusions>
10092
<exclusion>
10193
<groupId>org.springframework.boot</groupId>
@@ -111,7 +103,7 @@
111103
<dependency>
112104
<groupId>org.nhind</groupId>
113105
<artifactId>agent</artifactId>
114-
<version>6.0-SNAPSHOT</version>
106+
<version>6.0</version>
115107
<type>test-jar</type>
116108
<scope>test</scope>
117109
</dependency>
@@ -164,7 +156,7 @@
164156
<dependency>
165157
<groupId>org.nhind</groupId>
166158
<artifactId>config-service-jar</artifactId>
167-
<version>6.0-SNAPSHOT</version>
159+
<version>6.0</version>
168160
<scope>test</scope>
169161
</dependency>
170162
<dependency>
@@ -210,11 +202,21 @@
210202
</dependencies>
211203
<build>
212204
<extensions>
213-
<extension>
214-
<groupId>org.apache.maven.wagon</groupId>
215-
<artifactId>wagon-webdav</artifactId>
216-
<version>RELEASE</version>
217-
</extension>
205+
<extension>
206+
<groupId>org.apache.maven.wagon</groupId>
207+
<artifactId>wagon-webdav-jackrabbit</artifactId>
208+
<version>3.1.0</version>
209+
</extension>
210+
<extension>
211+
<groupId>org.apache.maven.wagon</groupId>
212+
<artifactId>wagon-ssh-external</artifactId>
213+
<version>3.1.0</version>
214+
</extension>
215+
<extension>
216+
<groupId>org.apache.maven.wagon</groupId>
217+
<artifactId>wagon-ssh</artifactId>
218+
<version>3.1.0</version>
219+
</extension>
218220
</extensions>
219221
<resources>
220222
<resource>
@@ -287,25 +289,6 @@
287289
</archive>
288290
</configuration>
289291
</plugin>
290-
<plugin>
291-
<groupId>com.atlassian.maven.plugins</groupId>
292-
<artifactId>maven-clover2-plugin</artifactId>
293-
<version>3.0.2</version>
294-
<configuration>
295-
<jdk>1.8</jdk>
296-
<licenseLocation>
297-
${project.basedir}/../licenses/clover.license
298-
</licenseLocation>
299-
</configuration>
300-
<executions>
301-
<execution>
302-
<phase>pre-site</phase>
303-
<goals>
304-
<goal>instrument</goal>
305-
</goals>
306-
</execution>
307-
</executions>
308-
</plugin>
309292
<!-- DOXIA does not yet copy resources to the generated-site or site location. Bug
310293
DOXIA-355 was submitted in July of 09 and is listed to be resolved in DOXIA 1.2.
311294
This plugin a is work around for copying the resources from the book source to
@@ -376,22 +359,22 @@
376359
</dependency>
377360
</dependencies>
378361
</plugin>
379-
<!-- for release only
380362
<plugin>
381363
<groupId>org.apache.maven.plugins</groupId>
382364
<artifactId>maven-javadoc-plugin</artifactId>
383365
<version>2.6.1</version>
384366
<configuration>
385-
<charset>UTF-8</charset>
386-
<docencoding>UTF-8</docencoding>
387-
<docfilessubdirs>true</docfilessubdirs>
388-
<detectJavaApiLink>true</detectJavaApiLink>
389-
<detectLinks>true</detectLinks>
390-
<source>1.8</source>
391-
<show>public</show>
392-
<excludePackageNames>
393-
org.nhindirect.gateway.smtp.annotation:org.nhindirect.gateway.smtp.module:org.nhindirect.gateway.smtp.provider:org.nhindirect.gateway.smtp.config.cert.impl
394-
</excludePackageNames>
367+
<additionalparam>-Xdoclint:none</additionalparam>
368+
<charset>UTF-8</charset>
369+
<docencoding>UTF-8</docencoding>
370+
<docfilessubdirs>true</docfilessubdirs>
371+
<detectJavaApiLink>true</detectJavaApiLink>
372+
<detectLinks>true</detectLinks>
373+
<source>1.8</source>
374+
<show>public</show>
375+
<excludePackageNames>
376+
org.nhindirect.gateway.smtp.annotation:org.nhindirect.gateway.smtp.module:org.nhindirect.gateway.smtp.provider:org.nhindirect.gateway.smtp.config.cert.impl:org.nhindirect.gateway.streams:org.nhindirect.gateway.springconfig:org.nhindirect.gateway.smtp.dsn.impl:org.nhindirect.gateway.util
377+
</excludePackageNames>
395378
</configuration>
396379
<executions>
397380
<execution>
@@ -403,6 +386,7 @@
403386
</execution>
404387
</executions>
405388
</plugin>
389+
<!-- for release only
406390
<plugin>
407391
<groupId>org.apache.maven.plugins</groupId>
408392
<artifactId>maven-gpg-plugin</artifactId>
@@ -417,65 +401,31 @@
417401
</executions>
418402
</plugin>
419403
-->
420-
</plugins>
421-
<pluginManagement>
422-
<plugins>
423-
<plugin>
424-
<groupId>org.apache.maven.plugins</groupId>
425-
<artifactId>maven-release-plugin</artifactId>
426-
<version>2.0</version>
427-
<configuration>
428-
<tagBase>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/tags</tagBase>
429-
</configuration>
430-
</plugin>
431-
<plugin>
432-
<groupId>org.apache.maven.plugins</groupId>
433-
<artifactId>maven-site-plugin</artifactId>
434-
<version>2.1.1</version>
435-
<dependencies>
436-
<dependency>
437-
<groupId>commons-httpclient</groupId>
438-
<artifactId>commons-httpclient</artifactId>
439-
<version>3.1</version>
440-
<exclusions>
441-
<exclusion>
442-
<groupId>commons-logging</groupId>
443-
<artifactId>commons-logging</artifactId>
444-
</exclusion>
445-
</exclusions>
446-
</dependency>
447-
</dependencies>
448-
</plugin>
449-
</plugins>
450-
</pluginManagement>
404+
</plugins>
451405
</build>
452406
<reporting>
453407
<plugins>
454-
<plugin>
455-
<groupId>org.apache.maven.plugins</groupId>
456-
<artifactId>maven-site-plugin</artifactId>
457-
<version>2.1.1</version>
458-
</plugin>
459408
<plugin>
460409
<groupId>org.apache.maven.plugins</groupId>
461410
<artifactId>maven-project-info-reports-plugin</artifactId>
462-
<version>2.2</version>
411+
<version>2.9</version>
463412
</plugin>
464413
<plugin>
465414
<groupId>org.apache.maven.plugins</groupId>
466415
<artifactId>maven-javadoc-plugin</artifactId>
467416
<version>2.6.1</version>
468417
<configuration>
469-
<charset>UTF-8</charset>
470-
<docencoding>UTF-8</docencoding>
471-
<docfilessubdirs>true</docfilessubdirs>
472-
<detectJavaApiLink>true</detectJavaApiLink>
473-
<detectLinks>true</detectLinks>
474-
<source>1.8</source>
475-
<show>public</show>
476-
<excludePackageNames>
477-
org.nhindirect.gateway.smtp.annotation:org.nhindirect.gateway.smtp.module:org.nhindirect.gateway.smtp.provider:org.nhindirect.gateway.smtp.config.cert.impl:org.nhindirect.gateway.smtp.dsn.impl
478-
</excludePackageNames>
418+
<additionalparam>-Xdoclint:none</additionalparam>
419+
<charset>UTF-8</charset>
420+
<docencoding>UTF-8</docencoding>
421+
<docfilessubdirs>true</docfilessubdirs>
422+
<detectJavaApiLink>true</detectJavaApiLink>
423+
<detectLinks>true</detectLinks>
424+
<source>1.8</source>
425+
<show>public</show>
426+
<excludePackageNames>
427+
org.nhindirect.gateway.smtp.annotation:org.nhindirect.gateway.smtp.module:org.nhindirect.gateway.smtp.provider:org.nhindirect.gateway.smtp.config.cert.impl:org.nhindirect.gateway.streams:org.nhindirect.gateway.springconfig:org.nhindirect.gateway.smtp.dsn.impl:org.nhindirect.gateway.util
428+
</excludePackageNames>
479429
</configuration>
480430
</plugin>
481431
<plugin>
@@ -492,24 +442,10 @@
492442
<plugin>
493443
<groupId>org.apache.maven.plugins</groupId>
494444
<artifactId>maven-jxr-plugin</artifactId>
495-
</plugin>
496-
<!--
497-
<plugin>
498-
<groupId>org.apache.maven.plugins</groupId>
499-
<artifactId>maven-changelog-plugin</artifactId>
500-
<configuration>
501-
<dates>
502-
<date>2010-11-10</date>
503-
</dates>
504-
<outputEncoding>UTF-8</outputEncoding>
505-
<type>date</type>
506-
</configuration>
507-
</plugin>
508-
-->
445+
</plugin>
509446
<plugin>
510447
<groupId>org.codehaus.mojo</groupId>
511448
<artifactId>findbugs-maven-plugin</artifactId>
512-
<version>2.5</version>
513449
<configuration>
514450
<effort>Max</effort>
515451
<excludeFilterFile>${project.basedir}/src/report/findbugs-exclude.xml</excludeFilterFile>
@@ -526,17 +462,7 @@
526462
<tag>@deprecated</tag>
527463
</tags>
528464
</configuration>
529-
</plugin>
530-
<plugin>
531-
<groupId>com.atlassian.maven.plugins</groupId>
532-
<artifactId>maven-clover2-plugin</artifactId>
533-
<version>3.0.2</version>
534-
<configuration>
535-
<licenseLocation>
536-
${project.basedir}/../licenses/clover.license
537-
</licenseLocation>
538-
</configuration>
539-
</plugin>
465+
</plugin>
540466
</plugins>
541467
</reporting>
542468
<distributionManagement>

0 commit comments

Comments
 (0)