Resolve conflicts

ballerina-platform · Feb 29, 2024 · 3d0dab5 · 3d0dab5
2 parents 20d85be + c73efeb
commit 3d0dab5
Show file tree

Hide file tree

Showing 525 changed files with 1,894 additions and 884 deletions.
diff --git a/_data/events.json b/_data/events.json
@@ -2,10 +2,10 @@
     "events": [
         {
             "date": "May 7-9, 2024",
-            "day": "Florida, USA",
+            "day": "",
             "time": "",
             "expire": "2024-05-10T00:00:00.0000-00:00",
-            "location": "",
+            "location": "Florida, USA",
             "url": "https://wso2.com/wso2con/2024/",
             "eventType": "WSO2Con 2024",
             "eventName": "It's Time to Go Platformless!",
@@ -32,6 +32,31 @@
             "videoURL": "",
             "buttonText": "More info"
         },
+        {
+            "date": "March 5-7, 2024",
+            "day": "Tue.",
+            "time": "",
+            "expire": "2024-03-08T00:00:00.0000-00:00",
+            "location": "Addis Ababa, Ethiopia",
+            "url": "https://connect.mosip.io/",
+            "eventType": "MOSIP Connect 2024",
+            "eventName": "WebSub as an Enabler: Facilitating Integration",
+            "presenters": [
+                {
+                    "name": "Shafreen Anfar",
+                    "designation": "Associate Director / Architect",
+                    "twitter": "https://twitter.com/shafreen101"
+                },
+                {
+                    "name": "Ayesh Almeida",
+                    "designation": "Associate Technical Lead",
+                    "twitter": "https://twitter.com/Ayesh363"
+                }
+            ],
+            "otherInfo": "",
+            "videoURL": "",
+            "buttonText": "More info"
+        },
         {
             "date": "Feb 20, 2024",
             "day": "Tue.",

diff --git a/_data/swanlake-latest/metadata.json b/_data/swanlake-latest/metadata.json
@@ -1,21 +1,21 @@
 {
-	"version":"2201.8.4",
-	"short-version":"2201.8.4",
-	"display-version":"2201.8.4 (Swan Lake Update 8)",
-	"release-date":"2023-11-29",
-	"windows-installer":"ballerina-2201.8.4-swan-lake-windows-x64.msi",
-	"windows-installer-size":"178mb",
-	"linux-installer":"ballerina-2201.8.4-swan-lake-linux-x64.deb",
-	"linux-installer-size":"200mb",
-	"macos-installer":"ballerina-2201.8.4-swan-lake-macos-x64.pkg",
-	"macos-installer-size":"236mb",
-	"macos-arm-installer":"ballerina-2201.8.4-swan-lake-macos-arm-x64.pkg",
-	"macos-arm-installer-size":"235mb",
-	"rpm-installer":"ballerina-2201.8.4-swan-lake-linux-x64.rpm",
-	"rpm-installer-size":"238mb",
-	"other-artefacts":[  
-		"ballerina-2201.8.4-swan-lake.zip"
- 	],
-	"api-docs":"ballerina-api-docs-2201.8.4.zip",
-	"release-notes":"ballerina-release-notes-2201.8.4.md"
+	"version": "2201.8.5",
+	"short-version": "2201.8.5",
+	"display-version": "2201.8.5 (Swan Lake Update 8)",
+	"release-date": "2024-02-23",
+	"windows-installer": "ballerina-2201.8.5-swan-lake-windows-x64.msi",
+	"windows-installer-size": "179mb",
+	"linux-installer": "ballerina-2201.8.5-swan-lake-linux-x64.deb",
+	"linux-installer-size": "200mb",
+	"macos-installer": "ballerina-2201.8.5-swan-lake-macos-x64.pkg",
+	"macos-installer-size": "236mb",
+	"macos-arm-installer": "ballerina-2201.8.5-swan-lake-macos-arm-x64.pkg",
+	"macos-arm-installer-size": "236mb",
+	"rpm-installer": "ballerina-2201.8.5-swan-lake-linux-x64.rpm",
+	"rpm-installer-size": "238mb",
+	"other-artefacts": [
+		"ballerina-2201.8.5-swan-lake.zip"
+	],
+	"api-docs": "ballerina-api-docs-2201.8.5.zip",
+	"release-notes": "ballerina-release-notes-2201.8.5.md"
 }
diff --git a/_data/swanlake_release_notes_versions.json b/_data/swanlake_release_notes_versions.json
@@ -1219,5 +1219,26 @@
  	],
 	"api-docs":"ballerina-api-docs-2201.8.3.zip",
 	"release-notes":"ballerina-release-notes-2201.8.3.md"
+},
+{
+   "version":"2201.8.4",
+   "short-version":"2201.8.4",
+   "display-version":"2201.8.4 (Swan Lake Update 8)",
+   "release-date":"2023-11-29",
+   "windows-installer":"ballerina-2201.8.4-swan-lake-windows-x64.msi",
+   "windows-installer-size":"178mb",
+   "linux-installer":"ballerina-2201.8.4-swan-lake-linux-x64.deb",
+   "linux-installer-size":"200mb",
+   "macos-installer":"ballerina-2201.8.4-swan-lake-macos-x64.pkg",
+   "macos-installer-size":"236mb",
+   "macos-arm-installer":"ballerina-2201.8.4-swan-lake-macos-arm-x64.pkg",
+   "macos-arm-installer-size":"235mb",
+   "rpm-installer":"ballerina-2201.8.4-swan-lake-linux-x64.rpm",
+   "rpm-installer-size":"238mb",
+   "other-artefacts":[
+      "ballerina-2201.8.4-swan-lake.zip"
+   ],
+   "api-docs":"ballerina-api-docs-2201.8.4.zip",
+   "release-notes":"ballerina-release-notes-2201.8.4.md"
 }
 ]
