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

Webservices 4.0.0 m2 #23766

Merged
merged 2 commits into from
Jan 10, 2022
Merged

Webservices 4.0.0 m2 #23766

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
d29faa1
Integrated jakarta.faces-api 4.0.0-M2
arjantijms Jan 10, 2022
7deed7d
Integrate Webservices (Metro) 4.0.0-M2
arjantijms Jan 10, 2022
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
7 changes: 1 addition & 6 deletions appserver/distributions/glassfish/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) 2021 Contributors to Eclipse Foundation.
Copyright (c) 2021, 2022 Contributors to Eclipse Foundation.
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -105,11 +105,6 @@
<zip update="true" basedir="@{basedir}" includes="@{includes}" destfile="@{destfile}" />
</sequential>
</macrodef>

<jarupdate
basedir="${patches}/webservices-osgi" includes="META-INF/MANIFEST.MF"
destfile="${glassfish.modules}/webservices-osgi.jar"
/>

<jarupdate
basedir="${patches}/hibernate-validator" includes="META-INF/MANIFEST.MF"
Expand Down
40 changes: 0 additions & 40 deletions appserver/distributions/glassfish/src/main/patches/webservices-api-osgi/META-INF/MANIFEST.MF
View file
Open in desktop

This file was deleted.

1,745 changes: 0 additions & 1,745 deletions appserver/distributions/glassfish/src/main/patches/webservices-osgi/META-INF/MANIFEST.MF
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions appserver/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) 2021 Contributors to Eclipse Foundation.
Copyright (c) 2021, 2022 Contributors to Eclipse Foundation.
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -90,7 +90,7 @@
<install.dir.name>glassfish7</install.dir.name>

<!-- Jakarta Faces -->
<jakarta.faces-api.version>4.0.0-SNAPSHOT</jakarta.faces-api.version>
<jakarta.faces-api.version>4.0.0-M2</jakarta.faces-api.version>
<mojarra.version>4.0.0-M2</mojarra.version>

<!-- Jakarta WebSocket -->
Expand Down
4 changes: 1 addition & 3 deletions ...services/metro-glue/src/main/java/org/glassfish/webservices/metroglue/MetroContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,7 @@ public String getTxLogLocation() {
.txLogLocation(txlogLocationProvider)
.done();

WSATRuntimeConfig.getInstance();

final WSATRuntimeConfig.RecoveryEventListener metroListener = new WSATRuntimeConfig.WSATRecoveryEventListener();
final WSATRuntimeConfig.RecoveryEventListener metroListener = WSATRuntimeConfig.getInstance().new WSATRecoveryEventListener();
recoveryRegistry.addEventListener(new RecoveryEventListener() {

@Override
Expand Down
4 changes: 2 additions & 2 deletions nucleus/parent/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) 2021 Contributors to the Eclipse Foundation
Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -94,7 +94,7 @@
<hibernate-validator.version>7.0.1.Final</hibernate-validator.version>

<!-- Jakarta Web Services -->
<webservices.version>4.0.0-M1</webservices.version>
<webservices.version>4.0.0-M2</webservices.version>

<!-- Jakarta Inject -->
<jakarta.inject-api.version>2.0.1.MR</jakarta.inject-api.version>
Expand Down
87 changes: 0 additions & 87 deletions snapshots/faces/pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion snapshots/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2021, 2022 Contributors to Eclipse Foundation.
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -35,7 +36,6 @@
<description>Temporary snapshot modules</description>

<modules>
<module>faces</module>
<module>tags</module>
<module>jbatch</module>
</modules>
Expand Down