From e1547add2c97f0ff1aaa9f4ed4d156315842f55a Mon Sep 17 00:00:00 2001
From: EL MOUSSAWI Ali Hassan <ali-hassan.el_moussawi@irisa.fr>
Date: Thu, 22 Mar 2018 18:58:37 +0100
Subject: [PATCH] prepare version v1.2.0
---
CHANGELOG.md | 22 ++++++++++++++-----
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
bundles/pom.xml | 2 +-
.../feature.xml | 15 ++++++-------
features/pom.xml | 2 +-
pom.xml | 5 ++---
.../pom.xml | 2 +-
.../category.xml | 5 ++---
.../pom.xml | 2 +-
releng/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
tests/pom.xml | 2 +-
15 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6366e07..356ebda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
# Changelog
+
+## Release version 1.2.0 (22 mars 2018)
+
+* [Mod] separate shell interface to allow multi-shell (for different systems) use.
+* [Mod] Enable debug mode '1' by default
+* [CI] Fix Jenkins pipeline configuration
+* [CI] deploying a release version now automatically update 'gecos-composite' to
+ the latest version in a dedicated branch.
+
+---
+
+## Release version 1.1.0 (19 Jul 2017)
+
+* [Add] a File utility class 'FileUtils'
+
+---
+
## Release version 1.0.0 (07 Jul 2017)
Initial version.
@@ -8,8 +25,3 @@ Migrated GeCoS Framework plugins from SVN repository at
*/trunk/gecos/framework (rev 17741)*
-## Release version 1.1.0 (19 Jul 2017)
-
-### ADD
-* Add a File utility class 'FileUtils'
-
diff --git a/bundles/fr.irisa.r2d2.gecos.cseditor/META-INF/MANIFEST.MF b/bundles/fr.irisa.r2d2.gecos.cseditor/META-INF/MANIFEST.MF
index 675b002..1ed3ce3 100644
--- a/bundles/fr.irisa.r2d2.gecos.cseditor/META-INF/MANIFEST.MF
+++ b/bundles/fr.irisa.r2d2.gecos.cseditor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %CSEditorPlugin.name
Bundle-Vendor: %CSEditorPlugin.providerName
Bundle-SymbolicName: fr.irisa.r2d2.gecos.cseditor; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Activator: fr.irisa.r2d2.gecos.cseditor.CSEditorPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.variables,
diff --git a/bundles/fr.irisa.r2d2.gecos.doc/META-INF/MANIFEST.MF b/bundles/fr.irisa.r2d2.gecos.doc/META-INF/MANIFEST.MF
index f9060c2..9f75117 100644
--- a/bundles/fr.irisa.r2d2.gecos.doc/META-INF/MANIFEST.MF
+++ b/bundles/fr.irisa.r2d2.gecos.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Gecos Documentation Plugin
Bundle-SymbolicName: fr.irisa.r2d2.gecos.doc;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
diff --git a/bundles/fr.irisa.r2d2.gecos.framework/META-INF/MANIFEST.MF b/bundles/fr.irisa.r2d2.gecos.framework/META-INF/MANIFEST.MF
index 935a816..a3141fe 100644
--- a/bundles/fr.irisa.r2d2.gecos.framework/META-INF/MANIFEST.MF
+++ b/bundles/fr.irisa.r2d2.gecos.framework/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Gecos Framework
Bundle-SymbolicName: fr.irisa.r2d2.gecos.framework; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Activator: fr.irisa.r2d2.gecos.framework.internal.GecosInternalFramework
Bundle-ActivationPolicy: lazy
Export-Package: fr.irisa.r2d2.gecos.framework,
diff --git a/bundles/fr.irisa.r2d2.parser.runtime/META-INF/MANIFEST.MF b/bundles/fr.irisa.r2d2.parser.runtime/META-INF/MANIFEST.MF
index 20006ab..5ec5e61 100644
--- a/bundles/fr.irisa.r2d2.parser.runtime/META-INF/MANIFEST.MF
+++ b/bundles/fr.irisa.r2d2.parser.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Parser Runtime Plug-in
Bundle-SymbolicName: fr.irisa.r2d2.parser.runtime;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Export-Package: fr.irisa.r2d2.parser.runtime,
java_cup.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/bundles/pom.xml b/bundles/pom.xml
index c19d44a..2690bcd 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>fr.irisa.cairn.gecos.framework</groupId>
<artifactId>fr.irisa.cairn.gecos.framework.root</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/features/fr.irisa.cairn.gecos.framework.feature/feature.xml b/features/fr.irisa.cairn.gecos.framework.feature/feature.xml
index 7352ccd..8744253 100644
--- a/features/fr.irisa.cairn.gecos.framework.feature/feature.xml
+++ b/features/fr.irisa.cairn.gecos.framework.feature/feature.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="fr.irisa.cairn.gecos.framework.feature" label="GeCoS Framework" version="1.1.0.qualifier" provider-name="IRISA/INRIA">
+<feature id="fr.irisa.cairn.gecos.framework.feature" label="GeCoS Framework" version="1.2.0.qualifier" provider-name="IRISA/INRIA">
<description url="http://gecos.gforge.inria.fr/">
GeCoS Framework (script editor, compiler, and Eclipse UI extensions).
@@ -19,7 +18,7 @@ CAIRN Team - INRIA/IRISA - initial API and implementation
<license url="http://www.eclipse.org/org/documents/epl-v10.php">
Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
1. DEFINITIONS
@@ -32,7 +31,7 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICE
ii)additions to the Program;
- where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor’s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+ where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor’s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
"Contributor" means any person or entity that distributes the Program.
@@ -48,7 +47,7 @@ a) Subject to the terms of this Agreement, each Contributor hereby grants Recipi
b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient’s responsibility to acquire that license before distributing the Program.
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient’s responsibility to acquire that license before distributing the Program.
d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
@@ -82,7 +81,7 @@ Each Contributor must identify itself as the originator of its Contribution, if
Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor’s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor’s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
5. NO WARRANTY
@@ -96,9 +95,9 @@ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTR
If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient’s patent(s), then such Recipient’s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient’s patent(s), then such Recipient’s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-All Recipient’s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient’s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient’s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+All Recipient’s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient’s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient’s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
diff --git a/features/pom.xml b/features/pom.xml
index caddb17..bdb9052 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>fr.irisa.cairn.gecos.framework</groupId>
<artifactId>fr.irisa.cairn.gecos.framework.root</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 4063e56..79158f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.irisa.cairn.gecos.framework</groupId>
<artifactId>fr.irisa.cairn.gecos.framework.root</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<packaging>pom</packaging>
<parent>
@@ -16,7 +16,7 @@
<properties>
<target.groupId>fr.irisa.cairn.gecos.framework</target.groupId>
<target.artifactId>fr.irisa.cairn.gecos.framework.target</target.artifactId>
- <target.version>1.1.1-SNAPSHOT</target.version>
+ <target.version>1.2.0</target.version>
</properties>
<scm>
@@ -31,4 +31,3 @@
</modules>
</project>
-
diff --git a/releng/fr.irisa.cairn.gecos.framework.target/pom.xml b/releng/fr.irisa.cairn.gecos.framework.target/pom.xml
index 0b1b107..4dc8b2a 100644
--- a/releng/fr.irisa.cairn.gecos.framework.target/pom.xml
+++ b/releng/fr.irisa.cairn.gecos.framework.target/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>fr.irisa.cairn.gecos.framework</groupId>
<artifactId>fr.irisa.cairn.gecos.framework.releng</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/fr.irisa.cairn.gecos.framework.update/category.xml b/releng/fr.irisa.cairn.gecos.framework.update/category.xml
index 5787ddd..b054a12 100644
--- a/releng/fr.irisa.cairn.gecos.framework.update/category.xml
+++ b/releng/fr.irisa.cairn.gecos.framework.update/category.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
<site>
<description name="GeCoS Framework Update Site" url="http://gecos.gforge.inria.fr/updatesite/gecos/framework/">
GeCoS Framework update site
</description>
- <feature id="fr.irisa.cairn.gecos.framework.feature" version="1.1.0.qualifier">
+ <feature id="fr.irisa.cairn.gecos.framework.feature" version="1.2.0.qualifier">
<category name="Framework"/>
</feature>
<!-- source features (and their bundles) are automatically generated by maven when using "release" profile -->
- <feature id="fr.irisa.cairn.gecos.framework.feature.source" version="1.1.0.qualifier">
+ <feature id="fr.irisa.cairn.gecos.framework.feature.source" version="1.2.0.qualifier">
<category name="Framework"/>
</feature>
diff --git a/releng/fr.irisa.cairn.gecos.framework.update/pom.xml b/releng/fr.irisa.cairn.gecos.framework.update/pom.xml
index e0336c3..0595b57 100644
--- a/releng/fr.irisa.cairn.gecos.framework.update/pom.xml
+++ b/releng/fr.irisa.cairn.gecos.framework.update/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>fr.irisa.cairn.gecos.framework</groupId>
<artifactId>fr.irisa.cairn.gecos.framework.releng</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/pom.xml b/releng/pom.xml
index 09c01b5..e33c52b 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>fr.irisa.cairn.gecos.framework</groupId>
<artifactId>fr.irisa.cairn.gecos.framework.root</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/tests/fr.irisa.cairn.gecos.framework.unit.tests/META-INF/MANIFEST.MF b/tests/fr.irisa.cairn.gecos.framework.unit.tests/META-INF/MANIFEST.MF
index 2418bc8..fdd004c 100644
--- a/tests/fr.irisa.cairn.gecos.framework.unit.tests/META-INF/MANIFEST.MF
+++ b/tests/fr.irisa.cairn.gecos.framework.unit.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tests
Bundle-SymbolicName: fr.irisa.cairn.gecos.framework.unit.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: fr.irisa.r2d2.gecos.framework;bundle-version="1.0.0",
org.junit;bundle-version="4.12.0"
diff --git a/tests/pom.xml b/tests/pom.xml
index ebbae0a..94e182c 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>fr.irisa.cairn.gecos.framework</groupId>
<artifactId>fr.irisa.cairn.gecos.framework.root</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<relativePath>..</relativePath>
</parent>
--
GitLab