Skip to content

Commit ee81e03

Browse files
author
Greg Meyer
authored
Merge pull request #3 from DirectProjectJavaRI/develop
Updating pom for release. Ready for 6.0 release.
2 parents e839cbe + 6e8615c commit ee81e03

File tree

1 file changed

+40
-96
lines changed

1 file changed

+40
-96
lines changed

‎pom.xml‎

Lines changed: 40 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>xd</artifactId>
66
<name>NHIN Direct XD* Web Endpoint</name>
7-
<version>6.0-SNAPSHOT</version>
7+
<version>6.0</version>
88
<description>NHIN Direct XD Component</description>
99
<inceptionYear>2010</inceptionYear>
1010
<packaging>war</packaging>
11-
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/xd/${project.version}</url>
11+
<url>https://github.com/DirectProjectJavaRI/xd</url>
1212
<scm>
13-
<url>scm:git:https://github.com/DirectProject/xd.git</url>
14-
<connection>scm:git:https://github.com/DirectProject/xd.git</connection>
13+
<url>scm:git:https://github.com/DirectProjectJavaRI/xd.git</url>
14+
<connection>scm:git:https://github.com/DirectProjectJavaRI/xd.git</connection>
1515
</scm>
1616
<prerequisites>
1717
<maven>3.0.0</maven>
@@ -46,13 +46,6 @@
4646
<url>http://nhindirect.org/BSDLicense</url>
4747
</license>
4848
</licenses>
49-
<repositories>
50-
<repository>
51-
<id>spring-milestone</id>
52-
<name>Spring Milestone Releases</name>
53-
<url>https://repo.spring.io/milestone/</url>
54-
</repository>
55-
</repositories>
5649
<properties>
5750
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5851
</properties>
@@ -75,7 +68,7 @@
7568
<dependency>
7669
<groupId>org.springframework.cloud</groupId>
7770
<artifactId>spring-cloud-starter-parent</artifactId>
78-
<version>Greenwich.RC1</version>
71+
<version>Greenwich.RELEASE</version>
7972
<type>pom</type>
8073
<scope>import</scope>
8174
</dependency>
@@ -177,17 +170,27 @@
177170
<dependency>
178171
<groupId>${project.groupId}</groupId>
179172
<artifactId>xd-common</artifactId>
180-
<version>6.0-SNAPSHOT</version>
173+
<version>6.0</version>
181174
</dependency>
182175
</dependencies>
183176

184177
<build>
185178
<extensions>
186-
<extension>
187-
<groupId>org.apache.maven.wagon</groupId>
188-
<artifactId>wagon-webdav</artifactId>
189-
<version>RELEASE</version>
190-
</extension>
179+
<extension>
180+
<groupId>org.apache.maven.wagon</groupId>
181+
<artifactId>wagon-webdav-jackrabbit</artifactId>
182+
<version>3.1.0</version>
183+
</extension>
184+
<extension>
185+
<groupId>org.apache.maven.wagon</groupId>
186+
<artifactId>wagon-ssh-external</artifactId>
187+
<version>3.1.0</version>
188+
</extension>
189+
<extension>
190+
<groupId>org.apache.maven.wagon</groupId>
191+
<artifactId>wagon-ssh</artifactId>
192+
<version>3.1.0</version>
193+
</extension>
191194
</extensions>
192195

193196
<plugins>
@@ -218,39 +221,7 @@
218221
</webResources>
219222
</configuration>
220223
</plugin>
221-
222-
<plugin>
223-
<groupId>com.atlassian.maven.plugins</groupId>
224-
<artifactId>maven-clover2-plugin</artifactId>
225-
<version>3.0.2</version>
226-
<configuration>
227-
<jdk>1.8</jdk>
228-
<licenseLocation>
229-
${project.basedir}/../licenses/clover.license
230-
</licenseLocation>
231-
</configuration>
232-
<executions>
233-
<execution>
234-
<phase>pre-site</phase>
235-
<goals>
236-
<goal>instrument</goal>
237-
</goals>
238-
</execution>
239-
</executions>
240-
</plugin>
241224
</plugins>
242-
<pluginManagement>
243-
<plugins>
244-
<plugin>
245-
<groupId>org.apache.maven.plugins</groupId>
246-
<artifactId>maven-release-plugin</artifactId>
247-
<version>2.0</version>
248-
<configuration>
249-
<tagBase>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/tags</tagBase>
250-
</configuration>
251-
</plugin>
252-
</plugins>
253-
</pluginManagement>
254225
</build>
255226

