Start version 5.3
* Move `What's New` into `changes-5.1-5.2.adoc` * Remove version from the `XSD` files: 1. Align with SF 2. The version for XSD doesn't matter for the current jar version, since only the version is available in classpath is from the current jar version 3. Modify `spring.schemas` to map all the possible versions for XSD into the current one in a jar. This way target applications can upgrade without changing the version for XSD location and we don't need to require `versionless` variant any more 4. The jar in classpath can handle only its own XSD, so independently of version or no-version variants we still may fail because the current jar may not support end-user code any more - need some fix over there anyway. * Remove `checkTestConfigs` Gradle task since we don't worry about XSD version any more * Modify `schemaZip` Gradle task to populate XSDs into a distribution still with a version to avoid overriding on-line XSDs for version `1.0.x`. We may consider not do that since SF doesn't and just bite a bullet for always overriding those on-line XSDs to the actual one from the latest release.
This commit is contained in:
Artem Bilan
@@ -1,9 +1,42 @@
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-5.2.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-5.2.xsd
|
||||
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.3.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.3.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.3.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.3.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
https\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core.xsd
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xsd:schema
|
||||
xmlns="http://www.springframework.org/schema/integration/scripting"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
|
||||
xmlns:tool="http://www.springframework.org/schema/tool"
|
||||
xmlns:integration="http://www.springframework.org/schema/integration"
|
||||
elementFormDefault="qualified" attributeFormDefault="unqualified">
|
||||
xmlns="http://www.springframework.org/schema/integration/scripting"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
||||
xmlns:tool="http://www.springframework.org/schema/tool"
|
||||
elementFormDefault="qualified">
|
||||
|
||||
<xsd:import namespace="http://www.springframework.org/schema/tool" />
|
||||
<xsd:import namespace="http://www.springframework.org/schema/tool"/>
|
||||
<xsd:import namespace="http://www.springframework.org/schema/integration"
|
||||
schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" />
|
||||
schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/>
|
||||
|
||||
|
||||
<xsd:complexType name="ScriptType" mixed="true" abstract="true">
|
||||
@@ -26,23 +25,23 @@
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Name of the script variable.
|
||||
</xsd:documentation>
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="value" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Value of the script variable as a literal.
|
||||
</xsd:documentation>
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="ref" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Value of the script variable as a bean reference.
|
||||
</xsd:documentation>
|
||||
</xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:expected-type type="java.lang.Object" />
|
||||
<tool:expected-type type="java.lang.Object"/>
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
@@ -54,7 +53,7 @@
|
||||
<xsd:documentation>
|
||||
Resource location path for the Script. Either this or an inline script
|
||||
as body text should be provided, but not both.
|
||||
</xsd:documentation>
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="script-variable-generator" type="xsd:string">
|
||||
@@ -62,10 +61,10 @@
|
||||
<xsd:documentation>
|
||||
Reference to the ScriptVariableGenerator bean. This attribute is mutually
|
||||
exclusive with any 'variable' sub-elements and 'variables' attribute.
|
||||
</xsd:documentation>
|
||||
</xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:expected-type
|
||||
type="org.springframework.integration.scripting.ScriptVariableGenerator" />
|
||||
type="org.springframework.integration.scripting.ScriptVariableGenerator"/>
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
@@ -75,7 +74,7 @@
|
||||
<xsd:documentation>
|
||||
Refresh delay for the script contents if specified as a resource
|
||||
location (defaults to -1, never refresh).
|
||||
</xsd:documentation>
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="variables">
|
||||
@@ -1,11 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xsd:schema xmlns="http://www.springframework.org/schema/integration/scripting"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
||||
targetNamespace="http://www.springframework.org/schema/integration/scripting"
|
||||
elementFormDefault="qualified" attributeFormDefault="unqualified">
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
||||
targetNamespace="http://www.springframework.org/schema/integration/scripting"
|
||||
elementFormDefault="qualified">
|
||||
|
||||
<xsd:include
|
||||
schemaLocation="https://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-5.2.xsd" />
|
||||
schemaLocation="https://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd"/>
|
||||
|
||||
<xsd:element name="script">
|
||||
<xsd:annotation>
|
||||
@@ -20,20 +20,20 @@
|
||||
<xsd:complexType name="Jsr223Script">
|
||||
<xsd:complexContent>
|
||||
<xsd:extension base="ScriptType">
|
||||
<xsd:attribute name="lang" use="optional">
|
||||
<xsd:attribute name="lang">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
The script language or JSR 223 scripting engine name. Required only for inline scripts.
|
||||
If a script location is referenced, the language may be derived from the file extension
|
||||
(.rb: ruby, .groovy, js: javascript (ECMAScript), .py: python).
|
||||
</xsd:documentation>
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="return" use="optional">
|
||||
<xsd:attribute name="return">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
The script variable to return as a result of the evaluation (Optional).
|
||||
</xsd:documentation>
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
</xsd:extension>
|
||||
Reference in New Issue
Block a user