Skip to content
This repository was archived by the owner on Sep 24, 2018. It is now read-only.

Commit 3cca446

Browse files
Verdentlukasj
Verdent
authored and
lukasj
committed
added modul-info support
1 parent 8e2ee4d commit 3cca446

File tree

4 files changed

+169
-36
lines changed

4 files changed

+169
-36
lines changed

‎api/jdk9/module-info.java

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3+
*
4+
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
5+
*
6+
* The contents of this file are subject to the terms of either the GNU
7+
* General Public License Version 2 only ("GPL") or the Common Development
8+
* and Distribution License("CDDL") (collectively, the "License"). You
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* http://glassfish.java.net/public/CDDL+GPL_1_1.html
12+
* or packager/legal/LICENSE.txt. See the License for the specific
13+
* language governing permissions and limitations under the License.
14+
*
15+
* When distributing the software, include this License Header Notice in each
16+
* file and include the License file at packager/legal/LICENSE.txt.
17+
*
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
27+
*
28+
* Contributor(s):
29+
* If you wish your version of this file to be governed by only the CDDL or
30+
* only the GPL Version 2, indicate your decision by adding "[Contributor]
31+
* elects to include this software in this distribution under the [CDDL or GPL
32+
* Version 2] license." If you don't indicate a single choice of license, a
33+
* recipient has the option to distribute your version of this file under
34+
* either the CDDL, the GPL Version 2 or to extend the choice of license to
35+
* its licensees as provided above. However, if you add GPL Version 2 code
36+
* and therefore, elected the GPL Version 2 license, then the option applies
37+
* only if the new code is made subject to such option by the copyright
38+
* holder.
39+
*/
40+
41+
module java.xml.ws {
42+
requires java.annotations.common;
43+
requires java.xml.bind;
44+
requires java.logging;
45+
requires java.xml.soap;
46+
47+
exports javax.xml.ws;
48+
exports javax.xml.ws.handler;
49+
exports javax.xml.ws.handler.soap;
50+
exports javax.xml.ws.http;
51+
exports javax.xml.ws.soap;
52+
exports javax.xml.ws.spi;
53+
exports javax.xml.ws.spi.http;
54+
exports javax.xml.ws.wsaddressing;
55+
56+
uses javax.xml.ws.spi.Invoker;
57+
uses javax.xml.ws.spi.Provider;
58+
uses javax.xml.ws.spi.ServiceDelegate;
59+
uses javax.xml.ws.spi.WebServiceFeatureAnnotation;
60+
}

‎api/pom.xml

Lines changed: 106 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,11 @@
115115
<extension.name>javax.xml.ws</extension.name>
116116
<spec.version>2.3</spec.version>
117117
<old.spec.version>2.2</old.spec.version>
118-
<jaxb.version>2.3.0-b170201.1255</jaxb.version>
119-
<soap.version>1.4.0-b01</soap.version>
118+
<jaxb.version>2.3.0-b170201.1204</jaxb.version>
119+
<soap.version>1.4.0-SNAPSHOT</soap.version>
120120

121121
<non.final>false</non.final>
122+
<mod.dir>${project.build.directory}/mods</mod.dir>
122123

123124
<findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
124125
<findbugs.threshold>Low</findbugs.threshold>
@@ -140,7 +141,7 @@
140141
<plugin>
141142
<groupId>org.apache.maven.plugins</groupId>
142143
<artifactId>maven-source-plugin</artifactId>
143-
<version>2.2.1</version>
144+
<version>2.3</version>
144145
</plugin>
145146
<plugin>
146147
<groupId>org.codehaus.mojo</groupId>
@@ -159,7 +160,7 @@
159160
<plugin>
160161
<groupId>org.apache.maven.plugins</groupId>
161162
<artifactId>maven-jar-plugin</artifactId>
162-
<version>2.3.1</version>
163+
<version>2.6</version>
163164
</plugin>
164165
<plugin>
165166
<groupId>org.apache.maven.plugins</groupId>
@@ -243,7 +244,7 @@
243244
<plugin>
244245
<groupId>org.apache.maven.plugins</groupId>
245246
<artifactId>maven-dependency-plugin</artifactId>
246-
<version>2.3</version>
247+
<version>3.0.0</version>
247248
<executions>
248249
<execution>
249250
<goals>
@@ -255,31 +256,10 @@
255256
<plugin>
256257
<groupId>org.apache.maven.plugins</groupId>
257258
<artifactId>maven-compiler-plugin</artifactId>
258-
<executions>
259-
<execution>
260-
<id>default-compile</id>
261-
<configuration>
262-
<source>1.7</source>
263-
<target>1.7</target>
264-
<excludes>
265-
<exclude>module-info.java</exclude>
266-
</excludes>
267-
</configuration>
268-
</execution>
269-
<execution>
270-
<id>jdk-9</id>
271-
<goals>
272-
<goal>compile</goal>
273-
</goals>
274-
<configuration>
275-
<source>1.9</source>
276-
<target>1.9</target>
277-
<includes>
278-
<include>module-info.java</include>
279-
</includes>
280-
</configuration>
281-
</execution>
282-
</executions>
259+
<configuration>
260+
<source>1.7</source>
261+
<target>1.7</target>
262+
</configuration>
283263
</plugin>
284264