256227
<profiles>
@@ -303,19 +274,19 @@
303274
</execution>
304275
</executions>
305276
</plugin>
306-
<!-- for release only
307277
<plugin>
308278
<groupId>org.apache.maven.plugins</groupId>
309279
<artifactId>maven-javadoc-plugin</artifactId>
310280
<version>2.6.1</version>
311281
<configuration>
312-
<charset>UTF-8</charset>
313-
<docencoding>UTF-8</docencoding>
314-
<docfilessubdirs>true</docfilessubdirs>
315-
<detectJavaApiLink>true</detectJavaApiLink>
316-
<detectLinks>true</detectLinks>
317-
<source>1.8</source>
318-
<show>protected</show>
282+
<additionalparam>-Xdoclint:none</additionalparam>
283+
<charset>UTF-8</charset>
284+
<docencoding>UTF-8</docencoding>
285+
<docfilessubdirs>true</docfilessubdirs>
286+
<detectJavaApiLink>true</detectJavaApiLink>
287+
<detectLinks>true</detectLinks>
288+
<source>1.8</source>
289+
<show>public</show>
319290
<excludePackageNames>
320291
oasis.names.tc.ebxml_regrep.xsd:ihe.iti.xds_b._2007
321292
</excludePackageNames>
@@ -330,6 +301,7 @@
330301
</execution>
331302
</executions>
332303
</plugin>
304+
<!-- for release only
333305
<plugin>
334306
<groupId>org.apache.maven.plugins</groupId>
335307
<artifactId>maven-gpg-plugin</artifactId>
@@ -354,20 +326,21 @@
354326
<plugin>
355327
<groupId>org.apache.maven.plugins</groupId>
356328
<artifactId>maven-project-info-reports-plugin</artifactId>
357-
<version>2.1</version>
329+
<version>2.9</version>
358330
</plugin>
359331
<plugin>
360332
<groupId>org.apache.maven.plugins</groupId>
361333
<artifactId>maven-javadoc-plugin</artifactId>
362334
<version>2.6.1</version>
363335
<configuration>
364-
<charset>UTF-8</charset>
365-
<docencoding>UTF-8</docencoding>
366-
<docfilessubdirs>true</docfilessubdirs>
367-
<detectJavaApiLink>true</detectJavaApiLink>
368-
<detectLinks>true</detectLinks>
369-
<source>1.8</source>
370-
<show>protected</show>
336+
<additionalparam>-Xdoclint:none</additionalparam>
337+
<charset>UTF-8</charset>
338+
<docencoding>UTF-8</docencoding>
339+
<docfilessubdirs>true</docfilessubdirs>
340+
<detectJavaApiLink>true</detectJavaApiLink>
341+
<detectLinks>true</detectLinks>
342+
<source>1.8</source>
343+
<show>public</show>
371344
<excludePackageNames>
372345
oasis.names.tc.ebxml_regrep.xsd:ihe.iti.xds_b._2007
373346
</excludePackageNames>
@@ -384,29 +357,10 @@
384357
<groupId>org.apache.maven.plugins</groupId>
385358
<artifactId>maven-surefire-report-plugin</artifactId>
386359
</plugin>
387-
<plugin>
388-
<groupId>org.apache.maven.plugins</groupId>
389-
<artifactId>maven-changelog-plugin</artifactId>
390-
<configuration>
391-
<dates>
392-
<!-- Insert the date of the most recent release -->
393-
<date>2007-01-01</date>
394-
</dates>
395-
<outputEncoding>UTF-8</outputEncoding>
396-
<type>date</type>
397-
</configuration>
398-
</plugin>
399-
<plugin>
400-
<groupId>org.codehaus.mojo</groupId>
401-
<artifactId>clirr-maven-plugin</artifactId>
402-
<configuration>
403-
<minSeverity>info</minSeverity>
404-
</configuration>
405-
</plugin>
406360
<plugin>
407361
<groupId>org.codehaus.mojo</groupId>
408362
<artifactId>findbugs-maven-plugin</artifactId>
409-
<version>1.2</version>
363+
410364
<configuration>
411365
<effort>Max</effort>
412366
</configuration>
@@ -423,16 +377,6 @@
423377
</tags>
424378
</configuration>
425379
</plugin>
426-
<plugin>
427-
<groupId>com.atlassian.maven.plugins</groupId>
428-
<artifactId>maven-clover2-plugin</artifactId>
429-
<version>3.0.2</version>
430-
<configuration>
431-
<licenseLocation>
432-
${project.basedir}/../licenses/clover.license
433-
</licenseLocation>
434-
</configuration>
435-
</plugin>
436380
</plugins>
437381
</reporting>
438382

0 commit comments

Comments
 (0)