Merge branch 'apache:dev' into Fix-17436

Author: njnu-seafish

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -102,6 +102,7 @@ body:
         - 3.1.x
         - 3.2.x
         - 3.3.0-alpha
+        - 3.3.1
     validations:
       required: true
 

docs/configs/docsdev.js

@@ -80,10 +80,6 @@ export default {
                                 title: 'Task Instance',
                                 link: '/en-us/docs/dev/user_doc/guide/project/task-instance.html',
                             },
-                            {
-                                title: 'Task Definition',
-                                link: '/zh-cn/docs/dev/user_doc/guide/project/task-definition.html',
-                            },
                         ]
                     },
                     {
@@ -225,10 +221,6 @@ export default {
                                 title: 'Remote Shell',
                                 link: '/en-us/docs/dev/user_doc/guide/task/remoteshell.html',
                             },
-                            {
-                                title: 'DolphinDB',
-                                link: '/en-us/docs/dev/user_doc/guide/datasource/dolphindb.html',
-                            },
                         ],
                     },
                     {
@@ -362,7 +354,11 @@ export default {
                             {
                                 title: 'Vertica',
                                 link: '/en-us/docs/dev/user_doc/guide/datasource/vertica.html',
-                            }
+                            },
+                            {
+                                title: 'DolphinDB',
+                                link: '/en-us/docs/dev/user_doc/guide/datasource/dolphindb.html',
+                            },
                         ],
                     },
                     {
@@ -799,10 +795,6 @@ export default {
                                 title: '任务实例',
                                 link: '/zh-cn/docs/dev/user_doc/guide/project/task-instance.html',
                             },
-                            {
-                                title: '任务定义',
-                                link: '/zh-cn/docs/dev/user_doc/guide/project/task-definition.html',
-                            },
                         ]
                     },
                     {
@@ -944,10 +936,6 @@ export default {
                                 title: 'Remote Shell',
                                 link: '/zh-cn/docs/dev/user_doc/guide/task/remoteshell.html',
                             },
-                            {
-                                title: 'DolphinDB',
-                                link: '/zh-cn/docs/dev/user_doc/guide/datasource/dolphindb.html',
-                            },
                         ],
                     },
                     {
@@ -1066,6 +1054,10 @@ export default {
                                 title: 'Vertica',
                                 link: '/zh-cn/docs/dev/user_doc/guide/datasource/vertica.html',
                             },
+                            {
+                                title: 'DolphinDB',
+                                link: '/zh-cn/docs/dev/user_doc/guide/datasource/dolphindb.html',
+                            },
                         ],
                     },
                     {

docs/configs/index.md.jsx

@@ -65,6 +65,7 @@ import docs320Config from '../../../site_config/docs3-2-0';
 import docs321Config from '../../../site_config/docs3-2-1';
 import docs322Config from '../../../site_config/docs3-2-2';
 import docs330Config from '../../../site_config/docs3-3-0-alpha';
+import docs331Config from '../../../site_config/docs3-3-1';
 import docsDevConfig from '../../../site_config/docsdev';
 
 const docsSource = {
@@ -106,6 +107,7 @@ const docsSource = {
   '3.2.1': docs321Config,
   '3.2.2': docs322Config,
   '3.3.0-alpha': docs330Config,
+  '3.3.1': docs331Config,
   dev: docsDevConfig,
 };
 

docs/configs/site.js

@@ -24,7 +24,7 @@ export default {
   port: 8080,
   domain: 'dolphinscheduler.apache.org',
   copyToDist: ['asset', 'img', 'file', '.asf.yaml', 'sitemap.xml', '.nojekyll', '.htaccess', 'googled0df7b96f277a143.html'],
-  docsLatest: '3.3.0-alpha',
+  docsLatest: '3.3.1',
   defaultSearch: 'google', // default search engine
   defaultLanguage: 'en-us',
   'en-us': {
@@ -45,7 +45,7 @@ export default {
         children: [
           {
             key: 'docs0',
-            text: 'latest(3.3.0-alpha)',
+            text: 'latest(3.3.1)',
             link: '/en-us/docs/latest/user_doc/about/introduction.html',
           },
           {
@@ -173,7 +173,7 @@ export default {
         children: [
           {
             key: 'docs0',
-            text: '最新版本latest(3.3.0-alpha)',
+            text: '最新版本latest(3.3.1)',
             link: '/zh-cn/docs/latest/user_doc/about/introduction.html',
           },
           {

docs/docs/en/history-versions.md

@@ -4,6 +4,10 @@
 
 #### Setup instructions,  are available for each stable version of Apache DolphinScheduler below:
 
+### Versions: 3.3.1
+
+#### Links： [3.3.1 Document](../3.3.1/user_doc/about/introduction.md)
+
 ### Versions: 3.3.0-alpha
 
 #### Links： [3.3.0-alpha Document](../3.3.0-alpha/user_doc/about/introduction.md)

docs/docs/zh/history-versions.md

@@ -4,6 +4,10 @@
 
 #### 以下是Apache DolphinScheduler每个稳定版本的设置说明。
 
+### Versions: 3.3.1
+
+#### Links： [3.3.1 Document](../3.3.1/user_doc/about/introduction.md)
+
 ### Versions: 3.3.0-alpha
 
 #### Links： [3.3.0-alpha Document](../3.3.0-alpha/user_doc/about/introduction.md)

dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/resources/docker/ldap-login/docker-compose.yaml

@@ -37,7 +37,7 @@ services:
       - openldap
   openldap:
     hostname: openldap
-    image: bitnami/openldap:2.6
+    image: bitnamilegacy/openldap:2.6.10-debian-12-r4
     ports:
       - '1389:1389'
       - '1636:1636'