285265
<plugin>
@@ -374,7 +354,6 @@ href='http://www.oracle.com/technetwork/java/index-jsp-137004.html'><i>Metro Web
374354
<location>${basedir}/offline-javadoc</location>
375355
</offlineLink>
376356
</offlineLinks>
377-
<additionalparam>-Xdoclint:none --add-reads java.xml.ws=ALL-UNNAMED</additionalparam>
378357
</configuration>
379358
<executions>
380359
<execution>
@@ -462,7 +441,102 @@ href='http://www.oracle.com/technetwork/java/index-jsp-137004.html'><i>Metro Web
462441
</plugins>
463442
</build>
464443
</profile>
465-
444+
<profile>
445+
<id>jdk9</id>
446+
<activation>
447+
<jdk>9</jdk>
448+
</activation>
449+
<build>
450+
<pluginManagement>
451+
<plugins>
452+
<plugin>
453+
<groupId>org.apache.maven.plugins</groupId>
454+
<artifactId>maven-compiler-plugin</artifactId>
455+
<executions>
456+
<execution>
457+
<id>default-compile</id>
458+
<configuration>
459+
<release>9</release>
460+
<source>9</source>
461+
<target>9</target>
462+
</configuration>
463+
</execution>
464+
<execution>
465+
<id>base-compile</id>
466+
<goals>
467+
<goal>compile</goal>
468+
</goals>
469+
<configuration>
470+
<excludes>
471+
<exclude>module-info.java</exclude>
472+
</excludes>
473+
</configuration>
474+
</execution>
475+
</executions>
476+
</plugin>
477+
<plugin>
478+
<groupId>org.apache.maven.plugins</groupId>
479+
<artifactId>maven-dependency-plugin</artifactId>
480+
<executions>
481+
<execution>
482+
<id>prepare-endorsed</id>
483+
<phase>validate</phase>
484+
<goals>
485+
<goal>copy-dependencies</goal>
486+
</goals>
487+
<configuration>
488+
<outputDirectory>${mod.dir}</outputDirectory>
489+
<silent>false</silent>
490+
</configuration>
491+
</execution>
492+
</executions>
493+
</plugin>
494+
<plugin>
495+
<groupId>org.apache.felix</groupId>
496+
<artifactId>maven-bundle-plugin</artifactId>
497+
<configuration>
498+
<instructions>
499+
<_failok>true</_failok>
500+
</instructions>
501+
</configuration>
502+
</plugin>
503+
<plugin>
504+
<groupId>org.apache.maven.plugins</groupId>
505+
<artifactId>maven-javadoc-plugin</artifactId>
506+
<configuration>
507+
<includeDependencySources>false</includeDependencySources>
508+
<additionalJOptions>
509+
<additionalJOption>--add-modules</additionalJOption>
510+
<additionalJOption>java.xml.soap,java.xml.bind,java.annotations.common</additionalJOption>
511+
<additionalJOption>--module-path</additionalJOption>
512+
<additionalJOption>${mod.dir}</additionalJOption>
513+
</additionalJOptions>
514+
</configuration>
515+
</plugin>
516+
</plugins>
517+
</pluginManagement>
518+
<plugins>
519+
<plugin>
520+
<groupId>org.codehaus.mojo</groupId>
521+
<artifactId>build-helper-maven-plugin</artifactId>
522+
<executions>
523+
<execution>
524+
<id>add-jdk9-source</id>
525+
<phase>generate-sources</phase>
526+
<goals>
527+
<goal>add-source</goal>
528+
</goals>
529+
<configuration>
530+
<sources>
531+
<source>jdk9</source>
532+
</sources>
533+
</configuration>
534+
</execution>
535+
</executions>
536+
</plugin>
537+
</plugins>
538+
</build>
539+
</profile>
466540
</profiles>
467541

468542
</project>

‎api/src/javax/xml/ws/WebServiceRef.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import java.lang.annotation.ElementType;
4848
import java.lang.annotation.Retention;
4949
import java.lang.annotation.RetentionPolicy;
50+
import javax.annotation.Resource;
5051

5152
/**
5253
* The {@code WebServiceRef} annotation is used to
@@ -87,7 +88,7 @@
8788
* annotation annotated with the {@code WebServiceFeatureAnnotation}
8889
* that is specified with {@code WebServiceRef}, an ERROR MUST be given.
8990
*
90-
* @see javax.annotation.Resource
91+
* @see Resource
9192
* @see WebServiceFeatureAnnotation
9293
*
9394
* @since 1.6, JAX-WS 2.0

‎api/src/javax/xml/ws/soap/Addressing.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646
import java.lang.annotation.Retention;
4747
import java.lang.annotation.RetentionPolicy;
4848

49-
import javax.xml.ws.BindingProvider;
5049
import javax.xml.ws.WebServiceRef;
51-
import javax.xml.ws.WebServiceRefs;
5250
import javax.xml.ws.WebServiceProvider;
5351
import javax.xml.ws.soap.AddressingFeature.Responses;
5452
import javax.xml.ws.spi.WebServiceFeatureAnnotation;
@@ -59,7 +57,7 @@
5957
* with any other binding is undefined.
6058
* <p>
6159
* This annotation MUST only be used in conjunction with the
62-
* {@link javax.jws.WebService}, {@link WebServiceProvider},
60+
* {@code javax.jws.WebService}, {@link WebServiceProvider},
6361
* and {@link WebServiceRef} annotations.
6462
* When used with a {@code javax.jws.WebService} annotation, this
6563
* annotation MUST only be used on the service endpoint implementation

0 commit comments

Comments
 (0)