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

Integration of new webservices and jaxb #22515

Merged
merged 2 commits into from
Jun 5, 2018
Merged

Integration of new webservices and jaxb #22515

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
e48de75
Updated jaxb-ri to 2.3.0.1, webservices-osgi to 2.4.1, removed jaxb-e…
May 22, 2018
afb8b0d
Deleted JAXB1 tests.
May 24, 2018
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
6 changes: 0 additions & 6 deletions appserver/appclient/client/acc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,6 @@
<artifactId>jaxb-osgi</artifactId>
</dependency>

<dependency>
<scope>runtime</scope>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-extra-osgi</artifactId>
</dependency>

<!-- endorsed: webservices-api-osgi.jar -->
<dependency>
<groupId>org.glassfish.metro</groupId>
Expand Down
5 changes: 0 additions & 5 deletions appserver/extras/embedded/all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,11 +1642,6 @@
<artifactId>jaxb-osgi</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-extra-osgi</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,11 +1428,6 @@
<artifactId>jaxb-osgi</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-extra-osgi</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions appserver/featuresets/glassfish/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,16 +491,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-extra-osgi</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down
9 changes: 2 additions & 7 deletions appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@

<jsftemplating.version>2.1.3</jsftemplating.version>
<uc-pkg-bootstrap.version>1.122-57.2889</uc-pkg-bootstrap.version>
<webservices.version>2.4.0</webservices.version>
<webservices.version>2.4.1</webservices.version>
<woodstox.version>4.4.1</woodstox.version>
<jaxb-api.version>2.3.0</jaxb-api.version>
<jaxb.version>2.3.0</jaxb.version>
<jaxb.version>2.3.0.1</jaxb.version>
<stax2-api.version>3.1.4</stax2-api.version>
<javax.xml.registry-api.version>1.0.8</javax.xml.registry-api.version>
<eclipselink.version>2.7.0</eclipselink.version>
Expand Down Expand Up @@ -664,11 +664,6 @@
<artifactId>jaxb-osgi</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-extra-osgi</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions appserver/tests/quicklook/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@
-->
<ant dir="wsit/JaxwsFromWsdl" target="build-deploy"/>
<ant dir="wsit/jsr109tester" target="build-deploy"/>
<ant dir="wsit/jaxbosgi" target="build-deploy"/>
<ant dir="security/appperms" target="build-deploy"/>
</target>

Expand Down Expand Up @@ -301,7 +300,6 @@
-->
<!-- <ant dir="wsit/JaxwsFromWsdl" target="undeploy"/>
<ant dir="wsit/jsr109tester" target="undeploy"/>-->
<ant dir="wsit/jaxbosgi" target="undeploy"/>
<ant dir="security/appperms" target="undeploy"/>
</target>

Expand Down
5 changes: 0 additions & 5 deletions appserver/tests/quicklook/testng/testng_gd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,6 @@
<class name="test.osgi.hello.HelloOSGITestNG" />
</classes>
</test>
<test name="wsit_jaxb_tests">
<classes>
<class name="jaxbosgi.JaxbOsgiTestNG"/>
</classes>
</test>
<test name="cluster_setup">
<classes>
<class name="test.clustersetup.ClusterSetupTest"/>
Expand Down
50 changes: 0 additions & 50 deletions appserver/tests/quicklook/wsit/jaxbosgi/build.properties
View file
Open in desktop

This file was deleted.

123 changes: 0 additions & 123 deletions appserver/tests/quicklook/wsit/jaxbosgi/build.xml
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions appserver/tests/quicklook/wsit/jaxbosgi/metadata/web.xml
View file
Open in desktop

This file was deleted.

Loading