Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Spring4 integration test again #4233

Merged
merged 1 commit into from
Sep 2, 2019
Merged

Enable Spring4 integration test again #4233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions tests/integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,7 @@
<module>servlet-request-wrapper-binding</module>
<module>servlet-tests</module>
<module>sonar-test</module>
<!-- TODO: temporarily removing spring 4 integration test -->
<!-- TODO: conflict in ASM version (too old) of jetty plugin -->
<!--<module>spring4</module>-->
<module>spring4</module>
<module>tracing-support</module>
<module>microprofile/config/helidon</module>
<module>microprofile/config/webapp</module>
Expand Down
22 changes: 17 additions & 5 deletions tests/integration/spring4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.integration</groupId>
<artifactId>project</artifactId>
<version>2.26-SNAPSHOT</version>
<version>2.30-SNAPSHOT</version>
</parent>

<artifactId>spring4</artifactId>
Expand Down Expand Up @@ -55,9 +55,22 @@
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
</exclusions>
<scope>compile</scope>
</dependency>

<!-- TODO Use spring-context 4 -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.2.16.RELEASE</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId>
Expand All @@ -81,7 +94,6 @@
<artifactId>commons-logging</artifactId>
<scope>runtime</scope>
</dependency>

</dependencies>

<build>
Expand All @@ -95,12 +107,12 @@
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<webApp>
<contextPath>/</contextPath>
<webInfIncludeJarPattern>.*\.jar$</webInfIncludeJarPattern>
<webInfIncludeJarPattern>.*$</webInfIncludeJarPattern>
</webApp>
</configuration>
</plugin>
Expand Down