Skip to content

Commit 32c4ea3

Browse files
author
Greg Meyer
authored
Merge pull request #4 from DirectProjectJavaRI/develop
Upating pom for RC release. Ready for 6.0-RC1 release.
2 parents 944790d + 7322690 commit 32c4ea3

File tree

1 file changed

+26
-101
lines changed

1 file changed

+26
-101
lines changed

‎pom.xml‎

Lines changed: 26 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<artifactId>direct-project-stock</artifactId>
66
<packaging>pom</packaging>
77
<name>The direct project stock assembly.</name>
8-
<version>6.0-SNAPSHOT</version>
8+
<version>6.0-RC1</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>
11-
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-project-stock/${project.version}</url>
11+
<url>https://github.com/DirectProjectJavaRI/direct-project-stock</url>
1212
<developers>
1313
<developer>
1414
<name>Greg Meyer</name>
@@ -39,23 +39,15 @@
3939
<version>2.1.2.RELEASE</version>
4040
</parent>
4141
<scm>
42-
<url>scm:git:https://github.com/DirectProject/direct-project-stock.gitt</url>
43-
<connection>scm:git:https://github.com/DirectProject/direct-project-stock.git</connection>
42+
<url>scm:git:https://github.com/DirectProjectJavaRI/direct-project-stock.git</url>
43+
<connection>scm:git:https://github.com/DirectProjectJavaRI/direct-project-stock.git</connection>
4444
</scm>
4545
<licenses>
4646
<license>
4747
<name>New BSD License</name>
4848
<url>http://nhindirect.org/BSDLicense</url>
4949
</license>
50-
</licenses>
51-
<repositories>
52-
<!-- Temp repository for Spring Boot Milestone -->
53-
<repository>
54-
<id>spring-milestone</id>
55-
<name>Spring Milestone Releases</name>
56-
<url>https://repo.spring.io/milestone/</url>
57-
</repository>
58-
</repositories>
50+
</licenses>
5951
<dependencyManagement>
6052
<dependencies>
6153
<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>
@@ -79,80 +71,80 @@
7971
<groupId>org.nhind</groupId>
8072
<artifactId>direct-msg-monitor-web</artifactId>
8173
<type>war</type>
82-
<version>6.0-SNAPSHOT</version>
74+
<version>6.0</version>
8375
</dependency>
8476
<dependency>
8577
<groupId>org.nhind</groupId>
8678
<artifactId>config-service-war</artifactId>
8779
<type>war</type>
88-
<version>6.0-SNAPSHOT</version>
80+
<version>6.0</version>
8981
</dependency>
9082
<dependency>
9183
<groupId>org.nhind</groupId>
9284
<artifactId>config-service-client</artifactId>
93-
<version>6.0-SNAPSHOT</version>
85+
<version>6.0</version>
9486
</dependency>
9587
<dependency>
9688
<groupId>org.nhind</groupId>
9789
<artifactId>config-ui</artifactId>
9890
<type>war</type>
99-
<version>6.0-SNAPSHOT</version>
91+
<version>6.0</version>
10092
</dependency>
10193
<dependency>
10294
<groupId>org.nhind</groupId>
10395
<artifactId>xd</artifactId>
10496
<type>war</type>
105-
<version>6.0-SNAPSHOT</version>
97+
<version>6.0</version>
10698
</dependency>
10799
<dependency>
108100
<groupId>org.nhind</groupId>
109101
<artifactId>xd-common</artifactId>
110-
<version>6.0-SNAPSHOT</version>
102+
<version>6.0</version>
111103
</dependency>
112104
<dependency>
113105
<groupId>org.nhind</groupId>
114106
<artifactId>xdmail</artifactId>
115-
<version>6.0-SNAPSHOT</version>
107+
<version>6.0</version>
116108
</dependency>
117109
<dependency>
118110
<groupId>org.nhind</groupId>
119111
<artifactId>agent</artifactId>
120-
<version>6.0-SNAPSHOT</version>
112+
<version>6.0</version>
121113
</dependency>
122114
<dependency>
123115
<groupId>org.nhind</groupId>
124116
<artifactId>gateway</artifactId>
125-
<version>6.0-SNAPSHOT</version>
117+
<version>6.0</version>
126118
</dependency>
127119
<dependency>
128120
<groupId>org.nhind</groupId>
129121
<artifactId>direct-common</artifactId>
130-
<version>6.0-SNAPSHOT</version>
122+
<version>6.0</version>
131123
</dependency>
132124
<dependency>
133125
<groupId>org.nhind</groupId>
134126
<artifactId>direct-common-audit</artifactId>
135-
<version>6.0-SNAPSHOT</version>
127+
<version>6.0</version>
136128
</dependency>
137129
<dependency>
138130
<groupId>org.nhind</groupId>
139131
<artifactId>dns-sboot</artifactId>
140-
<version>6.0-SNAPSHOT</version>
132+
<version>6.0</version>
141133
</dependency>
142134
<dependency>
143135
<groupId>org.nhind</groupId>
144136
<artifactId>config-manager</artifactId>
145-
<version>6.0-SNAPSHOT</version>
137+
<version>6.0</version>
146138
</dependency>
147139
<dependency>
148140
<groupId>org.nhind</groupId>
149141
<artifactId>xdmail</artifactId>
150-
<version>6.0-SNAPSHOT</version>
142+
<version>6.0</version>
151143
</dependency>
152144
<dependency>
153145
<groupId>org.nhind</groupId>
154146
<artifactId>direct-policy</artifactId>
155-
<version>6.0-SNAPSHOT</version>
147+
<version>6.0</version>
156148
</dependency>
157149
<dependency>
158150
<groupId>org.springframework.cloud</groupId>
@@ -190,45 +182,7 @@
190182
<configuration>
191183
<outputDirectory>${project.build.directory}/lib</outputDirectory>
192184
</configuration>
193-
</execution>
194-
<!--
195-
<execution>
196-
<id>copy-dns-services</id>
197-
<goals>
198-
<goal>unpack</goal>
199-
</goals>
200-
<configuration>
201-
<artifactItems>
202-
<artifactItem>
203-
<groupId>org.nhind</groupId>
204-
<artifactId>dns</artifactId>
205-
<version>1.5.2</version>
206-
<type>tar.gz</type>
207-
<overWrite>true</overWrite>
208-
</artifactItem>
209-
</artifactItems>
210-
<outputDirectory>${project.build.directory}/direct</outputDirectory>
211-
</configuration>
212-
</execution>
213-
<execution>
214-
<id>copy-config-mgmt</id>
215-
<goals>
216-
<goal>unpack</goal>
217-
</goals>
218-
<configuration>
219-
<artifactItems>
220-
<artifactItem>
221-
<groupId>org.nhind</groupId>
222-
<artifactId>config-manager</artifactId>
223-
<version>1.2</version>
224-
<type>tar.gz</type>
225-
<overWrite>true</overWrite>
226-
</artifactItem>
227-
</artifactItems>
228-
<outputDirectory>${project.build.directory}/direct</outputDirectory>
229-
</configuration>
230-
</execution>
231-
-->
185+
</execution>
232186
</executions>
233187
</plugin>
234188
<plugin>
@@ -403,13 +357,14 @@
403357
<artifactId>maven-javadoc-plugin</artifactId>
404358
<version>2.6.1</version>
405359
<configuration>
360+
<additionalparam>-Xdoclint:none</additionalparam>
406361
<charset>UTF-8</charset>
407362
<docencoding>UTF-8</docencoding>
408363
<docfilessubdirs>true</docfilessubdirs>
409364
<detectJavaApiLink>true</detectJavaApiLink>
410365
<detectLinks>true</detectLinks>
411-
<source>1.6</source>
412-
<show>protected</show>
366+
<source>1.8</source>
367+
<show>public</show>
413368
</configuration>
414369
<executions>
415370
<execution>
@@ -436,37 +391,7 @@
436391
</executions>
437392
</plugin>
438393
-->
439-
</plugins>
440-
<pluginManagement>
441-
<plugins>
442-
<plugin>
443-
<groupId>org.apache.maven.plugins</groupId>
444-
<artifactId>maven-release-plugin</artifactId>
445-
<version>2.0</version>
446-
<configuration>
447-
<tagBase>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/tags</tagBase>
448-
</configuration>
449-
</plugin>
450-
<plugin>
451-
<groupId>org.apache.maven.plugins</groupId>
452-
<artifactId>maven-site-plugin</artifactId>
453-
<version>2.1.1</version>
454-
<dependencies>
455-
<dependency>
456-
<groupId>commons-httpclient</groupId>
457-
<artifactId>commons-httpclient</artifactId>
458-
<version>3.1</version>
459-
<exclusions>
460-
<exclusion>
461-
<groupId>commons-logging</groupId>
462-
<artifactId>commons-logging</artifactId>
463-
</exclusion>
464-
</exclusions>
465-
</dependency>
466-
</dependencies>
467-
</plugin>
468-
</plugins>
469-
</pluginManagement>
394+
</plugins>
470395
</build>
471396
<distributionManagement>
472397
<site>

0 commit comments

Comments
 (0)