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

Commit

Permalink
Fixes #22205: Changing javaee-api module for Java EE 8 (#22188)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
arindam-bandyopadhyay authored and yaminikb committed Aug 14, 2017
1 parent 909a023 commit da75564
Show file tree
Hide file tree
Showing 8 changed files with 938 additions and 398 deletions.
7 changes: 1 addition & 6 deletions appserver/ejb/ejb-container/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,7 @@
<version>${project.version}</version>
</dependency>

<!-- these 2 dependencies are for compilation only -->
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
<optional>true</optional>
</dependency>
<!-- this dependencies are for compilation only -->
<dependency>
<groupId>org.glassfish.metro</groupId>
<artifactId>webservices-api-osgi</artifactId>
Expand Down
318 changes: 159 additions & 159 deletions appserver/javaee-api/doc-files/speclicense.html

Large diffs are not rendered by default.

38 changes: 4 additions & 34 deletions appserver/javaee-api/javax.javaee-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
Expand Down Expand Up @@ -49,12 +49,12 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>javaee-api</artifactId>
<name>Java(TM) EE 7 Specification APIs</name>
<description>Java(TM) EE 7 Specification APIs</description>
<name>Java(TM) EE 8 Specification APIs</name>
<description>Java(TM) EE 8 Specification APIs</description>

<developers>
<developer>
<id>shannon</id>
<id>bshannon</id>
<name>Bill Shannon</name>
<organization>Oracle Corp.</organization>
<roles>
Expand All @@ -73,18 +73,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<id>process-license</id>
<goals>
<goal>process</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>glassfishbuild-maven-plugin</artifactId>
Expand Down Expand Up @@ -148,24 +136,6 @@
<artifactId>javax.resource-api</artifactId>
<optional>true</optional>
</dependency>
<!--
should be replaced with javax.jws-api, see GLASSFISH-19652
-->
<dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down
155 changes: 0 additions & 155 deletions appserver/javaee-api/javax.javaee-endorsed-api/pom.xml

This file was deleted.

18 changes: 3 additions & 15 deletions appserver/javaee-api/javax.javaee-web-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>javaee-web-api</artifactId>
<name>Java(TM) EE 7 Web Specification APIs</name>
<description>Java(TM) EE 7 Web Specification APIs</description>
<name>Java(TM) EE 8 Web Profile Specification APIs</name>
<description>Java(TM) EE 8 Web Profile Specification APIs</description>

<developers>
<developer>
<id>shannon</id>
<id>bshannon</id>
<name>Bill Shannon</name>
<organization>Oracle Corp.</organization>
<roles>
Expand All @@ -78,18 +78,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<id>process-license</id>
<goals>
<goal>process</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>glassfishbuild-maven-plugin</artifactId>
Expand Down
Loading

0 comments on commit da75564

Please sign in to comment.