Skip to content
This repository has been archived by the owner on Sep 21, 2022. It is now read-only.

Update jaxws-spring #140

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update jaxws-spring #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a9f0b6
Upgrade dependencies
cemartins Mar 4, 2019
8c5e8fb
Code cleanup
cemartins Mar 4, 2019
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
8 changes: 4 additions & 4 deletions pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<parent>
<groupId>net.java</groupId>
<artifactId>jvnet-parent</artifactId>
<version>4</version>
<version>5</version>
</parent>

<groupId>org.jvnet.jax-ws-commons</groupId>
Expand Down Expand Up @@ -125,10 +125,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.8</source>
<target>1.8</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<!--
Expand Down
3 changes: 2 additions & 1 deletion spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jvnet.jax-ws-commons</groupId>
<artifactId>pom</artifactId>
<version>1.3</version>
<version>1.4</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>

Expand All @@ -25,6 +25,7 @@
<url>https://java.net/jira/browse/JAX_WS_COMMONS</url>
</issueManagement>


<build>
<plugins>
<plugin>
Expand Down
29 changes: 7 additions & 22 deletions spring/spring-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<description>Configure JAX-WS with Spring</description>

<properties>
<jax-ws-version>2.2.8</jax-ws-version>
<metro-version>2.2.8-promoted-b146</metro-version>
<spring-version>3.2.3.RELEASE</spring-version>
<jax-ws-version>2.3.1</jax-ws-version>
<metro-version>2.3.1</metro-version>
<spring-version>4.3.22.RELEASE</spring-version>
<xbean-version>3.14</xbean-version>
</properties>

Expand Down Expand Up @@ -139,14 +139,14 @@
<version>${jax-ws-version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<groupId>org.glassfish.metro</groupId>
<artifactId>webservices-rt</artifactId>
<version>${metro-version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-local-transport</artifactId>
<version>${metro-version}</version>
<version>${jax-ws-version}</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -182,24 +182,9 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<!-- shouldn't be needed once JAX-WS RT POM properly declares the dependency -->
<dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
<version>1.0-MR1</version>
</dependency>
</dependencies>

<!-- sorcerer needs Mustang, but Mustang won't work with JAXB/WS 2.1
<reporting>
<plugins>
<plugin>
<groupId>org.jvnet.sorcerer</groupId>
<artifactId>maven-sorcerer-plugin</artifactId>
</plugin>
</plugins>
</reporting>-->
</project>
4 changes: 1 addition & 3 deletions spring/spring-core/src/main/java/org/jvnet/jax_ws_commons/spring/SpringService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*/
package org.jvnet.jax_ws_commons.spring;

import com.sun.istack.NotNull;
import com.sun.xml.ws.api.BindingID;
import com.sun.xml.ws.api.WSBinding;
import com.sun.xml.ws.api.pipe.TubelineAssembler;
Expand Down Expand Up @@ -79,7 +78,6 @@
// javadoc for this class is used to auto-generate documentation.
public class SpringService implements FactoryBean<WSEndpoint>, ServletContextAware, InitializingBean {

@NotNull
private Class<?> implType;

// everything else can be null
Expand Down Expand Up @@ -531,7 +529,7 @@ public TubelineAssembler doCreate(BindingID bindingId) {
private final Module module = new Module() {
private final List<BoundEndpoint> endpoints = new ArrayList<BoundEndpoint>();

public @NotNull List<BoundEndpoint> getBoundEndpoints() {
public List<BoundEndpoint> getBoundEndpoints() {
return endpoints;
}
};
Expand Down
29 changes: 2 additions & 27 deletions spring/test-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<finalName>${project.artifactId}</finalName>

<plugins>
<plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.26</version>
Expand All @@ -26,21 +26,6 @@
<scanIntervalSeconds>1</scanIntervalSeconds>
</configuration>
</plugin>
<!--plugin>
<groupId>eviware</groupId>
<artifactId>maven-soapui-plugin</artifactId>
<version>1.0-beta1</version>
<executions>
<execution>
<id>ui-test</id>
<phase>test</phase>
<configuration>
<projectFile>soapui.xml</projectFile>
<host>http://localhost:8080/</host>
</configuration>
</execution>
</executions>
</plugin-->
</plugins>
</build>

Expand All @@ -49,18 +34,8 @@
<dependency>
<groupId>org.jvnet.jax-ws-commons.spring</groupId>
<artifactId>jaxws-spring</artifactId>
<version>${version}</version>
<version>${project.version}</version>
</dependency>
<!--
for this test to run correctly we need more recent SJSXP,
but having that dependency prevents our release. So this
is commented out.
-->
<!--dependency>
<groupId>com.sun.xml.stream</groupId>
<artifactId>sjsxp</artifactId>
<version>SNAPSHOT</version>
</dependency-->
</dependencies>

<pluginRepositories>
Expand Down