Skip to content

Commit 4896672

Browse files
committed
435895 jetty spring module is not in distribution
1 parent 424e421 commit 4896672

File tree

3 files changed

+36
-2
lines changed

3 files changed

+36
-2
lines changed

jetty-distribution/pom.xml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
<configuration>
303303
<includeGroupIds>org.eclipse.jetty</includeGroupIds>
304304
<excludeGroupIds>org.eclipse.jetty.orbit,org.eclipse.jetty.spdy,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs</excludeGroupIds>
305-
<excludeArtifactIds>jetty-all,jetty-jsp,apache-jsp,jetty-start,jetty-monitor</excludeArtifactIds>
305+
<excludeArtifactIds>jetty-all,jetty-jsp,apache-jsp,jetty-start,jetty-monitor,jetty-spring</excludeArtifactIds>
306306
<includeTypes>jar</includeTypes>
307307
<outputDirectory>${assembly-directory}/lib</outputDirectory>
308308
</configuration>
@@ -332,6 +332,19 @@
332332
<outputDirectory>${assembly-directory}/lib/fcgi</outputDirectory>
333333
</configuration>
334334
</execution>
335+
<execution>
336+
<id>copy-lib-spring-deps</id>
337+
<phase>generate-resources</phase>
338+
<goals>
339+
<goal>copy-dependencies</goal>
340+
</goals>
341+
<configuration>
342+
<includeGroupIds>org.eclipse.jetty</includeGroupIds>
343+
<includeArtifactIds>jetty-spring</includeArtifactIds>
344+
<includeTypes>jar</includeTypes>
345+
<outputDirectory>${assembly-directory}/lib/spring</outputDirectory>
346+
</configuration>
347+
</execution>
335348
<execution>
336349
<id>copy-lib-monitor-deps</id>
337350
<phase>generate-resources</phase>
@@ -765,6 +778,11 @@
765778
<artifactId>fcgi-server</artifactId>
766779
<version>${project.version}</version>
767780
</dependency>
781+
<dependency>
782+
<groupId>org.eclipse.jetty</groupId>
783+
<artifactId>jetty-spring</artifactId>
784+
<version>${project.version}</version>
785+
</dependency>
768786
<!--
769787
<dependency>
770788
<groupId>org.eclipse.jetty</groupId>

jetty-spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<name>Example :: Jetty Spring</name>
1010

1111
<properties>
12-
<spring-version>3.1.3.RELEASE</spring-version>
12+
<spring-version>3.2.8.RELEASE</spring-version>
1313
<dependencies>target/dependencies</dependencies>
1414
</properties>
1515

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Spring
3+
#
4+
[name]
5+
spring
6+
7+
[depend]
8+
server
9+
10+
[lib]
11+
lib/spring/*.jar
12+
13+
[ini-template]
14+
## See http://www.eclipse.org/jetty/documentation/current/frameworks.html#framework-jetty-spring
15+
## for information on how to complete spring configuration
16+

0 commit comments

Comments
 (0)