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

Upgrade XStream from 1.4.19 to 1.4.20 #7548

Merged
merged 2 commits into from
Dec 27, 2022
Merged

Upgrade XStream from 1.4.19 to 1.4.20 #7548

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
cf51cf7
Bump xstream from 1.4.19 to 1.4.20
dependabot[bot] Dec 26, 2022
cecea15
Revert "Unable to serialize `AtomicBoolean` on Java 17 (#7270)"
basil Dec 26, 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
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ THE SOFTWARE.
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.19</version>
<version>1.4.20</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/hudson/util/XStream2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
import java.util.logging.Logger;
import jenkins.model.Jenkins;
import jenkins.util.SystemProperties;
import jenkins.util.xstream.AtomicBooleanConverter;
import jenkins.util.xstream.SafeURLConverter;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
Expand Down Expand Up @@ -274,7 +273,6 @@ private void init() {
// http://www.openwall.com/lists/oss-security/2017/04/03/4
denyTypes(new Class[] { void.class, Void.class });

registerConverter(new AtomicBooleanConverter(), 10);
registerConverter(new RobustCollectionConverter(getMapper(), getReflectionProvider()), 10);
registerConverter(new RobustMapConverter(getMapper()), 10);
registerConverter(new ImmutableMapConverter(getMapper(), getReflectionProvider()), 10);
Expand Down
45 changes: 0 additions & 45 deletions core/src/main/java/jenkins/util/xstream/AtomicBooleanConverter.java
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions core/src/test/java/jenkins/util/xstream/AtomicBooleanFieldsTest.java
View file
Open in desktop

This file was deleted.