Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backports from master for 2.3.7 #670

Merged
merged 11 commits into from
Oct 17, 2023
Merged

Backports from master for 2.3.7 #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0b5b66f
update build plugins
lukasj Oct 17, 2023
a00d80c
Integrate latest javax dependencies
lukasj Oct 17, 2023
989686b
add version update rules
lukasj Oct 17, 2023
a1b3526
#653: fix maven scopes on 2.3.x release as was done on 4.x
lukasj Oct 17, 2023
67b6e9b
prevent NPE
lukasj Jun 8, 2023
bdd9528
BUG 35047999: Show Server Error in faultString instead of error detai…
himanshuatgit Jun 23, 2023
36b9bba
#656: Perform refresh in Eclipse after M2E execution of jaxws-maven-…
lukasj Oct 17, 2023
b61801e
disable tests failing on SE 21 (they pass in master)
lukasj Oct 17, 2023
eeed088
integrate latest asm
lukasj Oct 17, 2023
5578dea
fix cp rights
lukasj Oct 17, 2023
6ed977c
update test deps
lukasj Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions jaxws-ri/boms/bom-ext/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
<description>JAX-WS Reference Implementation Bill-of-Materials (BOM) Extensions</description>

<properties>
<ant.version>1.10.12</ant.version>
<ant.version>1.10.14</ant.version>
<!-- CQ 21208 -->
<asm.version>9.2</asm.version>
<asm.version>9.6</asm.version>
<commonj.sdo.version>2.1.1</commonj.sdo.version>
<eclipselink.version>2.7.11</eclipselink.version>
<eclipselink.version>2.7.13</eclipselink.version>
<javax.persistance.version>2.2.3</javax.persistance.version>
<junit.version>4.13.2</junit.version>
<mail.version>1.6.7</mail.version>
Expand Down
61 changes: 58 additions & 3 deletions jaxws-ri/boms/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<istack.version>3.0.12</istack.version>
<gmbal-api.version>4.0.3</gmbal-api.version>
<ha-api.version>3.1.13</ha-api.version>
<jaxb.version>2.3.8</jaxb.version>
<jaxb.version>2.3.9</jaxb.version>
<jaxws-api.version>2.3.3</jaxws-api.version>
<javax.jws-api.version>2.1.0</javax.jws-api.version>
<management-api.version>3.2.3</management-api.version>
Expand All @@ -46,8 +46,8 @@
<saaj-api.version>1.4.2</saaj-api.version>
<saaj-impl.version>1.5.3</saaj-impl.version>
<streambuffer.version>1.5.10</streambuffer.version>
<woodstox-core.version>6.5.0</woodstox-core.version>
<stax2-api.version>4.2.1</stax2-api.version>
<woodstox-core.version>6.5.1</woodstox-core.version>
<stax2-api.version>4.2.2</stax2-api.version>
<javax.annotation-api.version>1.3.5</javax.annotation-api.version>
<javax.activation.version>1.2.2</javax.activation.version>
</properties>
Expand Down Expand Up @@ -274,4 +274,59 @@
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.1</version>
<configuration>
<allowMajorUpdates>false</allowMajorUpdates>
<ruleSet>
<rules>
<rule>
<!-- 4.2.0+ comes with no SecurityManager support -->
<groupId>com.sun.istack</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>4.[2-9]+.*</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<groupId>com.sun.xml.bind</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>2.[4-9]+.*</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<groupId>org.glassfish.jaxb</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>2.[4-9]+.*</version>
</ignoreVersion>
</ignoreVersions>
</rule>
<rule>
<groupId>org.jvnet.mimepull</groupId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>1.10.*</version>
</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
</ruleSet>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
4 changes: 3 additions & 1 deletion jaxws-ri/boms/bom/update-version-rules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -34,6 +34,7 @@
<ignoreVersions>
<ignoreVersion type="regex">2.2.8-b20.*</ignoreVersion>
<ignoreVersion type="regex">2.2.11-M.*</ignoreVersion>
<ignoreVersion type="regex">2.4.*</ignoreVersion>
</ignoreVersions>
</rule>
<rule groupId="javax.jws" artifactId="jsr181-api" comparisonMethod="maven">
Expand All @@ -45,6 +46,7 @@
<ignoreVersions>
<ignoreVersion type="regex">2.2.8-b20.*</ignoreVersion>
<ignoreVersion type="regex">2.2.11-M.*</ignoreVersion>
<ignoreVersion type="regex">2.4.*</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/bundles/jaxws-ri/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/bundles/jaxws-rt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/bundles/jaxws-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/bundles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/docs/release-documentation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<version>2.0.11</version>
<version>2.0.17</version>
<dependencies>
<dependency>
<groupId>net.sf.docbook</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/docs/samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/docs/www/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/extras/eclipselink_jaxb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down
2 changes: 1 addition & 1 deletion jaxws-ri/extras/eclipselink_sdo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 2023 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down