Skip to content

Commit d07484b

Browse files
author
Greg Meyer
authored
Merge pull request #3 from DirectProjectJavaRI/develop
Updating pom for release. Ready for 6.0 release.
2 parents 65e8f3c + 50f0fd5 commit d07484b

File tree

1 file changed

+45
-100
lines changed

1 file changed

+45
-100
lines changed

‎pom.xml‎

Lines changed: 45 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.nhind</groupId>
77
<artifactId>xdmail</artifactId>
8-
<version>6.0-SNAPSHOT</version>
8+
<version>6.0</version>
99
<name>NHIN Direct XD* Mail Gateway</name>
1010
<description>NHIN Direct XD* Mail Gateway</description>
11-
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/xdmail/${project.version}</url>
11+
<url>https://github.com/DirectProjectJavaRI/xdmail</url>
1212
<developers>
1313
<developer>
1414
<name>Vincent Lewis</name>
@@ -37,14 +37,10 @@
3737
<artifactId>spring-boot-dependencies</artifactId>
3838
<version>2.1.2.RELEASE</version>
3939
</parent>
40-
<repositories>
41-
<!-- Temp repository for Spring Boot Milestone -->
42-
<repository>
43-
<id>spring-milestone</id>
44-
<name>Spring Milestone Releases</name>
45-
<url>https://repo.spring.io/milestone/</url>
46-
</repository>
47-
</repositories>
40+
<scm>
41+
<url>https://github.com/DirectProjectJavaRI/xdmail.git</url>
42+
<connection>scm:hg:https://github.com/DirectProjectJavaRI/xdmail.git</connection>
43+
</scm>
4844
<dependencyManagement>
4945
<dependencies>
5046
<dependency>
@@ -57,7 +53,7 @@
5753
<dependency>
5854
<groupId>org.springframework.cloud</groupId>
5955
<artifactId>spring-cloud-starter-parent</artifactId>
60-
<version>Greenwich.RC1</version>
56+
<version>Greenwich.RELEASE</version>
6157
<type>pom</type>
6258
<scope>import</scope>
6359
</dependency>
@@ -124,19 +120,19 @@
124120
<dependency>
125121
<groupId>org.nhind</groupId>
126122
<artifactId>xd-common</artifactId>
127-
<version>6.0-SNAPSHOT</version>
123+
<version>6.0</version>
128124
<scope>compile</scope>
129125
</dependency>
130126
<dependency>
131127
<groupId>org.nhind</groupId>
132128
<artifactId>agent</artifactId>
133-
<version>6.0-SNAPSHOT</version>
129+
<version>6.0</version>
134130
<scope>compile</scope>
135131
</dependency>
136132
<dependency>
137133
<groupId>org.nhind</groupId>
138134
<artifactId>gateway</artifactId>
139-
<version>6.0-SNAPSHOT</version>
135+
<version>6.0</version>
140136
<scope>compile</scope>
141137
</dependency>
142138
<dependency>
@@ -166,11 +162,21 @@
166162
</testResources>
167163

168164
<extensions>
169-
<extension>
170-
<groupId>org.apache.maven.wagon</groupId>
171-
<artifactId>wagon-webdav</artifactId>
172-
<version>RELEASE</version>
173-
</extension>
165+
<extension>
166+
<groupId>org.apache.maven.wagon</groupId>
167+
<artifactId>wagon-webdav-jackrabbit</artifactId>
168+
<version>3.1.0</version>
169+
</extension>
170+
<extension>
171+
<groupId>org.apache.maven.wagon</groupId>
172+
<artifactId>wagon-ssh-external</artifactId>
173+
<version>3.1.0</version>
174+
</extension>
175+
<extension>
176+
<groupId>org.apache.maven.wagon</groupId>
177+
<artifactId>wagon-ssh</artifactId>
178+
<version>3.1.0</version>
179+
</extension>
174180
</extensions>
175181