diff --git a/community/newsletter/2024-1.md b/community/newsletter/2024-1.md
diff --git a/components/common/upcoming-events/UpcomingEvents.js b/components/common/upcoming-events/UpcomingEvents.js
@@ -60,11 +60,11 @@ export default function UpcomingEvents() {
                 <Col sm={12} md={2} className={styles.eventDateContainer}>
                   <p className={`${styles.eventDate} ${styles.eventDateNum}`}>{item.date}</p>
                   {
-                    item.day && item.time ? 
-                      <p className={styles.eventDate}>{item.day}, {item.time}</p> 
-                    : item.day && !item.time ?
+                    item.day && item.time ?
+                      <p className={styles.eventDate}>{item.day}, {item.time}</p>
+                      : item.day && !item.time ?
                         <p className={styles.eventDate}>{item.day}</p>
-                      : null
+                        : null
                   }
                   <p className="eventLocation">{item.location}</p>
                 </Col>
@@ -74,8 +74,29 @@ export default function UpcomingEvents() {
                   </a>
                   <h5>{item.eventName}</h5>
                   {
-                    (item.presenter !== '') ?
-                      <><a target="_blank" rel="noreferrer" href={item.presenterTwitter}>{item.presenter}</a>{item.presenterDesignation ? <>, {item.presenterDesignation}</>: null }</>
+                    item.presenters && item.presenters.length > 0 ?
+                      <>
+                        {
+                          item.presenters.map((presenter, index) => {
+                            return (
+                              <React.Fragment key={index}>
+                                <a target="_blank" rel="noreferrer" href={presenter.twitter}>{presenter.name}</a>{presenter.designation ? <> - {presenter.designation}</> : null}
+                                {
+                                  index + 1 < item.presenters.length ?
+                                    <>, </>
+                                    : null
+                                }
+                              </React.Fragment>
+                            )
+                          }
+                          )
+                        }
+                      </>
+                      : null
+                  }
+                  {
+                    (item.presenter && item.presenter !== '') ?
+                      <><a target="_blank" rel="noreferrer" href={item.presenterTwitter}>{item.presenter}</a>{item.presenterDesignation ? <>, {item.presenterDesignation}</> : null}</>
                       : <>{item.otherInfo}</>
                   }
                 </Col>

diff --git a/components/community/events/past-events/PastEvents.js b/components/community/events/past-events/PastEvents.js
@@ -52,7 +52,7 @@ export default function PastEvents() {
       {
         pastEvents.map((item, index) => {
 
-          const eventDate = new Date(item.expire);
+          let eventDate = new Date(item.expire);
           // Deduct 1 day
           eventDate.setDate(eventDate.getDate() - 1);
 
@@ -69,10 +69,31 @@ export default function PastEvents() {
                 </a>
                 <h5>{item.eventName}</h5>
                 {
-                  (item.presenter !== '') ?
-                    <><a target="_blank" rel="noreferrer" href={item.presenterTwitter}>{item.presenter}</a>{item.presenterDesignation ? <>, {item.presenterDesignation}</>: null }</>
-                    : <>{item.otherInfo}</>
-                }
+                    item.presenters && item.presenters.length > 0 ?
+                      <>
+                        {
+                          item.presenters.map((presenter, index) => {
+                            return (
+                              <React.Fragment key={index}>
+                                <a target="_blank" rel="noreferrer" href={presenter.twitter}>{presenter.name}</a>{presenter.designation ? <> - {presenter.designation}</> : null}
+                                {
+                                  index + 1 < item.presenters.length ?
+                                    <>, </>
+                                    : null
+                                }
+                              </React.Fragment>
+                            )
+                          }
+                          )
+                        }
+                      </>
+                      : null
+                  }
+                  {
+                    (item.presenter && item.presenter !== '') ?
+                      <><a target="_blank" rel="noreferrer" href={item.presenterTwitter}>{item.presenter}</a>{item.presenterDesignation ? <>, {item.presenterDesignation}</> : null}</>
+                      : <>{item.otherInfo}</>
+                  }
               </Col>
               <Col sm={12} md={3} className={styles.eventURL}>
                 <a className={styles.eventRegistration} href={(item.videoURL !== '') ? item.videoURL : item.url} target="_blank" rel="noreferrer">{item.buttonText}</a>

diff --git a/components/community/join-us/JoinUs.js b/components/community/join-us/JoinUs.js
@@ -88,7 +88,7 @@ export default function JoinUs(props) {
                     <Card.Body>
                       <Card.Text className='text-center mt-3'>
                         <div className={styles.join} title="Stackoverflow">
-                          Get your questions answered
+                          Ask, answer, and learn
                         </div>
                       </Card.Text>
                     </Card.Body>

diff --git a/downloads/swan-lake-release-notes/swan-lake-2201.8.5/RELEASE_NOTE.md b/downloads/swan-lake-release-notes/swan-lake-2201.8.5/RELEASE_NOTE.md
@@ -0,0 +1,44 @@
+---
+layout: ballerina-left-nav-release-notes
+title: Swan Lake Update 8 (2201.8.5) 
+permalink: /downloads/swan-lake-release-notes/2201.8.5/
+active: 2201.8.5
+---
+
+## Overview of Ballerina Swan Lake Update 8 (2201.8.5)
+
+<em>Swan Lake Update 8 (2201.8.5) is the fifth patch release of Ballerina 2201.8.0 (Swan Lake Update 8) and it includes a new set of bug fixes to the runtime and developer tooling.</em>
+
+## Update Ballerina
+
+Run the command below to update your current Ballerina installation directly to 2201.8.5 by using the [Ballerina Update Tool](/learn/update-tool/) as follows.
+
+```
+$ bal dist pull 2201.8.5
+```
+
+## Install Ballerina
+
+If you have not installed Ballerina, download the [installers](/downloads/#swanlake) to install.
+
+## Ballerina library updates
+
+### New features
+
+#### `graphql` package
+
+- Added support for generating compile time schema for default parameters.
+- Added support for generating GraphQL schema for local service variable declaration.
+- Added support for GraphQL server-side caching.
+
+### Bug fixes
+
+To view bug fixes, see the [GitHub milestone for 2201.8.5 (Swan Lake)](https://github.com/ballerina-platform/ballerina-library/issues?q=is%3Aissue+label%3AType%2FBug+is%3Aclosed+milestone%3A2201.8.5).
+
+## Developer tools updates
+
+### Bug fixes
+
+To view bug fixes, see the GitHub milestone for 2201.8.5 (Swan Lake) of the repositories below.
+
+- [OpenAPI](https://github.com/ballerina-platform/ballerina-library/issues?q=label%3Amodule%2Fopenapi-tools+milestone%3A2201.8.5+is%3Aclosed)
diff --git a/pages/_document.js b/pages/_document.js
@@ -27,8 +27,8 @@ export default function Document() {
         <meta charSet="utf-8" />
         <meta name="author" content="WSO2 LLC"/>
 
-        <meta HTTP-EQUIV='X-Frame-Options' CONTENT="SAMEORIGIN"/>
-        <meta HTTP-EQUIV='Content-Security-Policy' CONTENT="frame-ancestors 'none';"/>
+        <meta httpEquiv='X-Frame-Options' content="SAMEORIGIN"/>
+        <meta httpEquiv='Content-Security-Policy' content="frame-ancestors 'none';"/>
 
         <link rel="shortcut icon" href={`${prefix}/images/favicon.ico`}></link>
 

diff --git a/pages/community/index.js b/pages/community/index.js
@@ -91,7 +91,7 @@ export default function Community() {
                   <Col xs={12} md={12} lg={6}>
                     <h1>Community</h1>
                     <p style={{ fontSize: "24px", fontWeight: "400", color: "#20b6b0", marginTop: "40px" }}>Welcome to the Ballerina community! Use the below channels to ask questions, find answers, post feedback, and help establish Ballerina as a truly community-owned resource.</p>
-                    <a href="#join-with-us" className="join">
+                    <a href="#join-us" className="join">
                     Join our community
                     </a>
                   </Col>