Skip to content

Commit 1f205bc

Browse files
ropalkaasoldano
authored andcommitted
[JBWS-4027] JDK9 support
1 parent aa1eb86 commit 1f205bc

File tree

4 files changed

+28
-72
lines changed

4 files changed

+28
-72
lines changed

.gitignore

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
2-
# /
3-
/ant.properties
4-
/version.properties.md5
5-
/output*
6-
/profiles.xml
7-
/thirdparty
8-
/target
9-
/.settings
10-
/.project
11-
/.classpath
1+
# ignore Maven generated target folders
2+
~
3+
target
4+
# ignore eclipse files
5+
.project
6+
.classpath
7+
.settings
8+
.metadata
9+
# ignore IDEA files
1210
*.iml
11+
*.ipr
12+
*.iws
1313
.idea
14-
14+
# ignore NetBeans files
15+
nbactions.xml
16+
nb-configuration.xml
17+
catalog.xml
18+
nbproject

pom.xml

+5-53
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,23 @@
1515
<parent>
1616
<groupId>org.jboss.ws</groupId>
1717
<artifactId>jbossws-parent</artifactId>
18-
<version>1.3.0.Final</version>
18+
<version>1.4.0-SNAPSHOT</version>
1919
</parent>
2020

2121
<!-- Source Control Management -->
2222
<scm>
2323
<connection>scm:git:https://github.com/jbossws/jbossws-common.git</connection>
2424
<developerConnection>scm:git:https://github.com/jbossws/jbossws-common.git</developerConnection>
2525
<url>https://github.com/jbossws/jbossws-common</url>
26-
<tag>HEAD</tag>
2726
</scm>
2827

2928
<!-- Properties -->
3029
<properties>
3130
<jbossws.spi.version>3.2.0-SNAPSHOT</jbossws.spi.version>
3231
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
3332
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
34-
<jboss-logging.version>3.1.2.GA</jboss-logging.version>
35-
<jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version>
33+
<jboss-logging.version>3.3.0.Final</jboss-logging.version>
34+
<jboss-logging-processor.version>2.0.1.Final</jboss-logging-processor.version>
3635
<wsdl4j.version>1.6.2</wsdl4j.version>
3736
<jaxrpc.api.version>1.0.1.Final</jaxrpc.api.version>
3837
<jms.api.version>1.0.1.Final</jms.api.version>
@@ -43,7 +42,6 @@
4342

4443
<!-- Dependencies -->
4544
<dependencies>
46-
4745
<!-- jbossws dependencies -->
4846
<dependency>
4947
<groupId>org.jboss.ws</groupId>
@@ -70,6 +68,7 @@
7068
<groupId>org.jboss.spec.javax.xml.ws</groupId>
7169
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
7270
<version>${jaxws.api.version}</version>
71+
<scope>provided</scope>
7372
</dependency>
7473
<dependency>
7574
<groupId>org.jboss.spec.javax.xml.rpc</groupId>
@@ -111,57 +110,10 @@
111110
<groupId>junit</groupId>
112111
<artifactId>junit</artifactId>
113112
<version>${junit.version}</version>
114-
<scope>provided</scope>
113+
<scope>test</scope>
115114
</dependency>
116115
</dependencies>
117116

118-
<!-- Plugins -->
119-
<build>
120-
<plugins>
121-
<plugin>
122-
<artifactId>maven-compiler-plugin</artifactId>
123-
<configuration>
124-
<showDeprecation>false</showDeprecation>
125-
<compilerArguments>
126-
<endorseddirs>${project.build.directory}/endorsed</endorseddirs>
127-
<AgeneratedTranslationFilesPath>${project.basedir}/target/generated-translation-files</AgeneratedTranslationFilesPath>
128-
</compilerArguments>
129-
</configuration>
130-
</plugin>
131-
<plugin>
132-
<artifactId>maven-dependency-plugin</artifactId>
133-
<executions>
134-
<execution>
135-
<phase>generate-sources</phase>
136-
<goals>
137-
<goal>copy</goal>
138-
</goals>
139-
<configuration>
140-
<artifactItems>
141-
<artifactItem>
142-
<groupId>org.jboss.spec.javax.xml.ws</groupId>
143-
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
144-
<type>jar</type>
145-
<overWrite>true</overWrite>
146-
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
147-
</artifactItem>
148-
</artifactItems>
149-
</configuration>
150-
</execution>
151-
</executions>
152-
</plugin>
153-
<plugin>
154-
<groupId>org.apache.maven.plugins</groupId>
155-
<artifactId>maven-release-plugin</artifactId>
156-
<version>2.5.2</version>
157-
<configuration>
158-
<autoVersionSubmodules>true</autoVersionSubmodules>
159-
</configuration>
160-
</plugin>
161-
</plugins>
162-
</build>
163-
164-
165117
<!-- [JBWS-3666] -->
166118
<profiles>
167119
<profile>

src/main/java/org/jboss/ws/common/Loggers.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import javax.management.ObjectName;
3333

3434
import org.jboss.logging.BasicLogger;
35-
import org.jboss.logging.Cause;
36-
import org.jboss.logging.LogMessage;
37-
import org.jboss.logging.Message;
38-
import org.jboss.logging.MessageLogger;
35+
import org.jboss.logging.annotations.Cause;
36+
import org.jboss.logging.annotations.LogMessage;
37+
import org.jboss.logging.annotations.Message;
38+
import org.jboss.logging.annotations.MessageLogger;
3939
import org.jboss.wsf.spi.deployment.EndpointState;
4040

4141
/**

src/main/java/org/jboss/ws/common/Messages.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import javax.management.ObjectName;
3232
import javax.xml.ws.WebServiceException;
3333

34-
import org.jboss.logging.Cause;
35-
import org.jboss.logging.Message;
36-
import org.jboss.logging.MessageBundle;
34+
import org.jboss.logging.annotations.Cause;
35+
import org.jboss.logging.annotations.Message;
36+
import org.jboss.logging.annotations.MessageBundle;
3737
import org.jboss.ws.common.injection.InjectionException;
3838
import org.jboss.wsf.spi.WSFException;
3939
import org.jboss.wsf.spi.deployment.EndpointState;

0 commit comments

Comments
 (0)