From 091e7bb8913d1b2bfda707fcde20adda0d70b98f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Tue, 4 May 2021 13:19:04 +0200
Subject: [PATCH] Remove duplicate copy of flight.xsd

See 85eb589c2ed03dd22af1259e5b0161ea70f47488
See gh-25787
---
 .../oxm/jaxb/Jaxb2UnmarshallerTests.java      |  5 +++--
 .../org/springframework/oxm/flight.xsd        | 20 -------------------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 spring-oxm/src/test/resources/org/springframework/oxm/flight.xsd

diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
index 0fd9e35fd5..4a4b9c9998 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2UnmarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ import javax.xml.transform.stream.StreamSource;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.oxm.AbstractUnmarshallerTests;
 import org.springframework.oxm.jaxb.test.FlightType;
@@ -56,7 +57,7 @@ public class Jaxb2UnmarshallerTests extends AbstractUnmarshallerTests<Jaxb2Marsh
 	protected Jaxb2Marshaller createUnmarshaller() throws Exception {
 		Jaxb2Marshaller unmarshaller = new Jaxb2Marshaller();
 		unmarshaller.setContextPath("org.springframework.oxm.jaxb.test");
-		unmarshaller.setSchema(new ClassPathResource("org/springframework/oxm/flight.xsd"));
+		unmarshaller.setSchema(new FileSystemResource("src/test/schema/flight.xsd"));
 		unmarshaller.afterPropertiesSet();
 		return unmarshaller;
 	}
diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/flight.xsd b/spring-oxm/src/test/resources/org/springframework/oxm/flight.xsd
deleted file mode 100644
index 5f46e0b91a..0000000000
--- a/spring-oxm/src/test/resources/org/springframework/oxm/flight.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-        targetNamespace="http://samples.springframework.org/flight"
-        xmlns:tns="http://samples.springframework.org/flight">
-    <element name="flights">
-        <complexType>
-            <sequence>
-                <element name="flight" type="tns:flightType"
-                         maxOccurs="unbounded">
-                </element>
-            </sequence>
-        </complexType>
-    </element>
-    <element name="flight" type="tns:flightType"/>
-    <complexType name="flightType">
-        <sequence>
-            <element name="number" type="long"/>
-        </sequence>
-    </complexType>
-</schema>