(cayenne) branch master updated: CAY-2827 Saved data-source XML data doesn't correspond to the XSD schema

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 78aa381ed CAY-2827 Saved data-source XML data doesn't correspond to 
the XSD schema
78aa381ed is described below

commit 78aa381ed60bc137c55a9088af59f81c0cdd8ca5
Author: stariy95 <stari...@gmail.com>
AuthorDate: Fri Nov 24 13:25:31 2023 +0400

    CAY-2827 Saved data-source XML data doesn't correspond to the XSD schema
---
 RELEASE-NOTES.txt                                                   | 3 ++-
 .../java/org/apache/cayenne/configuration/DataSourceDescriptor.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 5888b27b8..4835f910f 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -70,4 +70,5 @@ CAY-2806 Incorrect processing of unicode escape syntax in JSON
 CAY-2809 Cayenne Expression grammar doesn't allow custom function as an 
argument for string functions
 CAY-2810 Can't use custom operator expression with aggregate functions
 CAY-2813 Regression: Constants.CI_PROPERTY flag is no longer working for MySQL
-CAY-2815 Incorrect translation of aliased expression
\ No newline at end of file
+CAY-2815 Incorrect translation of aliased expression
+CAY-2827 Saved data-source XML data doesn't correspond to the XSD schema
\ No newline at end of file
diff --git 
a/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
 
b/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
index 94f3db244..e72ccd6e5 100644
--- 
a/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
+++ 
b/cayenne/src/main/java/org/apache/cayenne/configuration/DataSourceDescriptor.java
@@ -110,12 +110,12 @@ public class DataSourceDescriptor implements 
Serializable, XMLSerializable {
         encoder.start("data-source")
                 .start("driver").attribute("value", jdbcDriver).end()
                 .start("url").attribute("value", dataSourceUrl).end()
-                .start("login")
-                    .attribute("userName", userName)
-                    .attribute("password", password).end()
                 .start("connectionPool")
                     .attribute("min", minConnections)
                     .attribute("max", maxConnections).end()
+                .start("login")
+                    .attribute("userName", userName)
+                    .attribute("password", password).end()
                 .end();
     }