Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-05-28 10:06:24 -0400
committerOlivier Constant2018-05-28 10:06:24 -0400
commitc50ffd9d3c7866182624fb07c21961ba54d954c6 (patch)
tree76f4a1173a018aba365f001a9d2264cb01c4f7b3
parent12299f9e3e99575b9fecde26d054719d080d9dfa (diff)
downloadorg.eclipse.emf.diffmerge.patch-c50ffd9d3c7866182624fb07c21961ba54d954c6.tar.gz
org.eclipse.emf.diffmerge.patch-c50ffd9d3c7866182624fb07c21961ba54d954c6.tar.xz
org.eclipse.emf.diffmerge.patch-c50ffd9d3c7866182624fb07c21961ba54d954c6.zip
[releng] Update of contribution/notice files and EDM version
Change-Id: I926713dbb59930d0fa867a5de25510ca424f408b Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--CONTRIBUTING.txt71
-rw-r--r--NOTICE.txt56
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF4
4 files changed, 98 insertions, 35 deletions
diff --git a/CONTRIBUTING.txt b/CONTRIBUTING.txt
index 9e4c82f..12d99cb 100644
--- a/CONTRIBUTING.txt
+++ b/CONTRIBUTING.txt
@@ -1,53 +1,60 @@
-Contributing to EMF Diff/Merge
-==============================
+# Contributing to EMF Diff/Merge
Thanks for your interest in this project.
+## Project description
-Project description:
---------------------
+Eclipse EMF Diff/Merge is a diff/merge tool for models. Its main purpose is to
+help build higher-level tools that need to merge models based on consistency
+rules. GUI components are also provided. Typical usages include model
+refactoring, iterative model transformations, bridges between models or modeling
+tools, collaborative modeling environments, or versioning systems.
-EMF Diff/Merge is a diff/merge tool for models. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. GUI components are also provided. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or versioning systems.
-Link: EMF Diff/Merge Wiki
+* https://projects.eclipse.org/projects/modeling.emf.diffmerge
+* http://wiki.eclipse.org/EMF_DiffMerge
-- http://wiki.eclipse.org/EMF_DiffMerge
+## Developer resources
+Information regarding source code management, builds, coding standards, and
+more.
-Developer resources:
---------------------
+* https://projects.eclipse.org/projects/modeling.emf.diffmerge/developer
+* http://wiki.eclipse.org/EMF_DiffMerge
-Information regarding source code management, builds, coding standards, and more.
+The project maintains the following source code repositories
-- http://wiki.eclipse.org/EMF_DiffMerge/Developer
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.core.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.patterns.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.coevolution.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.patch.git
+This project uses Bugzilla to track ongoing development and issues.
-Contributor License Agreement:
-------------------------------
-
-Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Contributor Agreement (ECA).
-
-- https://www.eclipse.org/legal/ECA.php
-
-
-Contact:
---------
-
-Contact the project developers via the project's "dev" list.
+* Search for issues: https://eclipse.org/bugs/buglist.cgi?product=EMF.Diffmerge
+* Create a new report:
+ https://eclipse.org/bugs/enter_bug.cgi?product=EMF.Diffmerge
-- https://dev.eclipse.org/mailman/listinfo/diffmerge-dev
+Be sure to search for existing bugs before you create another one. Remember that
+contributions are always welcome!
+## Eclipse Contributor Agreement
-Search for bugs:
-----------------
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
-This project uses Bugzilla to track ongoing development and issues.
+* http://www.eclipse.org/legal/ECA.php
-- https://bugs.eclipse.org/bugs/buglist.cgi?product=EMF.Diffmerge
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
-Create a new bug:
------------------
+## Contact
-Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+Contact the project developers via the project's "dev" list.
-- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EMF.Diffmerge \ No newline at end of file
+* https://dev.eclipse.org/mailman/listinfo/diffmerge-dev
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 0000000..4556085
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,56 @@
+# Notices for EMF Diff/Merge
+
+This content is produced and maintained by the Eclipse EMF Diff/Merge project.
+
+* Project home: https://projects.eclipse.org/projects/modeling.emf.diffmerge
+
+## Trademarks
+
+Eclipse EMF Diff/Merge, and EMF Diff/Merge are trademarks of the Eclipse
+Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 1.0 which is available at
+http://www.eclipse.org/legal/epl-v10.html.
+
+SPDX-License-Identifier: EPL-1.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.core.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.patterns.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.coevolution.git
+* http://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.patch.git
+
+## Third-party Content
+
+Google Gson (2.2.4)
+
+* License: Apache License, 2.0
+
+Google Guava (15.0.0)
+
+* License: Apache License, 2.0
+
+log4j (1.2.15)
+
+* License: Apache License, 2.0
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF
index f945822..b855ed4 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.patch.runtime/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.runtime
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.emf.diffmerge;bundle-version="[0.7.0,0.10.0)",
+Require-Bundle: org.eclipse.emf.diffmerge;bundle-version="[0.7.0,0.10.0]",
org.eclipse.emf.diffmerge.patch;bundle-version="[0.1.0,0.2.0)",
org.eclipse.emf.ecore;bundle-version="2.10.2",
org.eclipse.emf.edit;bundle-version="2.11.0",
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF
index 05ce06d..12a2d26 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.emf.diffmerge.patch.ui;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.emf.common.ui;bundle-version="2.10.0",
- org.eclipse.emf.diffmerge;bundle-version="[0.7.0,0.10.0)",
+ org.eclipse.emf.diffmerge;bundle-version="[0.7.0,0.10.0]",
org.eclipse.core.resources,
com.google.guava;bundle-version="15.0.0",
org.eclipse.xtend.lib,
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.emf.common.ui;bundle-version="2.10.0",
org.eclipse.jface.databinding,
org.eclipse.emf.diffmerge.patch.runtime;bundle-version="[0.1.0,0.2.0)",
org.eclipse.ui.ide,
- org.eclipse.emf.diffmerge.ui;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.emf.diffmerge.ui;bundle-version="[0.9.0,0.10.0]",
org.eclipse.viatra.query.runtime.base;bundle-version="[1.4.0,2.0.0)",
org.eclipse.emf.diffmerge.patch.persistence.json;bundle-version="[0.1.0,0.2.0)",
org.eclipse.emf.diffmerge.patch.persistence.emf;bundle-version="[0.1.0,0.2.0)"

Back to the top