From cf8cdaed9940edd79e0f19e80bd4d9d20925133d Mon Sep 17 00:00:00 2001 From: Yuri Blankenstein Date: Tue, 14 Jun 2022 12:13:20 +0200 Subject: [PATCH 1/5] #10 Adding CoC and Security files --- CODE_OF_CONDUCT.asciidoc | 56 ++++++++++++++++++++++++++++++++++++++++ SECURITY.asciidoc | 25 ++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 CODE_OF_CONDUCT.asciidoc create mode 100644 SECURITY.asciidoc diff --git a/CODE_OF_CONDUCT.asciidoc b/CODE_OF_CONDUCT.asciidoc new file mode 100644 index 0000000..49b1422 --- /dev/null +++ b/CODE_OF_CONDUCT.asciidoc @@ -0,0 +1,56 @@ +//// + // Copyright (c) 2021 Contributors to the Eclipse Foundation + // + // This program and the accompanying materials are made + // available under the terms of the Eclipse Public License 2.0 + // which is available at https://www.eclipse.org/legal/epl-2.0/ + // + // SPDX-License-Identifier: EPL-2.0 +//// + +# Community Code of Conduct + +**Version 1.2** + +**August 19, 2020** + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as community members, contributors, committers, and project leaders pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +With the support of the Eclipse Foundation staff (the “Staff”), project committers and leaders are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project committers and leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies within all project spaces, and it also applies when an individual is representing the Eclipse Foundation project or its community in public spaces. Examples of representing a project or community include posting via an official social media account, or acting as a project representative at an online or offline event. Representation of a project may be further defined and clarified by project committers, leaders, or the EMO. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the Staff at codeofconduct@eclipse.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The Staff is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project committers or leaders who do not follow the Code of Conduct in good faith may face temporary or permanent repercussions as determined by the Staff. + +## Attribution + +This Code of Conduct is adapted from the https://www.contributor-covenant.org[Contributor Covenant] , version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct/[https://www.contributor-covenant.org/version/1/4/code-of-conduct.html] \ No newline at end of file diff --git a/SECURITY.asciidoc b/SECURITY.asciidoc new file mode 100644 index 0000000..5adaafa --- /dev/null +++ b/SECURITY.asciidoc @@ -0,0 +1,25 @@ +//// + // Copyright (c) 2021 Contributors to the Eclipse Foundation + // + // This program and the accompanying materials are made + // available under the terms of the Eclipse Public License 2.0 + // which is available at https://www.eclipse.org/legal/epl-2.0/ + // + // SPDX-License-Identifier: EPL-2.0 +//// + +include::docs/_attributes.asciidoc[] + +# Security Policy + +The {trace} project follows the https://www.eclipse.org/security/policy.php[Eclipse Vulnerability Reporting Policy]. +Vulnerabilities are tracked by the Eclipse security team, in cooperation with the TRACE4CPS project leads. +Fixing vulnerabilities is taken care of by the TRACE4CPS project committers, with assistance and guidance of the security team. + +## Supported Versions + +Whenever the {trace} project fixes a vulnerability, it will be included in the next release. + +## Reporting a Vulnerability + +We recommend that in case of suspected vulnerabilities you do not use the TRACE4CPS public issue tracker, but instead contact the Eclipse Security Team directly via security@eclipse.org. -- GitLab From 57a15cbe005a9b3a45ac5e08ed781bdfdea68e65 Mon Sep 17 00:00:00 2001 From: Yuri Blankenstein Date: Wed, 15 Jun 2022 10:23:04 +0200 Subject: [PATCH 2/5] #10 Add note about using Java8 to developer guide --- docs/developing.asciidoc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/developing.asciidoc b/docs/developing.asciidoc index 2710384..f63f2c4 100644 --- a/docs/developing.asciidoc +++ b/docs/developing.asciidoc @@ -14,18 +14,27 @@ include::_attributes.asciidoc[] include::dev-env-setup.asciidoc[] +[[maven-build]] == Building with Maven +[CAUTION] +==== +{trace} should be built using a _Java 1.8 VM_. +The JDK can be downloaded from e.g. https://www.oracle.com/technetwork/pt/java/javase/downloads/jdk8-downloads-2133151.html[Oracle] or https://adoptium.net/archive.html?variant=openjdk8&jvmVariant=hotspot[Adoptium]. + +To test which Java version is used by Maven, type `mvn -version` in a command shell. +==== + To build {trace} with Maven execute the following command in the root: Linux :: `./build.sh` Windows :: `.\build.cmd` +Other :: `mvn -Dtycho.pomless.aggregator.names=releng,temporallogic,trace,jfreechart` NOTE: In the remainder of this document this command will be referred to as `build.sh` == License header -The Maven build uses https://github.com/mycila/license-maven-plugin[license-maven-plugin] to determine if the link:../releng/legal-defaults/license-header.txt[correct license headers] are used for source files. +The <> uses https://github.com/mycila/license-maven-plugin[license-maven-plugin] to determine if the link:../releng/legal-defaults/license-header.txt[correct license headers] are used for source files. If the header is incorrect the build fails. Handy commands: -- GitLab From 5c81817b0a09e0b6458e52ba62f86ac3d19fc2fc Mon Sep 17 00:00:00 2001 From: Yuri Blankenstein Date: Wed, 15 Jun 2022 15:04:20 +0200 Subject: [PATCH 3/5] #10 Fixing Maven build due to 2022-06 release Eclipse 2022-06 release pulls in new dependencies when executing mwe2 workflow. --- temporallogic/org.eclipse.trace4cps.tl/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/temporallogic/org.eclipse.trace4cps.tl/pom.xml b/temporallogic/org.eclipse.trace4cps.tl/pom.xml index 9f7f408..7971a3c 100644 --- a/temporallogic/org.eclipse.trace4cps.tl/pom.xml +++ b/temporallogic/org.eclipse.trace4cps.tl/pom.xml @@ -111,6 +111,10 @@ org.eclipse.platform org.eclipse.equinox.common + + org.eclipse.platform + org.eclipse.equinox.preferences + org.eclipse.platform org.eclipse.core.runtime -- GitLab From ac182bc84378a7f791434e9de52dd1d8e045db36 Mon Sep 17 00:00:00 2001 From: Yuri Blankenstein Date: Thu, 16 Jun 2022 09:37:10 +0200 Subject: [PATCH 4/5] #10 More flexible solution for Maven build fix https://github.com/eclipse-equinox/equinox.bundles/issues/54 --- temporallogic/org.eclipse.trace4cps.tl/pom.xml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/temporallogic/org.eclipse.trace4cps.tl/pom.xml b/temporallogic/org.eclipse.trace4cps.tl/pom.xml index 7971a3c..150c481 100644 --- a/temporallogic/org.eclipse.trace4cps.tl/pom.xml +++ b/temporallogic/org.eclipse.trace4cps.tl/pom.xml @@ -106,18 +106,12 @@ org.eclipse.xtext org.eclipse.xtext.xtext.generator ${xtext.version} + + org.eclipse.platform - org.eclipse.equinox.common - - - org.eclipse.platform - org.eclipse.equinox.preferences - - - org.eclipse.platform - org.eclipse.core.runtime + * -- GitLab From 6807692903b12686bf102ca1ec1e728b074018f3 Mon Sep 17 00:00:00 2001 From: Yuri Blankenstein Date: Fri, 17 Jun 2022 07:48:08 +0200 Subject: [PATCH 5/5] #10 Add release date to release notes --- releng/org.eclipse.trace4cps.website/adoc/_release-notes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/org.eclipse.trace4cps.website/adoc/_release-notes.adoc b/releng/org.eclipse.trace4cps.website/adoc/_release-notes.adoc index 462953e..3bd6b08 100644 --- a/releng/org.eclipse.trace4cps.website/adoc/_release-notes.adoc +++ b/releng/org.eclipse.trace4cps.website/adoc/_release-notes.adoc @@ -16,7 +16,7 @@ include::_initCommon.adoc[] The release notes of {trace} are listed below, in reverse chronological order. [[release-notes-v0.1]] -=== Version 0.1 +=== Version 0.1 (2022-06-17) The first release of the {trace} project. This version is a port of https://esi.nl/research/output/tools/trace[ESI TRACE v2.0] that is prepared for its release to the Eclipse foundation. -- GitLab