Skip to content

Commit f3a2340

Browse files
committed
Mergins release-related changes from 2.0.4
2 parents 884c2a3 + d9c7a7a commit f3a2340

File tree

5 files changed

+52
-5
lines changed

5 files changed

+52
-5
lines changed

parent/pom.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@
8484
<artifactId>maven-jar-plugin</artifactId>
8585
<version>2.3</version>
8686
</plugin>
87+
<plugin>
88+
<artifactId>maven-deploy-plugin</artifactId>
89+
<version>2.5</version>
90+
</plugin>
91+
<plugin>
92+
<artifactId>maven-site-plugin</artifactId>
93+
<version>3.0</version>
94+
</plugin>
8795
<plugin>
8896
<artifactId>maven-release-plugin</artifactId>
8997
<version>2.2.1</version>
@@ -128,6 +136,11 @@
128136
<artifactId>xmlbeans-maven-plugin</artifactId>
129137
<version>2.3.3</version>
130138
</plugin>
139+
<plugin>
140+
<groupId>com.agilejava.docbkx</groupId>
141+
<artifactId>docbkx-maven-plugin</artifactId>
142+
<version>2.0.13</version>
143+
</plugin>
131144
</plugins>
132145
</pluginManagement>
133146
<plugins>
@@ -141,6 +154,16 @@
141154
<plugin>
142155
<artifactId>maven-jar-plugin</artifactId>
143156
</plugin>
157+
<plugin>
158+
<artifactId>maven-site-plugin</artifactId>
159+
<dependencies>
160+
<dependency>
161+
<groupId>org.apache.maven.wagon</groupId>
162+
<artifactId>wagon-ssh</artifactId>
163+
<version>1.0-beta-7</version>
164+
</dependency>
165+
</dependencies>
166+
</plugin>
144167
</plugins>
145168
</build>
146169
<reporting>

pom.xml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,29 @@
145145
</profile>
146146
</profiles>
147147
<build>
148+
<extensions>
149+
<extension>
150+
<groupId>org.springframework.build.aws</groupId>
151+
<artifactId>org.springframework.build.aws.maven</artifactId>
152+
<version>3.1.0.RELEASE</version>
153+
</extension>
154+
</extensions>
148155
<plugins>
149156
<plugin>
150157
<artifactId>maven-release-plugin</artifactId>
151158
<version>2.2.1</version>
152159
</plugin>
160+
<plugin>
161+
<artifactId>maven-site-plugin</artifactId>
162+
<version>3.0</version>
163+
<dependencies>
164+
<dependency>
165+
<groupId>org.apache.maven.wagon</groupId>
166+
<artifactId>wagon-ssh</artifactId>
167+
<version>1.0-beta-7</version>
168+
</dependency>
169+
</dependencies>
170+
</plugin>
153171
<plugin>
154172
<artifactId>maven-assembly-plugin</artifactId>
155173
<version>2.2-beta-5</version>
@@ -212,7 +230,7 @@
212230
<plugin>
213231
<groupId>com.agilejava.docbkx</groupId>
214232
<artifactId>docbkx-maven-plugin</artifactId>
215-
<version>2.0.11</version>
233+
<version>2.0.13</version>
216234
<executions>
217235
<execution>
218236
<goals>

samples/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
<groupId>org.mortbay.jetty</groupId>
4646
<artifactId>maven-jetty-plugin</artifactId>
4747
</plugin>
48+
<plugin>
49+
<artifactId>maven-deploy-plugin</artifactId>
50+
<configuration>
51+
<skip>true</skip>
52+
</configuration>
53+
</plugin>
4854
<plugin>
4955
<artifactId>maven-war-plugin</artifactId>
5056
</plugin>

src/site/apt/downloads/releases.apt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Downloads
66

77
* Get the latest Spring Web Services releases here
88

9-
* <<Spring-WS 2.0.1.RELEASE is the current production release (JDK 1.5+)>>
9+
* <<Spring-WS 2.0.4.RELEASE is the current production release (JDK 1.5+)>>
1010

11-
* {{{http://www.springsource.com/download/community?project=Spring%20Web%20Services}Download}} | {{{http://static.springframework.org/spring-ws/docs/2.0.1.RELEASE/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=106405}Announcement}}
11+
* {{{http://www.springsource.com/download/community?project=Spring%20Web%20Services}Download}} | {{{http://static.springframework.org/spring-ws/docs/2.0.4.RELEASE/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=122440}Announcement}}
1212

13-
* <<Spring-WS 2.0.2 is the upcoming production release>>
13+
* <<Spring-WS 2.0.5 is the upcoming production release>>
1414

1515
* {{{snapshots.html}Download nightly snapshots}}

src/site/apt/downloads/snapshots.apt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Snapshot Builds
2323
<dependency>
2424
<groupId>org.springframework.ws</groupId>
2525
<artifactId>spring-ws-core</artifactId>
26-
<version>2.0.2.RELEASE-SNAPSHOT</version>
26+
<version>2.0.5.RELEASE-SNAPSHOT</version>
2727
</dependency>
2828
+---------------
2929

0 commit comments

Comments
 (0)