diff --git a/.hugo_build.lock b/.hugo_build.lock
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Jenkinsfile b/Jenkinsfile
index c46a4b77434d6941205b369fc57c6287091ac553..ab1e15212bfa9b489879b6ea81c7bad693293f05 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,10 +3,12 @@
hugo (
appName: 'www.eclipse.org',
productionDomain: 'www.eclipse.org',
+ branchDomain: "eclipse.org",
+ previewBranchesRegex: "staging",
build: [
containerImage: 'eclipsefdn/hugo-node:h0.110.0-n18.13.0',
],
deployment: [
nginxServerConf: 'config/nginx/default.conf'
]
-)
+)
\ No newline at end of file
diff --git a/config.toml b/config.toml
index 1129254ba713abf153e98b669bb071e47b854ef8..2cf129c85531f5871e52b94dc70d6dc858cdee6d 100644
--- a/config.toml
+++ b/config.toml
@@ -177,6 +177,42 @@ pluralizeListTitles = false
parent = "collaborations"
name = "Interest Group Process"
url = "/org/collaborations/interest-groups/process.php"
+
+[[menu.sidebar]]
+ identifier = "security"
+ name = "Security"
+ url = "/security"
+ weight = 1
+
+[[menu.sidebar]]
+ parent = "security"
+ name = "Known Vulnerabilities"
+ url = "/security/known"
+ weight = 1
+
+[[menu.sidebar]]
+ identifier = "security"
+ name = "Security"
+ url = "/security"
+ weight = 1
+
+[[menu.sidebar]]
+ parent = "security"
+ name = "Mail the Security Team"
+ url = "mailto:security@eclipse-foundation.org"
+ pre = "<i class=\"fa fa-caret-right fa-fw\"></i>"
weight = 1
-
+[[menu.sidebar]]
+ parent = "security"
+ name = "Team Members"
+ url = "/security/team"
+ pre = "<i class=\"fa fa-caret-right fa-fw\"></i>"
+ weight = 2
+
+[[menu.sidebar]]
+ parent = "security"
+ name = "Policy"
+ url = "/security/policy"
+ pre = "<i class=\"fa fa-caret-right fa-fw\"></i>"
+ weight = 3
diff --git a/config/nginx/default.conf b/config/nginx/default.conf
index 2055c8f24a31417cfa7fa9927d6bfa57b991dce3..186fdcbf9648a0686c025d41d9f7beee3055235f 100644
--- a/config/nginx/default.conf
+++ b/config/nginx/default.conf
@@ -56,7 +56,7 @@ server {
# https://git.eclipse.org/c/www.eclipse.org/getting_started.git/tree/
rewrite /getting_started /getting-started redirect;
rewrite /getting_started/index.php /getting-started redirect;
-
+
# www.eclipse.org/documentation
# https://git.eclipse.org/c/www.eclipse.org/documentation.git/tree/
rewrite /documentation/index.php /documentation redirect;
@@ -79,10 +79,21 @@ server {
rewrite /contribute/dev_program/faq.php /contribute/dev-program/faq redirect;
rewrite /contribute/cla https://accounts.eclipse.org/user/eca redirect;
rewrite /contribute/cla/index.php https://accounts.eclipse.org/user/eca redirect;
+
+ # www.eclipseide.org/getting-started
+ # www.eclipse.org/getting-started
+ rewrite /getting-started https://eclipseide.org/getting-started redirect;
# www.eclipse.org/openchain
rewrite /projects/openchain /openchain redirect;
+ # www.eclipse.org/security
+ # https://git.eclipse.org/c/www.eclipse.org/security.git/tree/
+ rewrite /security/index.php /security/ redirect;
+ rewrite /security/known.php /security/known/ redirect;
+ rewrite /security/policy.php /security/policy/ redirect;
+ rewrite /security/policy_2011.php /security/policy/ redirect;
+
root /usr/share/nginx/html/;
index index.html index.htm;
}
@@ -95,4 +106,4 @@ server {
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
-}
\ No newline at end of file
+}
diff --git a/static/images/collaborations/icons/collaboration.png b/content/collaborations/images/icons/collaboration.png
similarity index 100%
rename from static/images/collaborations/icons/collaboration.png
rename to content/collaborations/images/icons/collaboration.png
diff --git a/static/images/collaborations/icons/compatibility.png b/content/collaborations/images/icons/compatibility.png
similarity index 100%
rename from static/images/collaborations/icons/compatibility.png
rename to content/collaborations/images/icons/compatibility.png
diff --git a/static/images/collaborations/icons/ecosystem.png b/content/collaborations/images/icons/ecosystem.png
similarity index 100%
rename from static/images/collaborations/icons/ecosystem.png
rename to content/collaborations/images/icons/ecosystem.png
diff --git a/static/images/collaborations/icons/icon-bg.png b/content/collaborations/images/icons/icon-bg.png
similarity index 100%
rename from static/images/collaborations/icons/icon-bg.png
rename to content/collaborations/images/icons/icon-bg.png
diff --git a/static/images/collaborations/icons/specification.png b/content/collaborations/images/icons/specification.png
similarity index 100%
rename from static/images/collaborations/icons/specification.png
rename to content/collaborations/images/icons/specification.png
diff --git a/static/images/collaborations/icons/vendor.png b/content/collaborations/images/icons/vendor.png
similarity index 100%
rename from static/images/collaborations/icons/vendor.png
rename to content/collaborations/images/icons/vendor.png
diff --git a/content/documentation/_index.md b/content/documentation/_index.md
index a2f6b1b4a1943918cc0d76c1d4ea3bca8d8dfe51..13f8f0972d1a8ee9f9b4bf65006a36bbd91c2115 100644
--- a/content/documentation/_index.md
+++ b/content/documentation/_index.md
@@ -14,23 +14,43 @@ container: container
## Current releases
{{< html/list_wrapper listClass="fa-ul">}}
- <li><a href="http://help.eclipse.org/2023-03/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2023-03 (4.27) Documentation</a> (HTML Help Center)</li>
+ <li>
+ <a href="http://help.eclipse.org/2023-06/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2023-06 (4.28) Documentation</a> (HTML Help Center)
+ </li>
{{</ html/list_wrapper >}}
## Older releases
{{< html/list_wrapper listClass="fa-ul">}}
- <li><a href="http://help.eclipse.org/2022-12/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2022-12 (4.26) Documentation</a> (HTML Help Center)</li>
- <li><a href="http://help.eclipse.org/2022-09/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2022-09 (4.25) Documentation</a> (HTML Help Center)</li>
- <li><a href="http://help.eclipse.org/2022-06/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2022-06 (4.24) Documentation</a> (HTML Help Center)</li>
- <li><a href="http://help.eclipse.org/2022-03/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2022-03 (4.23) Documentation</a> (HTML Help Center)</li>
- <li><a href="http://help.eclipse.org/2021-12/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2021-12 (4.22) Documentation</a> (HTML Help Center)</li>
+ <li>
+ <a href="http://help.eclipse.org/2023-03/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2023-03 (4.27) Documentation</a> (HTML Help Center)
+ </li>
+ <li>
+ <a href="http://help.eclipse.org/2022-12/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2022-12 (4.26) Documentation</a> (HTML Help Center)
+ </li>
+ <li>
+ <a href="http://help.eclipse.org/2022-09/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2022-09 (4.25) Documentation</a> (HTML Help Center)
+ </li>
+ <li>
+ <a href="http://help.eclipse.org/2022-06/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2022-06 (4.24) Documentation</a> (HTML Help Center)
+ </li>
+ <li>
+ <a href="http://help.eclipse.org/2022-03/index.jsp"><i class="fa fa-globe"></i> Eclipse IDE 2022-03 (4.23) Documentation</a> (HTML Help Center)
+ </li>
{{</ html/list_wrapper >}}
-For even older releases (Photon, Oxygen, Neon, etc), please download the corresponding Eclipse SDK or any EPP package and start the Information center locally as described here:
+For even older releases (Photon, Oxygen, Neon, etc), please download the
+corresponding Eclipse SDK or any EPP package and start the Information center
+locally as described here:
{{< html/list_wrapper listClass="fa-ul">}}
- <li><a href="https://archive.eclipse.org/eclipse/downloads/"><i class="fa fa-globe"></i> Eclipse project archived downloads</a></li>
- <li><a href="https://www.eclipse.org/downloads/packages/release/"><i class="fa fa-globe"></i> Eclipse Packaging Project (EPP) Releases</a></li>
- <li><a href="https://help.eclipse.org/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Fguide%2Fua_help_setup_infocenter.htm"><i class="fa fa-globe"></i> How to start or stop information center from command line</a></li>
+ <li>
+ <a href="https://archive.eclipse.org/eclipse/downloads/"><i class="fa fa-globe"></i> Eclipse project archived downloads</a>
+ </li>
+ <li>
+ <a href="https://www.eclipse.org/downloads/packages/release/"><i class="fa fa-globe"></i> Eclipse Packaging Project (EPP) Releases</a>
+ </li>
+ <li>
+ <a href="https://help.eclipse.org/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Fguide%2Fua_help_setup_infocenter.htm"><i class="fa fa-globe"></i> How to start or stop information center from command line</a>
+ </li>
{{</ html/list_wrapper >}}
diff --git a/content/getting-started/_index.md b/content/getting-started/_index.md
deleted file mode 100644
index fb29c79dc927d7b7dd96fb7e13152a5af9fff735..0000000000000000000000000000000000000000
--- a/content/getting-started/_index.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: "Getting Started"
-date: 2022-07-25T09:50:06-04:00
-description: ""
-categories: []
-keywords: ["eclipse resources", "courses", "books", "events", "plug-ins", "Getting Started with Eclipse", "help eclipse", "eclipse documentation links", "Get Involved with Eclipse", "support eclipse"]
-author: "Christopher Guindon"
-slug: ""
-aliases: []
-toc: false
-draft: false
-hide_page_title: true
-hide_sidebar: true
-layout: single
-#header_wrapper_class: ""
-#seo_title: ""
-#headline: ""
-#subtitle: ""
-#tagline: ""
-#links: []
----
-
-{{< pages/getting-started/landing-page >}}
\ No newline at end of file
diff --git a/content/getting-started/documents/eclipse-ide-keybindings.pdf b/content/getting-started/documents/eclipse-ide-keybindings.pdf
deleted file mode 100644
index 41ef6bd04a8c3508e7eacdd71973970234d3e2ad..0000000000000000000000000000000000000000
Binary files a/content/getting-started/documents/eclipse-ide-keybindings.pdf and /dev/null differ
diff --git a/content/home/search.md b/content/home/search.md
index 67f6095e0457ad95340d8797b877e9d768578998..95cc29ee471e4cc38a0ce435603aabc6e0af46f3 100644
--- a/content/home/search.md
+++ b/content/home/search.md
@@ -10,7 +10,7 @@ draft: false
lastmod: 2022-03-21T18:52:12.407Z
main_sidebar_custom_html: >
<div class="eclipsefdn-promo-content text-center"
- data-ad-format="ads_square,ads_medium_banner"
+ data-ad-format="ads_square"
data-ad-publish-to="eclipse_org_home"></div>
hide_sidebar_menu_links: true
---
diff --git a/content/research/_index.md b/content/research/_index.md
index d1f72a6cabc087854ed8659c6e5b5da72a00850c..2f8d916f0d58b8c3d4bcae19960368fa29d3808e 100644
--- a/content/research/_index.md
+++ b/content/research/_index.md
@@ -16,7 +16,7 @@ hide_page_title: true
show_featured_story: false
show_featured_footer: false
-#links: [[href: "https://events.eclipse.org/2020/sam-iot/sam-iot-cfp.pdf", text: "Download call for papers"]]
+links: [[href: "#projects", text: "Research Projects"], [href: "#collaborations", text: "Collaborations"]]
container: "container-fluid"
header_wrapper_class: "header-default-bg-img small-jumbotron-subtitle"
page_css_file : public/css/research-styles.css
@@ -41,13 +41,15 @@ custom_jumbotron: |
{{< pages/research/home-section-organizations >}}
-{{< grid/section-container class="row-gray padding-top-40 padding-bottom-40 margin-bottom-40" isMarkdown="false" >}}
+{{< grid/section-container id="projects" class="row-gray padding-top-40 padding-bottom-40" isMarkdown="false" >}}
<h2 class="text-center margin-bottom-40">The Eclipse Foundation is a Partner in these Projects</h2>
{{< eclipsefdn_projects is_static_source="true" url="/research/projects/index.json" templateId="tpl-projects-item-research" display_view_more="false" >}}
{{</ grid/section-container >}}
-{{< pages/research/newsroom-section working_group="research" class="margin-bottom-30" resource_class="col-md-5 newsroom-resource-card newsroom-resource-card-match-height match-height-item" >}}
+{{< pages/research/collaboration-section >}}
+
+{{< pages/research/newsroom-section id="collaborations" working_group="research" class="margin-bottom-30" resource_class="col-md-5 newsroom-resource-card newsroom-resource-card-match-height match-height-item" >}}
{{< pages/research/home-section-contact >}}
-{{< mustache_js template-id="tpl-projects-item-research" path="/js/src/templates/research/tpl-projects-item-research.mustache" >}}
\ No newline at end of file
+{{< mustache_js template-id="tpl-projects-item-research" path="/js/src/templates/research/tpl-projects-item-research.mustache" >}}
diff --git a/content/research/projects/appstacle.md b/content/research/projects/appstacle.md
index f0da6a64066f630a4bee8ba417067840ebfdd884..63562df3447ff3260b423aab26f12ce62a5cbec3 100644
--- a/content/research/projects/appstacle.md
+++ b/content/research/projects/appstacle.md
@@ -9,7 +9,7 @@ linkedin: "https://www.linkedin.com/company/itea3"
twitter: "http://twitter.com/appstacle"
youtube: "https://www.youtube.com/channel/UC3BnXf0r7qguzHIq1FzeBtw"
funding_bodies: ["itea3"]
-eclipse_projects: ["iot.kuksa"]
+eclipse_projects: ["automotive.kuksa"]
referenced_eclipse_projects: ["iot.ditto", "iot.hawkbit", "iot.hono", "iot.leshan", "ecd.che", "ecd.theia"]
project_topic: Automotive
summary: "Open Standard Application Platform for Cars and Transportation Vehicles"
diff --git a/content/security/_index.md b/content/security/_index.md
new file mode 100644
index 0000000000000000000000000000000000000000..8b52b13e0671995cd1b3d09b2722763f13e85e49
--- /dev/null
+++ b/content/security/_index.md
@@ -0,0 +1,49 @@
+---
+title: Eclipse Vulnerability Reporting
+keywords: ['report', 'vulnerability']
+hide_page_title: true
+layout: single
+---
+
+# How to report a vulnerability?
+
+If you would like to report a security vulnerability in an Eclipse Foundation
+project, first check the project's repository for the `SECURITY.md` file and
+follow specific instructions for that project. If there is no specific
+information there, you have two options. Either report the issue by email to
+the [Eclipse Foundation Security Team](mailto:security@eclipse-foundation.org),
+or use the [dedicated issue tracker](https://gitlab.eclipse.org/security/vulnerability-reports/-/issues/new?issuable_template=new_vulnerability).
+
+## Additional Information
+
+The **Eclipse Foundation Security Team** provides help and advice to Eclipse
+Foundation projects on vulnerability issues and is the first point of contact
+for handling security vulnerabilities. Members of the Eclipse Foundation
+Security Team are selected amongs committers on Eclipse Projects, members of
+the Eclipse Architecture Council, and Eclipse Foundation staff.
+
+The general security mailing list address is <security@eclipse-foundation.org>.
+Members of the Eclipse Foundation Security Team will receive messages sent to
+this address. This address should be used only for reporting undisclosed
+vulnerabilities; regular issue reports and questions unrelated to
+vulnerabilities in Eclipse Foundation software will be ignored. Note that this
+email set to this address is not encrypted.
+
+**Note that, as a matter of policy, the security team does not open attachments.**
+
+The community is also encouraged to report vulnerabilities using the [Eclipse
+Foundation's issue tracker](https://gitlab.eclipse.org/security/vulnerability-reports/-/issues/new?issuable_template=new_vulnerability).
+Note that you will need an Eclipse Foundation account to create an issue report
+([create an account here if you do not have one](https://accounts.eclipse.org/user/register?destination=user)),
+but by doing so you will be able to participate directly in the resolution of
+the issue.
+
+Issue reports related to vulnerabilities must be marked as "confidential",
+either automatically by clicking the provided link by the reporter, or by a
+committer during the triage process.
+
+## Disclosure
+
+The timing and manner of disclosure is governed by the [Eclipse Foundation Vulnerability Reporting Policy](/security/policy).
+
+Publicly disclosed issues are listed on the [Disclosed Vulnerabilities page](/security/known).
diff --git a/content/security/known/_index.md b/content/security/known/_index.md
new file mode 100644
index 0000000000000000000000000000000000000000..f677e8ab742389bed225958be82463391366fb6a
--- /dev/null
+++ b/content/security/known/_index.md
@@ -0,0 +1,11 @@
+---
+title: "Known Vulnerabilities"
+date: 2022-08-30T13:14:48-04:00
+description: "List of security vulnerabilities known to affect Eclipse Foundation sites and projects"
+keywords: ['Eclipse', 'projects', 'security', 'cve']
+layout: single
+---
+
+This page lists security vulnerabilities known to affect Eclipse Foundation sites and projects.
+
+{{< pages/security/known >}}
diff --git a/content/security/policy/index.md b/content/security/policy/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..8ebb7ba3990563b1cc591b3f709c82b9af8e5f58
--- /dev/null
+++ b/content/security/policy/index.md
@@ -0,0 +1,165 @@
+---
+title: Eclipse Foundation Vulnerability Reporting Policy
+seo_title: Vulnerability Reporting Policy | Eclipse Foundation
+keywords: [eclipse, project, security]
+tags: [eclipse, project, security]
+---
+
+Version 1.1 February 4/2020
+
+## Overview
+
+The purpose of the Eclipse Vulnerability Reporting Policy is to set forth the
+general principles under which the Eclipse Foundation manages the reporting,
+management, discussion, and disclosure of Vulnerabilities discovered in Eclipse
+software. This Vulnerability Reporting Policy applies to all software
+distributed by the Eclipse Foundation, including all software authored by
+Eclipse Committers and third-parties. This Eclipse Vulnerability Reporting
+Policy should at all times be interpreted in a manner that is consistent with
+the Purposes of the Eclipse Foundation as set forth in the
+[Eclipse Foundation Bylaws](/org/documents/eclipse_foundation-bylaws.pdf) and
+the [Eclipse Foundation Development Process](/org/projects/dev_process/).
+
+## Terms
+
+**Security Team**
+
+The Security Team, or "Eclipse Security Team" is the team tasked with security
+and Vulnerability management on behalf of the Eclipse community.
+
+**Vulnerability**
+
+This policy uses the ISO 27005 definition of Vulnerability: "A weakness of an
+asset or group of assets that can be exploited by one or more threats."
+
+Other terms used in this document are defined in the
+[Eclipse Foundation Development Process](/projects/dev_process/).
+
+## Eclipse Security Team
+
+The Eclipse Security Team is the first line of defense: it is effectively a
+triage unit with security and Vulnerability management expertise. The Security
+Team exists to provide assistance; Vulnerabilities are addressed and resolved by
+project committers with guidance and assistance from the Security Team.
+
+The Security Team is composed of a small number of security experts and
+representatives from the Project Management Committees. All members are
+appointed by EMO(ED) or their designate.
+
+## Discussion
+
+The Eclipse Foundation is responsible for establishing communication channels
+for the Security Team.
+
+Every potential issue reported on established communication channels should be
+triaged and relevant parties notified. Initial discussion of a potential
+Vulnerability may occur privately amongst members of the project and Security
+Team. Discussion should be moved to and tracked by an Eclipse
+Foundation-supported issue tracker as early as possible once confirmed so the
+mitigation process may proceed. Appropriate effort must be undertaken to ensure
+the initial visibility, as well as the legitimacy, of every reported issue.
+
+## Resolution
+
+A Vulnerability is considered resolved when either a patch or workaround is
+available, or it is determined that a fix is not possible or desirable.
+
+It is left to the discretion of the Security Team and Project Leadership Chain
+to determine what subset of the project team are best suited to resolve
+Vulnerabilities. The Security Team and project leaders may also — at their
+discretion — assemble external resources (e.g. subject matter experts) or call on
+the expertise of the Eclipse Architecture Council.
+
+In the unlikely event that a project team does not engage in good faith to
+resolve a disclosed Vulnerability, an Eclipse Foundation member may — at their
+discretion — engage in the Grievance Process as defined by the
+[Eclipse Foundation Development Process](/projects/dev_process/).
+
+## Distribution
+
+Once a Vulnerability has been resolved, the updated software must be made
+available to the community.
+
+At a minimum, updated software must be made available via normal project
+distribution channels.
+
+## Disclosure
+
+Disclosure is initially limited to the reporter and all Eclipse Committers, but
+may be expanded to include other individuals.
+
+All Vulnerabilities must be disclosed, regardless of the resolution. Users and
+administrators of Eclipse software must be made aware that a Vulnerability
+exists so they may assess risk, and take the appropriate action to protect their
+users, servers and systems from potential exploit.
+
+### Timing
+
+The timing of disclosure is left to the discretion of the Project Leadership
+Chain. In the absence of specific guidance from the Project Leadership Chain,
+the following guidelines are recommended:
+
+- Vulnerabilities for which there is a patch, workaround or fix, should be
+ disclosed to the community immediately; and
+- Vulnerabilities — regardless of state — must be disclosed to the
+ community after a maximum three months.
+
+Vulnerabilities need not necessarily be resolved at the time of disclosure.
+
+### Quiet Disclosure
+
+A Vulnerability may be quietly disclosed by simply removing visibility
+restrictions.
+
+In general, quiet disclosure is appropriate only for issues that are identified
+by a committer as having been erroneously marked as Vulnerabilities.
+
+### Progressive Disclosure
+
+Knowledge of a Vulnerability can be extended to specific individuals before it
+is reported to the community. A Vulnerability may — at the discretion of the
+committer — be disclosed to specific individuals. A committer may, for example,
+provide access to a subject-matter expert to solicit help or advice. A
+Vulnerability may also be disclosed to known adopters to allow them an
+opportunity to mitigate their immediate risk and prepare for a forthcoming
+resolution.
+
+### Full Disclosure
+
+All Vulnerabilities must eventually be fully disclosed to the community at
+large.
+
+To complete the disclosure of a Vulnerability, all restrictions on visibility
+must be removed and the Vulnerability reported via channels provided by the
+Eclipse Foundation.
+
+### Reporting
+
+A project team may, at their discretion, opt to disclose a Vulnerability to a
+reporting authority.
+
+The EMO will determine how to engage with Vulnerability reporting authorities.
+
+## History
+
+Changes made in this document:
+
+### Change Log
+
+#### [2019] - 2019-03-06 (version 1.1)
+
+##### Changes
+
+- Changed the name from "Security Policy" to "Vulnerability Reporting Policy"
+- Formalized terms into their own section.
+- Changed several occurances of the word "can" to "may" to improve clarity.
+
+##### Added
+
+- Added a pointer to the Grievance Handling section of the Eclipse Foundation Development Process.
+
+##### Removed
+
+- Removed references to specific technology (e.g., Bugzilla or specific mailing
+ lists). These are implementation details.
+- Removed references to the Eclipse Planning Council and Simultaneous Release.
diff --git a/content/security/team/_index.md b/content/security/team/_index.md
new file mode 100644
index 0000000000000000000000000000000000000000..f93814e681b6731cfdce81b892336701677de78b
--- /dev/null
+++ b/content/security/team/_index.md
@@ -0,0 +1,13 @@
+---
+title: Eclipse Foundation Security Team
+seo_title: Security Team | Security | Eclipse Foundation
+---
+
+## Staff Members
+
+{{< pages/security/team type="staff" >}}
+
+
+## Community Members
+
+{{< pages/security/team type="community" >}}
diff --git a/data/featuredstory.yml b/data/featuredstory.yml
index f8bb0161250fd7130e6de33bc15469719b2ee619..974e69b9faed9bba7b132ac8a07fe7acc3b37492 100644
--- a/data/featuredstory.yml
+++ b/data/featuredstory.yml
@@ -1 +1 @@
-defaultRight: <div class="eclipsefdn-promo-content text-center" data-ad-format="ads_square,ads_medium_banner" data-ad-publish-to="eclipse_org_home"></div>
\ No newline at end of file
+defaultRight: <div class="eclipsefdn-promo-content text-center" data-ad-format="ads_square" data-ad-publish-to="eclipse_org_home"></div>
diff --git a/data/research/collaborations.yml b/data/research/collaborations.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c628fc6accee29628b4281dabbb8509da96da49d
--- /dev/null
+++ b/data/research/collaborations.yml
@@ -0,0 +1,17 @@
+items:
+ - name: GEMOC Research Consortium
+ summary: >-
+ GEMOC is an open and international initiative that aims to coordinate and
+ disseminate the research results regarding the support of the coordinated
+ use of various modeling languages that will lead to the concept of the
+ globalization of modeling languages.
+ logo: /images/research/gemoc-research-consortium.png
+ url: https://gemoc.org/
+ - name: Software Defined Vehicle
+ summary: >-
+ An open technology platform for the software defined vehicle of the
+ future; focused on accelerating innovation of automotive-grade in-car
+ software stacks using open source and open specifications developed by a
+ vibrant community.
+ logo: https://www.eclipse.org/org/workinggroups/assets/images/wg-sdv.svg
+ url: https://sdv.eclipse.org/
diff --git a/data/security/team.yml b/data/security/team.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8663150d46b5945adb6ea5a36afc1c4a6c93aa35
--- /dev/null
+++ b/data/security/team.yml
@@ -0,0 +1,137 @@
+# Copyright (c) 2023 Eclipse Foundation, Inc.
+
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0.
+#
+# Contributors:
+# Olivier Goulet <olivier.goulet@eclipse-foundation.org>
+#
+# SPDX-License-Identifier: EPL-2.0
+
+# Associate icons and text for appending to link types
+link_types:
+ eclipse:
+ icon: fa fa-user
+ postfix: (eclipse.org)
+ eclipse_gitlab:
+ icon: fa fa-gitlab
+ postfix: (gitlab.eclipse.org)
+ github:
+ icon: fa fa-github
+ postfix: (github.com)
+ twitter:
+ icon: fa fa-twitter
+ mastodon:
+ icon: fa fa-square-share-o
+ website:
+ icon: fa fa-safari
+ email:
+ icon: fa fa-envelope-o
+ pgp:
+ icon: fa fa-id-card-o
+ linkedin:
+ icon: fa fa-linkedin
+ postfix: (LinkedIn)
+
+# Security team members
+staff:
+ - name: Mikaël Barbero
+ image: https://eclipse.org/org/foundation/images_staff/mikael.jpg
+ links:
+ - text: mbarbero
+ type: eclipse
+ url: https://accounts.eclipse.org/users/mbarbero
+ - text: mbarbero
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/mbarbero
+ - text: mbarbero
+ type: github
+ url: https://github.com/mbarbero
+ - text: "@mikbarbero"
+ type: twitter
+ url: https://twitter.com/mikbarbero
+ - text: "@mbarbero@hachyderm.io"
+ type: mastodon
+ url: https://hachyderm.io/@mbarbero
+ - text: mikael.barbero.tech
+ type: website
+ url: https://mikael.barbero.tech
+ - text: mikael.barbero@eclipse-foundation.org
+ type: email
+ url: mailto:mikael.barbero@eclipse-foundation.org
+ - text: 3FAF B6A7 46AB 3E21 FDE0 E9E8 E1E6 5F0B 59A4 C4FB
+ type: pgp
+ url: https://keys.openpgp.org/search?q=3FAFB6A746AB3E21FDE0E9E8E1E65F0B59A4C4FB
+ - name: Tiago Lucas
+ image: https://www.eclipse.org/org/foundation/images_staff/tiago-lucas.jpg
+ links:
+ - text: tiagolucas
+ type: eclipse
+ url: https://eclipse.org/user/tiagolucas
+ - text: tiagolucas
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/tiagolucas
+ - text: TiagoLucas22478
+ type: github
+ url: https://github.com/TiagoLucas22478
+ - text: tiagoslucas.medium.com
+ type: website
+ url: https://tiagoslucas.medium.com
+ - text: tiago.lucas@eclipse-foundation.org
+ type: email
+ url: mailto:tiago.lucas@eclipse-foundation.org
+ - name: Thomas Neidhart
+ image: https://www.eclipse.org/org/foundation/images_staff/thomas-neidhart.png
+ links:
+ - text: netomi
+ type: eclipse
+ url: https://accounts.eclipse.org/users/netomi
+ - text: netomi
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/netomi
+ - text: netomi
+ type: github
+ url: https://github.com/netomi
+ - text: netomi.github.io
+ type: website
+ url: https://netomi.github.io
+ - text: thomas.neidhart@eclipse-foundation.org
+ type: email
+ url: mailto:thomas.neidhart@eclipse-foundation.org
+ - name: Francisco Peréz
+ image: https://www.eclipse.org/org/foundation/images_staff/francisco-perez.jpg
+ links:
+ - text: fcojperez
+ type: eclipse
+ url: https://accounts.eclipse.org/users/fcojperez
+ - text: fcojperez
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/fcojperez
+ - text: fperezel
+ type: github
+ url: https://github.com/fperezel
+ - text: Francisco Peréz
+ type: linkedin
+ url: https://www.linkedin.com/in/fcojperez
+ - text: francisco.perez@eclipse-foundation.org
+ type: email
+ url: mailto:francisco.perez@eclipse-foundation.org
+ - name: Marta Rybczynska
+ image: https://www.eclipse.org/org/foundation/images_staff/marta-rybczynska.jpg
+ links:
+ - text: mrybczyn
+ type: eclipse
+ url: https://accounts.eclipse.org/users/mrybczyn
+ - text: mrybczyn
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/mrybczyn
+ - text: mrybczyn
+ type: github
+ url: https://github.com/mrybczyn
+ - text: marta.rybczynska@eclipse-foundation.org
+ type: email
+ url: mailto:marta.rybczynska@eclipse-foundation.org
+
+# Community members
+community: []
diff --git a/js/known-vulnerabilities.js b/js/known-vulnerabilities.js
new file mode 100644
index 0000000000000000000000000000000000000000..756af052006f8b04dcea3d72f08ecc1e92826649
--- /dev/null
+++ b/js/known-vulnerabilities.js
@@ -0,0 +1,16 @@
+/*!
+ * Copyright (c) 2023 Eclipse Foundation, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * Contributors:
+ * Olivier Goulet <olivier.goulet@eclipse-foundation.org>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+// Requires jQuery to be loaded beforehand
+
+import './src/known-vulnerabilities-table'
\ No newline at end of file
diff --git a/js/src/api/eclipsefdn.cve.js b/js/src/api/eclipsefdn.cve.js
new file mode 100644
index 0000000000000000000000000000000000000000..72d7891d24597f3f983284613d8cd6f84c646c15
--- /dev/null
+++ b/js/src/api/eclipsefdn.cve.js
@@ -0,0 +1,46 @@
+/*!
+ * Copyright (c) 2023 Eclipse Foundation, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * Contributors:
+ * Olivier Goulet <olivier.goulet@eclipse-foundation.org>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+const apiPath = `https://api.eclipse.org/cve`;
+
+const cveMapper = data => ({
+ id: data.id,
+ datePublished: data.date_published,
+ status: data.status,
+ summary: data.summary,
+ project: data.project,
+ cvss: data.cvss,
+ liveLink: data.live_link,
+ cvePullRequest: data.cve_pull_request,
+ nvdLink: `https://nvd.nist.gov/vuln/detail/${data.id}`,
+});
+
+const getAllCVEs = async () => {
+ try {
+ const response = await fetch(apiPath);
+ if (!response.ok) throw new Error('Problem with the request to CVE API');
+
+ const data = await response.json();
+ if (!Array.isArray(data)) throw new TypeError('Expected an array as CVE API response');
+
+ const cves = data
+ .map(cveMapper)
+ .filter(cve => cve.status === 'PUBLIC');
+
+ return [cves, null];
+ } catch (error) {
+ return [null, error];
+ }
+}
+
+export default getAllCVEs;
diff --git a/js/src/collaborations/eclipsefdn.weighted-working-groups.js b/js/src/collaborations/eclipsefdn.weighted-working-groups.js
index 9ed652a9c3d41b0daae124ea16efcd1cfd29813e..91a088d9e6bec6c6c1600997c261d307fb0b38b2 100644
--- a/js/src/collaborations/eclipsefdn.weighted-working-groups.js
+++ b/js/src/collaborations/eclipsefdn.weighted-working-groups.js
@@ -37,7 +37,7 @@ const weights = {
sparkplug: 50,
};
-// An object which uses WG aliases as keys and logo urls as value. Use this only for WGs which do not yet have a logo.
+// An object which uses WG aliases as keys and logo urls as value. Use this only for WGs which do not yet have a logo.
const fallbackLogos = {};
const removeDuplicates = (value, index, self) => self.indexOf(value) === index;
@@ -54,7 +54,7 @@ const getWeightedRandomIndex = (weightBuckets, categorizedArrayByWeight) => {
const weightBucketSelectionIndex = weightBuckets.indexOf(closest);
const weightBucketSelection = weightBuckets[weightBucketSelectionIndex];
const selectionIndex = Math.floor(Math.random() * categorizedArrayByWeight[weightBucketSelection].length);
-
+
return categorizedArrayByWeight[weightBucketSelection][selectionIndex];
}
@@ -112,7 +112,7 @@ async function getWeightedRandomWorkingGroups(count) {
const matchHeightForLogos = (baseElement) => {
const imgElements = baseElement.querySelectorAll('.weighted-working-group-logo');
- imgElements.forEach(el => {
+ imgElements.forEach(el => {
el.addEventListener('load', () => {
$('.weighted-working-group-block-wrapper').matchHeight();
});
@@ -130,8 +130,8 @@ const getWorkingGroupLogo = ({ alias, logo } = workingGroup) => {
const element = document.querySelector('.eclipsefdn-weighted-working-groups');
if (!element) return;
- const options = {
- ...defaultOptions,
+ const options = {
+ ...defaultOptions,
...element.dataset,
count: +element.dataset.count
};
@@ -139,7 +139,7 @@ const getWorkingGroupLogo = ({ alias, logo } = workingGroup) => {
element.innerHTML = template({ isFetching: true, items: new Array(options.count) , wrapperClass: options.wrapperClass })
const [workingGroups, error] = await getWeightedRandomWorkingGroups(options.count);
-
+
if (error) {
element.innerHTML = `<p class="alert alert-danger">Error when attempting to load working groups.</p>`;
console.error(error);
@@ -156,6 +156,6 @@ const getWorkingGroupLogo = ({ alias, logo } = workingGroup) => {
}))
};
- element.innerHTML = template(data);
+ element.innerHTML = template(data);
matchHeightForLogos(element);
})();
\ No newline at end of file
diff --git a/js/src/featured-projects-committer.js b/js/src/featured-projects-committer.js
index 44e013db06961c30de7611fb54d0b70ba8128804..aeea0c496fa831a23fd0ac524926b8b6f28fa180 100644
--- a/js/src/featured-projects-committer.js
+++ b/js/src/featured-projects-committer.js
@@ -1,17 +1,17 @@
(function($, document) {
$.ajax({
- url: "https://newsroom.eclipse.org/api/edition?options[orderby][nid]=DESC&pagesize=1",
+ url: "https://newsroom.eclipse.org/api/edition/39472",
type: 'GET',
dataType: 'json',
success: function(data, status) {
- if (data.editions[0].featured_committer !== undefined && data.editions[0].featured_committer.length !== 0) {
+ if (data.featured_committer !== undefined && data.featured_committer.length !== 0) {
$(".featured-committer-project-section").css('display', 'block');
$(".featured-committer-section").css('display', 'block');
- const committer = data.editions[0].featured_committer
+ const committer = data.featured_committer
var image = "<div class='col-xs-8 padding-0 eclipsefdn-user-display-circle'><img class='img img-responsive' src=" + committer.picture + "></div>"
var content = " <div class='col-xs-16'>" +
"<h3 class='h4'><strong>" + committer.name + "</strong></h3>" +
@@ -24,12 +24,12 @@
$('#commiters-container').append(result);
}
- if (data.editions[0].featured_project !== undefined && data.editions[0].featured_project.length !== 0) {
+ if (data.featured_project !== undefined && data.featured_project.length !== 0) {
$(".featured-committer-project-section").css('display', 'block');
$(".featured-project-section").css('display', 'block');
- const project = data.editions[0].featured_project;
+ const project = data.featured_project;
var project_id = project.id;
var project_id = project_id.replace(/\./g, "_");
diff --git a/js/src/known-vulnerabilities-table.js b/js/src/known-vulnerabilities-table.js
new file mode 100644
index 0000000000000000000000000000000000000000..158549aaeda19d47a3d00f2ca62a1a867633cbaa
--- /dev/null
+++ b/js/src/known-vulnerabilities-table.js
@@ -0,0 +1,68 @@
+/*!
+ * Copyright (c) 2023 Eclipse Foundation, Inc.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * Contributors:
+ * Olivier Goulet <olivier.goulet@eclipse-foundation.org>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import DataTable from 'datatables.net';
+import getAllCVEs from './api/eclipsefdn.cve';
+
+
+const KnownVulnerabilitiesTable = async () => {
+ const element = document.querySelector('#known-table-wrapper');
+ if (!element) return;
+
+ const [cves, error] = await getAllCVEs();
+
+ if (error) {
+ element.innerHTML = `
+ <p class="alert alert-danger">
+ An error has occurred while fetching known vulnerabilities. Please try again later.
+ </p>
+ `;
+
+ return;
+ }
+
+ const data = cves.filter(row => row.cvePullRequest !== null);
+
+ populateTable(data);
+}
+
+export default KnownVulnerabilitiesTable();
+
+/** Populate the known vulnerabilities table with CVE data
+ * @param {Array} data - Array of CVEs
+ * @returns {DataTable} - DataTable instance
+*/
+const populateTable = data =>
+ new DataTable('#known-table', {
+ data,
+ autoWidth: false,
+ columns: [
+ {
+ data: 'id',
+ width: '20%',
+ render: (data, _, row) => `<a href="${row.nvdLink}">${data}</a>`
+ },
+ { data: 'datePublished', width: '15%' },
+ {
+ name: 'project',
+ data: 'project',
+ width: '25%',
+ render: (data) => `<a class="known-table-project-link" href="https://projects.eclipse.org/projects/${data}">${data}</a>`
+ },
+ //{ data: 'summary' }
+ ],
+ order: [[1, 'desc']],
+ pageLength: 10,
+ lengthMenu: [10, 20, 50, 100]
+ }
+);
diff --git a/layouts/shortcodes/pages/collaborations/collaborating.html b/layouts/shortcodes/pages/collaborations/collaborating.html
index c62d1c7159999f0aebb087f38fbba24664d40fe1..62090583789417126a3a15ede58e82a630a1e0cd 100644
--- a/layouts/shortcodes/pages/collaborations/collaborating.html
+++ b/layouts/shortcodes/pages/collaborations/collaborating.html
@@ -15,8 +15,8 @@
<div class="col-md-12 collaborations-collaborating-item-col">
<div class="collaborations-collaborating-item">
<div class="item-icon-wrapper">
- <img class="item-icon-bg" src="/images/collaborations/icons/icon-bg.png" alt="" />
- <img class="item-icon" src="/images/collaborations/icons/{{ $item.icon }}" alt="" />
+ <img class="item-icon-bg" src="/collaborations/images/icons/icon-bg.png" alt="" />
+ <img class="item-icon" src="/collaborations/images/icons/{{ $item.icon }}" alt="" />
</div>
<div class="item-content">
<h3 class="item-content-title">{{ $item.title }}</h3>
diff --git a/layouts/shortcodes/pages/getting-started/landing-page.html b/layouts/shortcodes/pages/getting-started/landing-page.html
index 6dc784c97ade1d18686a1aec7cdcb16df7e8e4ae..f00c0b2687a6ad6ad7caa223f10d180b927a6a20 100644
--- a/layouts/shortcodes/pages/getting-started/landing-page.html
+++ b/layouts/shortcodes/pages/getting-started/landing-page.html
@@ -1,7 +1,7 @@
{{ $bugzillaLink := "https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EPP" }}
{{ $installButtonImageUrl := "https://download.eclipse.org/eclipse.org-common/themes/solstice/public/images/components/drag-drop/installbutton.png" }}
-{{ $versionName := "2023-03" }}
-{{ $platformVersion := "4.27" }}
+{{ $versionName := "2023-06" }}
+{{ $platformVersion := "4.28" }}
<div class="timeline">
<div class="row">
diff --git a/layouts/shortcodes/pages/research/collaboration-section.html b/layouts/shortcodes/pages/research/collaboration-section.html
new file mode 100644
index 0000000000000000000000000000000000000000..707e2b2cef6c55b1dd2ace7eefc272768e449151
--- /dev/null
+++ b/layouts/shortcodes/pages/research/collaboration-section.html
@@ -0,0 +1,35 @@
+{{ $collaborations := .Site.Data.research.collaborations }}
+<section class="row row-gray padding-bottom-40 margin-bottom-20" id="collaborations">
+ <div class="container">
+ <h2 class="text-center margin-bottom-60">The Research team is supporting these groups</h2>
+ <div class="container">
+ <div class="row">
+ <div class="col-md-24">
+ <ul class="list-inline list">
+ {{ range $collaborations.items }}
+ <li class="col-md-6 col-sm-12">
+ <div class="featured-projects-item tpl-projects-research match-height-item-by-row" data-mh="m-header">
+ <div class="featured-projects-item-category category labels">{{ .name }}</div>
+ <div class="featured-projects-item-content">
+ <a href="{{ .url }}" class="link">
+ <img class="featured-projects-item-img img-responsive logo logo_alt" alt="{{ .name }}" src="{{ .logo }}" height="40">
+ </a>
+ <div class="featured-projects-item-text">
+ <p class="description">{{ .summary }}</p>
+ </div>
+ </div>
+ <div class="details">
+ <div class="featured-projects-website-url">
+ <a href="{{ .url }}">Visit Website</a>
+ <span class="featured-projects-website-url-bar"></span>
+ </div>
+ </div>
+ </div>
+ </li>
+ {{ end }}
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+</section>
diff --git a/layouts/shortcodes/pages/security/known.html b/layouts/shortcodes/pages/security/known.html
new file mode 100644
index 0000000000000000000000000000000000000000..6e6f5e33a579de35429f9c2e652c9e4c50746fd5
--- /dev/null
+++ b/layouts/shortcodes/pages/security/known.html
@@ -0,0 +1,19 @@
+<div class="dataTables_wrapper margin-top-20" id="known-table-wrapper">
+ <table class="display dataTable" id="known-table" style="width:100%" aria-describedby="known-table_info">
+ <thead>
+ <tr>
+ <th class="sorting" tabindex="0" aria-controls="known-table" rowspan="1" colspan="1" aria-label="ID: activate to sort column ascending">ID</th>
+ <th class="sorting" tabindex="0" aria-controls="known-table" rowspan="1" colspan="1" aria-label="Date: activate to sort column ascending">Date Published</th>
+ <th class="sorting sorting_asc" tabindex="0" aria-controls="known-table" rowspan="1" colspan="1" aria-sort="ascending" aria-label="Project: activate to sort column descending">Project</th>
+ <!--<th tabindex="0" aria-controls="known-table" rowspan="1" colspan="2">Description</th>-->
+ </tr>
+ </thead>
+ </table>
+</div>
+
+{{/*
+ @todo: Remove hotfix for
+ https://gitlab.eclipse.org/eclipsefdn/it/webdev/hugo-solstice-theme/-/issues/274
+*/}}
+<link rel="stylesheet" href="/public/css/datatables.net-dt.css">
+<script async src="/public/js/known-vulnerabilities.js"></script>
diff --git a/layouts/shortcodes/pages/security/team.html b/layouts/shortcodes/pages/security/team.html
new file mode 100644
index 0000000000000000000000000000000000000000..3b90dcff2a533f5ddef1868c5e9ee0f1e2568103
--- /dev/null
+++ b/layouts/shortcodes/pages/security/team.html
@@ -0,0 +1,66 @@
+{{/*
+ Copyright (c) 2023 Eclipse Foundation, Inc.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ Contributors:
+ Olivier Goulet <olivier.goulet@eclipse-foundation.org>
+
+ SPDX-License-Identifier: EPL-2.0
+*/}}
+
+{{ $type := .Get "type" }}
+{{ $team_members := index .Site.Data.security.team $type }}
+{{ $data := .Site.Data.security.team }}
+
+<section class="row">
+ {{ if eq (len $team_members) 0 }}
+ <div class="col-xs-24">
+ <p>No {{ $type }} members to display at this time.</p>
+ </div>
+ {{ else }}
+ {{ range $team_members }}
+ {{ $eclipse_username := "" }}
+ {{ range .links }}
+ {{ if eq .type "eclipse" }}
+ {{ $eclipse_username = .text }}
+ {{ end }}
+ {{ end }}
+
+ <div class="media clearfix">
+ <div class="col-xs-5 col-sm-4">
+ <a href="https://www.eclipse.org/user/{{ $eclipse_username }}">
+ <img
+ class="img-thumbnail img-responsive margin-top-20"
+ src="{{ .image }}"
+ alt="{{ .name }}"
+ />
+ </a>
+ </div>
+ <div class="col-xs-19 col-sm-20">
+ <div class="media-body">
+ <a href="/user/{{ $eclipse_username }}">
+ <h3 id="{{ $eclipse_username }}">
+ {{ .name }}
+ <i class="fa fa-link" aria-hidden="true"></i>
+ </h3>
+ </a>
+ <dl>
+ {{ range .links }}
+ {{ $type := index $data.link_types .type }}
+ <dt>
+ <a href="{{ .url }}">
+ <i class="{{ $type.icon }}" aria-hidden="true"></i>
+ {{ .text }}{{ $type.postfix }}
+ </a>
+ </dt>
+ {{ end }}
+ </dl>
+ </div>
+ </div>
+ </div>
+ {{ end }}
+ {{ end }}
+</section>
diff --git a/package.json b/package.json
index aff8adb7d32c62bd66a639731754969cd9774e14..bbf7496d35af9b5ab0bd364b03e562df677a5574 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
},
"dependencies": {
"eclipsefdn-hugo-solstice-theme": "0.0.183",
+ "datatables.net-dt": "^1.13.1",
"js-yaml": "^3.13.1",
"json-minify": "^1.0.0"
},
diff --git a/static/images/research/gemoc-research-consortium.png b/static/images/research/gemoc-research-consortium.png
new file mode 100755
index 0000000000000000000000000000000000000000..bbdff9973978239e9f1d2cf3a8a5499365e4f83a
Binary files /dev/null and b/static/images/research/gemoc-research-consortium.png differ
diff --git a/webpack.mix.js b/webpack.mix.js
index 8bdc6cc31cb70e2abbe6be400c14b53de8fe7969..f6a28bda3eeffbdcf5ed7a50dbfd8e07f03119da 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -18,11 +18,16 @@ mix.EclipseFdnSolsticeAssets();
mix.setPublicPath('static/public');
mix.setResourceRoot('../');
+// default styles
mix.less('./less/styles.less', 'static/public/css/styles.css');
+mix.js('js/main.js', './static/public/js/main.js');
+// page_css_file
mix.less('./less/page_css_file/collaborations/styles.less', 'static/public/css/collaborations-styles.css');
mix.less('./less/page_css_file/openchain/styles.less', 'static/public/css/projects-openchain.css');
mix.less('./less/page_css_file/europe/styles.less', 'static/public/css/europe-styles.css');
-mix.less('./less/page_css_file/research/styles.less', 'static/public/css/research-styles.css');
-mix.js('js/main.js', './static/public/js/main.js');
+// eclipse.org/research
+mix.less('./less/page_css_file/research/styles.less', 'static/public/css/research-styles.css');
+mix.css('./node_modules/datatables.net-dt/css/jquery.dataTables.min.css', 'static/public/css/datatables.net-dt.css');
+mix.js('js/known-vulnerabilities.js', './static/public/js/known-vulnerabilities.js')
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 4f63aeb557b933baf20f22c11e8ae9d953a89dcc..a093a056c217d47cc1f34e9a9b469ae3888ed79f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2301,6 +2301,21 @@ csso@^4.2.0:
dependencies:
css-tree "^1.1.2"
+datatables.net-dt@^1.13.1:
+ version "1.13.4"
+ resolved "https://registry.yarnpkg.com/datatables.net-dt/-/datatables.net-dt-1.13.4.tgz#ec32d22a02772ee6dda2677032cb6b24f3f5e4d0"
+ integrity sha512-QAvuEej/qKSiaSmSeDQ36wWO72XzFGKkd0jdiqbp+2FHAAzIk+ffsqQAwylystMoBSiO0zlcdaqHoAPa5Dy7Pg==
+ dependencies:
+ datatables.net ">=1.12.1"
+ jquery ">=1.7"
+
+datatables.net@>=1.12.1:
+ version "1.13.4"
+ resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.4.tgz#9a809cee82eca0a884e10b4d47a3a3d6e65e9fe7"
+ integrity sha512-yzhArTOB6tPO2QFKm1z3hA4vabtt2hRvgw8XLsT1xqEirinfGYqWDiWXlkTPTaJv2e7gG+Kf985sXkzBFlGrGQ==
+ dependencies:
+ jquery ">=1.7"
+
date-fns@^2.27.0:
version "2.29.3"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
@@ -3664,7 +3679,7 @@ jquery-match-height@^0.7.2:
resolved "https://registry.yarnpkg.com/jquery-match-height/-/jquery-match-height-0.7.2.tgz#f8d9f3ba5314daab109cf07408674be204be5f0e"
integrity sha512-qSyC0GBc4zUlgBcxfyyumJSVUm50T6XuJEIz59cKaI28VXMUT95mZ6KiIjhMIMbG8IiJhh65FtQO1XD42TAcwg==
-jquery@>=1.8.3, jquery@^3.5.1:
+jquery@>=1.7, jquery@>=1.8.3, jquery@^3.5.1:
version "3.6.3"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6"
integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==