176182
<plugins>
@@ -205,28 +211,6 @@
205211
</execution>
206212
</executions>
207213
</plugin>
208-
<plugin>
209-
<groupId>com.atlassian.maven.plugins</groupId>
210-
<artifactId>maven-clover2-plugin</artifactId>
211-
<version>3.0.2</version>
212-
<configuration>
213-
<jdk>1.6</jdk>
214-
<licenseLocation>
215-
${project.basedir}/../licenses/clover.license
216-
</licenseLocation>
217-
<excludes>
218-
<exclude>**/ccddb/*</exclude>
219-
</excludes>
220-
</configuration>
221-
<executions>
222-
<execution>
223-
<phase>pre-site</phase>
224-
<goals>
225-
<goal>instrument</goal>
226-
</goals>
227-
</execution>
228-
</executions>
229-
</plugin>
230214
<!--
231215
DOXIA does not yet copy resources to the generated-site or site
232216
location. Bug DOXIA-355 was submitted in July of 09 and is listed to
@@ -297,19 +281,20 @@
297281
</dependency>
298282
</dependencies>
299283
</plugin>
300-
<!--
284+
301285
<plugin>
302286
<groupId>org.apache.maven.plugins</groupId>
303287
<artifactId>maven-javadoc-plugin</artifactId>
304288
<version>2.6.1</version>
305289
<configuration>
306-
<charset>UTF-8</charset>
307-
<docencoding>UTF-8</docencoding>
308-
<docfilessubdirs>true</docfilessubdirs>
309-
<detectJavaApiLink>true</detectJavaApiLink>
310-
<detectLinks>true</detectLinks>
311-
<source>1.6</source>
312-
<show>protected</show>
290+
<additionalparam>-Xdoclint:none</additionalparam>
291+
<charset>UTF-8</charset>
292+
<docencoding>UTF-8</docencoding>
293+
<docfilessubdirs>true</docfilessubdirs>
294+
<detectJavaApiLink>true</detectJavaApiLink>
295+
<detectLinks>true</detectLinks>
296+
<source>1.8</source>
297+
<show>public</show>
313298
<excludePackageNames>
314299
oasis.names.tc.ebxml_regrep.xsd:ihe.iti.xds_b._2007
315300
</excludePackageNames>
@@ -324,6 +309,7 @@
324309
</execution>
325310
</executions>
326311
</plugin>
312+
<!-- for releases only
327313
<plugin>
328314
<groupId>org.apache.maven.plugins</groupId>
329315
<artifactId>maven-gpg-plugin</artifactId>
@@ -338,40 +324,29 @@
338324
</executions>
339325
</plugin>
340326
-->
341-
</plugins>
342-
<pluginManagement>
343-
<plugins>
344-
<plugin>
345-
<groupId>org.apache.maven.plugins</groupId>
346-
<artifactId>maven-release-plugin</artifactId>
347-
<version>2.0</version>
348-
<configuration>
349-
<tagBase>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/tags</tagBase>
350-
</configuration>
351-
</plugin>
352-
</plugins>
353-
</pluginManagement>
327+
</plugins>
354328
</build>
355329

356330
<reporting>
357331
<plugins>
358332
<plugin>
359333
<groupId>org.apache.maven.plugins</groupId>
360334
<artifactId>maven-project-info-reports-plugin</artifactId>
361-
<version>2.1</version>
335+
<version>2.9</version>
362336
</plugin>
363337
<plugin>
364338
<groupId>org.apache.maven.plugins</groupId>
365339
<artifactId>maven-javadoc-plugin</artifactId>
366340
<version>2.6.1</version>
367341
<configuration>
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.6</source>
374-
<show>protected</show>
342+
<additionalparam>-Xdoclint:none</additionalparam>
343+
<charset>UTF-8</charset>
344+
<docencoding>UTF-8</docencoding>
345+
<docfilessubdirs>true</docfilessubdirs>
346+
<detectJavaApiLink>true</detectJavaApiLink>
347+
<detectLinks>true</detectLinks>
348+
<source>1.8</source>
349+
<show>public</show>
375350
<excludePackageNames>
376351
oasis.names.tc.ebxml_regrep.xsd:ihe.iti.xds_b._2007
377352
</excludePackageNames>
@@ -392,29 +367,9 @@
392367
<groupId>org.apache.maven.plugins</groupId>
393368
<artifactId>maven-jxr-plugin</artifactId>
394369
</plugin>
395-
<plugin>
396-
<groupId>org.apache.maven.plugins</groupId>
397-
<artifactId>maven-changelog-plugin</artifactId>
398-
<configuration>
399-
<dates>
400-
<!-- Insert the date of the most recent release -->
401-
<date>2007-01-01</date>
402-
</dates>
403-
<outputEncoding>UTF-8</outputEncoding>
404-
<type>date</type>
405-
</configuration>
406-
</plugin>
407-
<plugin>
408-
<groupId>org.codehaus.mojo</groupId>
409-
<artifactId>clirr-maven-plugin</artifactId>
410-
<configuration>
411-
<minSeverity>info</minSeverity>
412-
</configuration>
413-
</plugin>
414370
<plugin>
415371
<groupId>org.codehaus.mojo</groupId>
416372
<artifactId>findbugs-maven-plugin</artifactId>
417-
<version>1.2</version>
418373
<configuration>
419374
<effort>Max</effort>
420375
</configuration>
@@ -431,16 +386,6 @@
431386
</tags>
432387
</configuration>
433388
</plugin>
434-
<plugin>
435-
<groupId>com.atlassian.maven.plugins</groupId>
436-
<artifactId>maven-clover2-plugin</artifactId>
437-
<version>3.0.2</version>
438-
<configuration>
439-
<licenseLocation>
440-
${project.basedir}/../licenses/clover.license
441-
</licenseLocation>
442-
</configuration>
443-
</plugin>
444389
</plugins>
445390
</reporting>
446391

0 commit comments

Comments
 (0)