Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit da75564

Browse files
arindam-bandyopadhyayyaminikb
authored andcommitted
Fixes #22205: Changing javaee-api module for Java EE 8 (#22188)
* delete endorsed API, updated speclicence and deleted jsr181-api,javax.xml.soap-api,jaxws-api * Change the description of web profile pom.xml * changed license from CDDL 1.0 to CDDL+GPL
1 parent 909a023 commit da75564

File tree

8 files changed

+938
-398
lines changed

8 files changed

+938
-398
lines changed

appserver/ejb/ejb-container/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,7 @@
116116
<version>${project.version}</version>
117117
</dependency>
118118

119-
<!-- these 2 dependencies are for compilation only -->
120-
<dependency>
121-
<groupId>javax.xml.soap</groupId>
122-
<artifactId>javax.xml.soap-api</artifactId>
123-
<optional>true</optional>
124-
</dependency>
119+
<!-- this dependencies are for compilation only -->
125120
<dependency>
126121
<groupId>org.glassfish.metro</groupId>
127122
<artifactId>webservices-api-osgi</artifactId>

appserver/javaee-api/doc-files/speclicense.html

Lines changed: 159 additions & 159 deletions
Large diffs are not rendered by default.

appserver/javaee-api/javax.javaee-api/pom.xml

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -49,12 +49,12 @@
4949
</parent>
5050
<modelVersion>4.0.0</modelVersion>
5151
<artifactId>javaee-api</artifactId>
52-
<name>Java(TM) EE 7 Specification APIs</name>
53-
<description>Java(TM) EE 7 Specification APIs</description>
52+
<name>Java(TM) EE 8 Specification APIs</name>
53+
<description>Java(TM) EE 8 Specification APIs</description>
5454

5555
<developers>
5656
<developer>
57-
<id>shannon</id>
57+
<id>bshannon</id>
5858
<name>Bill Shannon</name>
5959
<organization>Oracle Corp.</organization>
6060
<roles>
@@ -73,18 +73,6 @@
7373

7474
<build>
7575
<plugins>
76-
<plugin>
77-
<groupId>org.apache.maven.plugins</groupId>
78-
<artifactId>maven-remote-resources-plugin</artifactId>
79-
<executions>
80-
<execution>
81-
<id>process-license</id>
82-
<goals>
83-
<goal>process</goal>
84-
</goals>
85-
</execution>
86-
</executions>
87-
</plugin>
8876
<plugin>
8977
<groupId>org.glassfish.build</groupId>
9078
<artifactId>glassfishbuild-maven-plugin</artifactId>
@@ -148,24 +136,6 @@
148136
<artifactId>javax.resource-api</artifactId>
149137
<optional>true</optional>
150138
</dependency>
151-
<!--
152-
should be replaced with javax.jws-api, see GLASSFISH-19652
153-
-->
154-
<dependency>
155-
<groupId>javax.jws</groupId>
156-
<artifactId>jsr181-api</artifactId>
157-
<optional>true</optional>
158-
</dependency>
159-
<dependency>
160-
<groupId>javax.xml.soap</groupId>
161-
<artifactId>javax.xml.soap-api</artifactId>
162-
<optional>true</optional>
163-
</dependency>
164-
<dependency>
165-
<groupId>javax.xml.ws</groupId>
166-
<artifactId>jaxws-api</artifactId>
167-
<optional>true</optional>
168-
</dependency>
169139
<dependency>
170140
<groupId>javax.xml.bind</groupId>
171141
<artifactId>jaxb-api</artifactId>

appserver/javaee-api/javax.javaee-endorsed-api/pom.xml

Lines changed: 0 additions & 155 deletions
This file was deleted.

appserver/javaee-api/javax.javaee-web-api/pom.xml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
</parent>
5050
<modelVersion>4.0.0</modelVersion>
5151
<artifactId>javaee-web-api</artifactId>
52-
<name>Java(TM) EE 7 Web Specification APIs</name>
53-
<description>Java(TM) EE 7 Web Specification APIs</description>
52+
<name>Java(TM) EE 8 Web Profile Specification APIs</name>
53+
<description>Java(TM) EE 8 Web Profile Specification APIs</description>
5454

5555
<developers>
5656
<developer>
57-
<id>shannon</id>
57+
<id>bshannon</id>
5858
<name>Bill Shannon</name>
5959
<organization>Oracle Corp.</organization>
6060
<roles>
@@ -78,18 +78,6 @@
7878

7979
<build>
8080
<plugins>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-remote-resources-plugin</artifactId>
84-
<executions>
85-
<execution>
86-
<id>process-license</id>
87-
<goals>
88-
<goal>process</goal>
89-
</goals>
90-
</execution>
91-
</executions>
92-
</plugin>
9381
<plugin>
9482
<groupId>org.glassfish.build</groupId>
9583
<artifactId>glassfishbuild-maven-plugin</artifactId>

0 commit comments

Comments
 (0)