Skip to content

Commit 87e4f70

Browse files
author
Greg Meyer
authored
Merge pull request #3 from DirectProjectJavaRI/develop
Updating pom for release. Ready for 6.0 release.
2 parents 3feec0c + 8b4c8d5 commit 87e4f70

File tree

1 file changed

+44
-119
lines changed

1 file changed

+44
-119
lines changed

‎pom.xml‎

Lines changed: 44 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>dns-sboot</artifactId>
66
<name>Direct Project DNS Server SpringBoot Application</name>
7-
<version>6.0-SNAPSHOT</version>
7+
<version>6.0</version>
88
<description>Direct Project DNS Server SpringBoot Application</description>
99
<inceptionYear>2010</inceptionYear>
10-
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/dns-sboot/${project.version}</url>
10+
<url>https://github.com/DirectProjectJavaRI/dns-sboot</url>
1111
<developers>
1212
<developer>
1313
<name>Greg Meyer</name>
@@ -23,8 +23,8 @@
2323
<url>http://nhindirect.org</url>
2424
</organization>
2525
<scm>
26-
<url>scm:git:https://github.com/DirectProject/dns-sboot.git</url>
27-
<connection>scm:git:https://github.com/DirectProject/dns-sboot.git</connection>
26+
<url>scm:git:https://github.com/DirectProjectJavaRI/dns-sboot.git</url>
27+
<connection>scm:git:https://github.com/DirectProjectJavaRI/dns-sboot.git</connection>
2828
</scm>
2929
<prerequisites>
3030
<maven>3.0.0</maven>
@@ -41,14 +41,6 @@
4141
<url>http://nhindirect.org/BSDLicense</url>
4242
</license>
4343
</licenses>
44-
<repositories>
45-
<!-- Temp repository for Spring Boot Milestone -->
46-
<repository>
47-
<id>spring-milestone</id>
48-
<name>Spring Milestone Releases</name>
49-
<url>https://repo.spring.io/milestone/</url>
50-
</repository>
51-
</repositories>
5244
<dependencyManagement>
5345
<dependencies>
5446
<dependency>
@@ -68,7 +60,7 @@
6860
<dependency>
6961
<groupId>org.springframework.cloud</groupId>
7062
<artifactId>spring-cloud-starter-parent</artifactId>
71-
<version>Greenwich.RC1</version>
63+
<version>Greenwich.RELEASE</version>
7264
<type>pom</type>
7365
<scope>import</scope>
7466
</dependency>
@@ -114,41 +106,41 @@
114106
<dependency>
115107
<groupId>org.nhind</groupId>
116108
<artifactId>dns</artifactId>
117-
<version>6.0-SNAPSHOT</version>
109+
<version>6.0</version>
118110
</dependency>
119111
<dependency>
120112
<groupId>org.nhind</groupId>
121113
<artifactId>config-service-client</artifactId>
122-
<version>6.0-SNAPSHOT</version>
114+
<version>6.0</version>
123115
</dependency>
124116
<dependency>
125117
<groupId>org.nhind</groupId>
126118
<artifactId>direct-policy</artifactId>
127-
<version>6.0-SNAPSHOT</version>
119+
<version>6.0</version>
128120
</dependency>
129121
<dependency>
130122
<groupId>org.nhind</groupId>
131123
<artifactId>direct-common</artifactId>
132-
<version>6.0-SNAPSHOT</version>
124+
<version>6.0</version>
133125
</dependency>
134126
</dependencies>
135127
<build>
136128
<extensions>
137-
<extension>
138-
<groupId>org.apache.maven.wagon</groupId>
139-
<artifactId>wagon-webdav</artifactId>
140-
<version>RELEASE</version>
141-
</extension>
142-
<extension>
143-
<groupId>org.apache.maven.wagon</groupId>
144-
<artifactId>wagon-ssh-external</artifactId>
145-
<version>1.0-beta-6</version>
146-
</extension>
147-
<extension>
148-
<groupId>org.apache.maven.wagon</groupId>
149-
<artifactId>wagon-ssh</artifactId>
150-
<version>1.0-beta-6</version>
151-
</extension>
129+
<extension>
130+
<groupId>org.apache.maven.wagon</groupId>
131+
<artifactId>wagon-webdav-jackrabbit</artifactId>
132+
<version>3.1.0</version>
133+
</extension>
134+
<extension>
135+
<groupId>org.apache.maven.wagon</groupId>
136+
<artifactId>wagon-ssh-external</artifactId>
137+
<version>3.1.0</version>
138+
</extension>
139+
<extension>
140+
<groupId>org.apache.maven.wagon</groupId>
141+
<artifactId>wagon-ssh</artifactId>
142+
<version>3.1.0</version>
143+
</extension>
152144
</extensions>
153145
<resources>
154146
<resource>
@@ -235,23 +227,19 @@
235227
<groupId>org.springframework.boot</groupId>
236228
<artifactId>spring-boot-maven-plugin</artifactId>
237229
</plugin>
238-
<!-- for releases only
239230
<plugin>
240231
<groupId>org.apache.maven.plugins</groupId>
241232
<artifactId>maven-javadoc-plugin</artifactId>
242233
<version>2.6.1</version>
243234
<configuration>
244-
<additionalparam>-Xdoclint:none</additionalparam>
245-
<charset>UTF-8</charset>
246-
<docencoding>UTF-8</docencoding>
247-
<docfilessubdirs>true</docfilessubdirs>
248-
<detectJavaApiLink>true</detectJavaApiLink>
249-
<detectLinks>true</detectLinks>
250-
<source>1.6</source>
251-
<show>public</show>
252-
<excludePackageNames>
253-
org.nhindirect.dns.tools.utils
254-
</excludePackageNames>
235+
<additionalparam>-Xdoclint:none</additionalparam>
236+
<charset>UTF-8</charset>
237+
<docencoding>UTF-8</docencoding>
238+
<docfilessubdirs>true</docfilessubdirs>
239+
<detectJavaApiLink>true</detectJavaApiLink>
240+
<detectLinks>true</detectLinks>
241+
<source>1.8</source>
242+
<show>public</show>
255243
</configuration>
256244
<executions>
257245
<execution>
@@ -263,6 +251,7 @@
263251
</execution>
264252
</executions>
265253
</plugin>
254+
<!-- for releases only
266255
<plugin>
267256
<groupId>org.apache.maven.plugins</groupId>
268257
<artifactId>maven-gpg-plugin</artifactId>
@@ -277,66 +266,28 @@
277266
</executions>
278267
</plugin>
279268
-->
280-
</plugins>
281-
<pluginManagement>
282-
<plugins>
283-
<plugin>
284-
<groupId>org.apache.maven.plugins</groupId>
285-
<artifactId>maven-release-plugin</artifactId>
286-
<version>2.0</version>
287-
<configuration>
288-
<tagBase>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/tags</tagBase>
289-
</configuration>
290-
</plugin>
291-
<plugin>
292-
<groupId>org.apache.maven.plugins</groupId>
293-
<artifactId>maven-site-plugin</artifactId>
294-
<version>2.1.1</version>
295-
<dependencies>
296-
<dependency>
297-
<groupId>commons-httpclient</groupId>
298-
<artifactId>commons-httpclient</artifactId>
299-
<version>3.1</version>
300-
<exclusions>
301-
<exclusion>
302-
<groupId>commons-logging</groupId>
303-
<artifactId>commons-logging</artifactId>
304-
</exclusion>
305-
</exclusions>
306-
</dependency>
307-
</dependencies>
308-
</plugin>
309-
</plugins>
310-
</pluginManagement>
269+
</plugins>
311270
</build>
312271
<reporting>
313272
<plugins>
314-
<plugin>
315-
<groupId>org.apache.maven.plugins</groupId>
316-
<artifactId>maven-site-plugin</artifactId>
317-
<version>2.1.1</version>
318-
</plugin>
319273
<plugin>
320274
<groupId>org.apache.maven.plugins</groupId>
321275
<artifactId>maven-project-info-reports-plugin</artifactId>
322-
<version>2.2</version>
276+
<version>2.9</version>
323277
</plugin>
324278
<plugin>
325279
<groupId>org.apache.maven.plugins</groupId>
326280
<artifactId>maven-javadoc-plugin</artifactId>
327281
<version>2.6.1</version>
328282
<configuration>
329-
<additionalparam>-Xdoclint:none</additionalparam>
330-
<charset>UTF-8</charset>
331-
<docencoding>UTF-8</docencoding>
332-
<docfilessubdirs>true</docfilessubdirs>
333-
<detectJavaApiLink>true</detectJavaApiLink>
334-
<detectLinks>true</detectLinks>
335-
<source>1.8</source>
336-
<show>public</show>
337-
<excludePackageNames>
338-
org.nhindirect.dns.tools.utils
339-
</excludePackageNames>
283+
<additionalparam>-Xdoclint:none</additionalparam>
284+
<charset>UTF-8</charset>
285+
<docencoding>UTF-8</docencoding>
286+
<docfilessubdirs>true</docfilessubdirs>
287+
<detectJavaApiLink>true</detectJavaApiLink>
288+
<detectLinks>true</detectLinks>
289+
<source>1.8</source>
290+
<show>public</show>
340291
</configuration>
341292
</plugin>
342293
<plugin>
@@ -354,22 +305,6 @@
354305
<groupId>org.apache.maven.plugins</groupId>
355306
<artifactId>maven-jxr-plugin</artifactId>
356307
</plugin>
357-
<plugin>
358-
<groupId>org.codehaus.mojo</groupId>
359-
<artifactId>clirr-maven-plugin</artifactId>
360-
<configuration>
361-
<minSeverity>info</minSeverity>
362-
</configuration>
363-
</plugin>
364-
<plugin>
365-
<groupId>org.codehaus.mojo</groupId>
366-
<artifactId>findbugs-maven-plugin</artifactId>
367-
<version>1.2</version>
368-
<configuration>
369-
<effort>Max</effort>
370-
<excludeFilterFile>${project.basedir}/report/findbugs-exclude.xml</excludeFilterFile>
371-
</configuration>
372-
</plugin>
373308
<plugin>
374309
<groupId>org.codehaus.mojo</groupId>
375310
<artifactId>taglist-maven-plugin</artifactId>
@@ -381,17 +316,7 @@
381316
<tag>@deprecated</tag>
382317
</tags>
383318
</configuration>
384-
</plugin>
385-
<plugin>
386-
<groupId>com.atlassian.maven.plugins</groupId>
387-
<artifactId>maven-clover2-plugin</artifactId>
388-
<version>3.0.2</version>
389-
<configuration>
390-
<licenseLocation>
391-
${project.basedir}/../licenses/clover.license
392-
</licenseLocation>
393-
</configuration>
394-
</plugin>
319+
</plugin>
395320
</plugins>
396321
</reporting>
397322
<distributionManagement>

0 commit comments

Comments
 (0)