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:
@@ -1,4 +1,24 @@
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail-5.2.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-3.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.3.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
http\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-2.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-3.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-4.3.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.0.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.1.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail-5.2.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
https\://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd=org/springframework/integration/mail/config/spring-integration-mail.xsd
|
||||
|
||||
@@ -1,17 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xsd:schema xmlns="http://www.springframework.org/schema/integration/mail"
|
||||
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"
|
||||
targetNamespace="http://www.springframework.org/schema/integration/mail"
|
||||
elementFormDefault="qualified"
|
||||
attributeFormDefault="unqualified">
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
||||
xmlns:tool="http://www.springframework.org/schema/tool"
|
||||
xmlns:integration="http://www.springframework.org/schema/integration"
|
||||
targetNamespace="http://www.springframework.org/schema/integration/mail"
|
||||
elementFormDefault="qualified">
|
||||
|
||||
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
|
||||
<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:annotation>
|
||||
<xsd:documentation><![CDATA[
|
||||
@@ -30,7 +28,8 @@
|
||||
</xsd:annotation>
|
||||
<xsd:choice minOccurs="0" maxOccurs="2">
|
||||
<xsd:element ref="integration:poller" minOccurs="0"/>
|
||||
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0"/>
|
||||
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
|
||||
minOccurs="0"/>
|
||||
</xsd:choice>
|
||||
<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
|
||||
<xsd:attribute name="mail-sender" type="xsd:string">
|
||||
@@ -93,15 +92,19 @@
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type
|
||||
type="org.springframework.integration.mail.SearchTermStrategy" />
|
||||
type="org.springframework.integration.mail.SearchTermStrategy"/>
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
<xsd:documentation>
|
||||
Reference to a custom implementation of org.springframework.integration.mail.SearchTermStrategy
|
||||
Reference to a custom implementation of
|
||||
org.springframework.integration.mail.SearchTermStrategy
|
||||
to use when retrieving email. Only permitted with 'imap' protocol or an 'imap' uri.
|
||||
By default, the ImapMailReceiver will search for Messages based on the default SearchTerm
|
||||
which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT DELETED, that are NOT SEEN and have not
|
||||
been processed by this mail receiver (enabled by the use of the custom USER flag or simply NOT FLAGGED if not supported)".
|
||||
By default, the ImapMailReceiver will search for Messages based on the default
|
||||
SearchTerm
|
||||
which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT
|
||||
DELETED, that are NOT SEEN and have not
|
||||
been processed by this mail receiver (enabled by the use of the custom USER flag or
|
||||
simply NOT FLAGGED if not supported)".
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
@@ -121,15 +124,16 @@
|
||||
<xsd:complexType>
|
||||
<xsd:complexContent>
|
||||
<xsd:extension base="inboundMailAdapterType">
|
||||
<xsd:choice minOccurs="0" maxOccurs="2">
|
||||
<xsd:element name="transactional" type="integration:transactionalType" minOccurs="0" maxOccurs="1" />
|
||||
</xsd:choice>
|
||||
<xsd:choice minOccurs="0" maxOccurs="2">
|
||||
<xsd:element name="transactional" type="integration:transactionalType" minOccurs="0"
|
||||
maxOccurs="1"/>
|
||||
</xsd:choice>
|
||||
<xsd:attribute name="error-channel" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type
|
||||
type="org.springframework.messaging.MessageChannel" />
|
||||
type="org.springframework.messaging.MessageChannel"/>
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
<xsd:documentation>
|
||||
@@ -144,15 +148,19 @@
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type
|
||||
type="org.springframework.integration.mail.SearchTermStrategy" />
|
||||
type="org.springframework.integration.mail.SearchTermStrategy"/>
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
<xsd:documentation>
|
||||
Reference to a custom implementation of org.springframework.integration.mail.SearchTermStrategy
|
||||
Reference to a custom implementation of
|
||||
org.springframework.integration.mail.SearchTermStrategy
|
||||
to use when retrieving email.
|
||||
By default, the ImapMailReceiver will search for Messages based on the default SearchTerm
|
||||
which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT DELETED, that are NOT SEEN and have not
|
||||
been processed by this mail receiver (enabled by the use of the custom USER flag or simply NOT FLAGGED if not supported)".
|
||||
By default, the ImapMailReceiver will search for Messages based on the default
|
||||
SearchTerm
|
||||
which is "All mails that are RECENT (if supported), that are NOT ANSWERED, that are NOT
|
||||
DELETED, that are NOT SEEN and have not
|
||||
been processed by this mail receiver (enabled by the use of the custom USER flag or
|
||||
simply NOT FLAGGED if not supported)".
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
@@ -166,7 +174,7 @@
|
||||
]]></xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type type="org.springframework.core.task.TaskExecutor" />
|
||||
<tool:expected-type type="org.springframework.core.task.TaskExecutor"/>
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
@@ -205,8 +213,8 @@
|
||||
<xsd:attribute name="session" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Specify the javax.mail.Session reference.
|
||||
NOTE: if this is provided, then 'java-mail-properties' should not be.
|
||||
Specify the javax.mail.Session reference.
|
||||
NOTE: if this is provided, then 'java-mail-properties' should not be.
|
||||
</xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
@@ -218,8 +226,8 @@
|
||||
<xsd:attribute name="java-mail-properties" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Reference to a 'java.util.Properties' instance with settings for the JavaMail Session.
|
||||
NOTE: if this is provided, then 'session' should not be.
|
||||
Reference to a 'java.util.Properties' instance with settings for the JavaMail Session.
|
||||
NOTE: if this is provided, then 'session' should not be.
|
||||
</xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
@@ -231,8 +239,8 @@
|
||||
<xsd:attribute name="authenticator" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Specify the javax.mail.Authenticator.
|
||||
NOTE: if this is provided, then 'session' should not be.
|
||||
Specify the javax.mail.Authenticator.
|
||||
NOTE: if this is provided, then 'session' should not be.
|
||||
</xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
@@ -280,20 +288,20 @@
|
||||
<xsd:attribute name="simple-content">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
When 'true', messages produced by the source will be rendered by 'MimeMessage.getContent()'
|
||||
which is usually just the body for a simple text email. When false (default) the content
|
||||
is rendered by the 'getContent()' method on the actual message returned by the underlying
|
||||
javamail implementation.
|
||||
For example, an IMAP message is rendered with some message headers.
|
||||
This attribute is provided so that users can enable the previous behavior, which just
|
||||
rendered the body.
|
||||
When 'true', messages produced by the source will be rendered by 'MimeMessage.getContent()'
|
||||
which is usually just the body for a simple text email. When false (default) the content
|
||||
is rendered by the 'getContent()' method on the actual message returned by the underlying
|
||||
javamail implementation.
|
||||
For example, an IMAP message is rendered with some message headers.
|
||||
This attribute is provided so that users can enable the previous behavior, which just
|
||||
rendered the body.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:simpleType>
|
||||
<xsd:union memberTypes="xsd:boolean xsd:string"/>
|
||||
</xsd:simpleType>
|
||||
</xsd:attribute>
|
||||
<xsd:attributeGroup ref="inboundMappingGroup" />
|
||||
<xsd:attributeGroup ref="inboundMappingGroup"/>
|
||||
</xsd:complexType>
|
||||
|
||||
<xsd:element name="mail-to-string-transformer">
|
||||
@@ -340,9 +348,12 @@
|
||||
<xsd:attribute name="default-overwrite">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Specify the default boolean value for whether to overwrite existing header values. This will only take effect for
|
||||
sub-elements that do not provide their own 'overwrite' attribute. If the 'default-overwrite' attribute is not
|
||||
provided, then the specified header values will NOT overwrite any existing ones with the same header names.
|
||||
Specify the default boolean value for whether to overwrite existing header values. This
|
||||
will only take effect for
|
||||
sub-elements that do not provide their own 'overwrite' attribute. If the
|
||||
'default-overwrite' attribute is not
|
||||
provided, then the specified header values will NOT overwrite any existing ones with the
|
||||
same header names.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:simpleType>
|
||||
@@ -355,13 +366,14 @@
|
||||
</xsd:element>
|
||||
|
||||
<xsd:complexType name="headerType">
|
||||
<xsd:attribute name="value" type="xsd:string" />
|
||||
<xsd:attribute name="ref" type="xsd:string" />
|
||||
<xsd:attribute name="expression" type="xsd:string" />
|
||||
<xsd:attribute name="value" type="xsd:string"/>
|
||||
<xsd:attribute name="ref" type="xsd:string"/>
|
||||
<xsd:attribute name="expression" type="xsd:string"/>
|
||||
<xsd:attribute name="overwrite">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Boolean value to indicate whether this header value should overwrite an existing header value for the same name.
|
||||
Boolean value to indicate whether this header value should overwrite an existing header value for
|
||||
the same name.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:simpleType>
|
||||
@@ -405,7 +417,7 @@
|
||||
]]></xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper" />
|
||||
<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper"/>
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
@@ -413,11 +425,11 @@
|
||||
<xsd:attribute name="embedded-parts-as-bytes">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
When a 'header-mapper' is provided, and the 'MimeMessage' has embedded 'Part' (e.g. 'Message' or
|
||||
'Multipart') contents, the message payload will be a byte[] containing the raw data. Set this
|
||||
boolean to 'false' for the payload to be a decoded 'Part' object. Note that 'Part's are not
|
||||
'Serializable', nor are they suitable for serialization using other technologies such as Kryo.
|
||||
Default 'true' (payload is 'byte[]').
|
||||
When a 'header-mapper' is provided, and the 'MimeMessage' has embedded 'Part' (e.g. 'Message' or
|
||||
'Multipart') contents, the message payload will be a byte[] containing the raw data. Set this
|
||||
boolean to 'false' for the payload to be a decoded 'Part' object. Note that 'Part's are not
|
||||
'Serializable', nor are they suitable for serialization using other technologies such as Kryo.
|
||||
Default 'true' (payload is 'byte[]').
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:simpleType>
|
||||
Reference in New Issue
Block a user