Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 8ed5a30b authored by EL MOUSSAWI Ali Hassan's avatar EL MOUSSAWI Ali Hassan
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !2
parents 29f9a67b cb77c918
No related branches found
No related tags found
1 merge request!2Develop
Showing
with 61 additions and 81 deletions
...@@ -35,7 +35,7 @@ image: maven:3-jdk-8 ...@@ -35,7 +35,7 @@ image: maven:3-jdk-8
.jenkins_build: &jenkins_build .jenkins_build: &jenkins_build
before_script: before_script:
- gecos-buildtools/scripts/build_on_jenkins.sh "${JENKINS_USER}" "${JENKINS_TOKEN}" "${CI_PROJECT_NAME}" - gecos-buildtools/scripts/build_on_jenkins.sh "${JENKINS_USER}" "${JENKINS_TOKEN}" "${CI_PROJECT_NAME}"
"${CI_COMMIT_SHA}" "${CI_COMMIT_REF_NAME}" "${UPSITE_ARTIFACTS_DIR}" "${CI_COMMIT_SHA}" "${JENKINS_FAIL_MODE}" "${CI_COMMIT_REF_NAME}" "${UPSITE_ARTIFACTS_DIR}"
build: build:
<<: *jenkins_build <<: *jenkins_build
...@@ -58,10 +58,14 @@ build: ...@@ -58,10 +58,14 @@ build:
before_script: before_script:
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
- ssh-add <(echo "${CI_BOT_SSH_PRIVATE_KEY}")
# check host
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- '[[ -f /.dockerenv ]] && echo "${GFORGE_SSH_SERVER_HOSTKEYS}" > ~/.ssh/known_hosts' - echo "${CI_BOT_SSH_PRIVATE_KEY}" > ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- ssh-add ~/.ssh/id_rsa
# - '[[ -f /.dockerenv ]] && echo "${GFORGE_SSH_SERVER_HOSTKEYS}" > ~/.ssh/known_hosts'
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
- git config --global user.email "gecos-ci-bot@users.gforge.inria.fr"
- git config --global user.name "gecos-ci-bot"
# Perform deploy to ${UPSITE_SSH_HOSTNAME} using ssh in 'script' # Perform deploy to ${UPSITE_SSH_HOSTNAME} using ssh in 'script'
......
## Release version 1.1.0 (13 juin 2018)
* move objStatusUpdate back into finally block, after releasing semaphore
* move objStatusUpdate (calls to taken) to before the JNI call (used to be after)
* changed the placement of taken() calls to ensure semaphores are released
* [CI] gitlab-ci can now use variable 'JENKINSi\_FAIL\_MODE' to specify the behaviour depending on test results:
* [CI] fix Jenkins pipeline configuration
* [CI] deploying a release version now automatically update 'gecos-composite' to the latest version in a dedicated branch.
* fix connection section in pom.xml
* [Releng] update module 'gecos-buildtools' to latest version.
---
...@@ -20,22 +20,8 @@ pipeline { ...@@ -20,22 +20,8 @@ pipeline {
} }
steps { steps {
sh "mvn -B -e -fae -P release -DskipTests clean install dependency:go-offline" sh "mvn -B -e -fae -P release -Dmaven.test.failure.ignore clean integration-test"
archiveArtifacts artifacts: "releng/*.update/target/*.update-*.zip" archiveArtifacts artifacts: "releng/*.update/target/*.update-*.zip"
}
}
stage('Test') {
tools {
maven 'Maven 3'
}
environment {
MAVEN_OPTS = "-Xmx3072m"
}
steps {
sh "mvn -B -e -fae -o -Dmaven.test.failure.ignore=true integration-test"
junit allowEmptyResults: true, testResults: "**/target/surefire-reports/TEST-*.xml" junit allowEmptyResults: true, testResults: "**/target/surefire-reports/TEST-*.xml"
jacoco execPattern: 'tests/**/target/*.exec', jacoco execPattern: 'tests/**/target/*.exec',
sourcePattern: 'bundles/**/src,bundles/**/src-gen,bundles/**/xtend-gen,bundles/**/xcore-gen', sourcePattern: 'bundles/**/src,bundles/**/src-gen,bundles/**/xtend-gen,bundles/**/xcore-gen',
......
...@@ -2,7 +2,7 @@ Manifest-Version: 1.0 ...@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: fr.irisa.cairn.jnimap.generator Bundle-Name: fr.irisa.cairn.jnimap.generator
Bundle-Vendor: University of Rennes 1 Bundle-Vendor: University of Rennes 1
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.1.0.qualifier
Bundle-SymbolicName: fr.irisa.cairn.jnimap.generator;singleton:=true Bundle-SymbolicName: fr.irisa.cairn.jnimap.generator;singleton:=true
Require-Bundle: org.eclipse.xpand;visibility:=reexport, Require-Bundle: org.eclipse.xpand;visibility:=reexport,
org.eclipse.xtend;visibility:=reexport, org.eclipse.xtend;visibility:=reexport,
......
source.. = src/,\ source.. = src/,\
src-gen/,\
xtend-gen/,\ xtend-gen/,\
xtend-src/ xtend-src/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
......
...@@ -656,11 +656,11 @@ public abstract class AbstractWrapper { ...@@ -656,11 +656,11 @@ public abstract class AbstractWrapper {
_builder.append("} finally {"); _builder.append("} finally {");
_builder.newLine(); _builder.newLine();
_builder.append("\t"); _builder.append("\t");
_builder.append(objStatusUpdate, "\t");
_builder.newLineIfNotEmpty();
_builder.append("\t");
_builder.append("semISLCall.release();"); _builder.append("semISLCall.release();");
_builder.newLine(); _builder.newLine();
_builder.append("\t");
_builder.append(objStatusUpdate, "\t");
_builder.newLineIfNotEmpty();
_builder.append("}"); _builder.append("}");
_builder.newLine(); _builder.newLine();
} }
......
...@@ -208,8 +208,8 @@ abstract class AbstractWrapper { ...@@ -208,8 +208,8 @@ abstract class AbstractWrapper {
«IF hasReturn»res = «ENDIF»«mainCall»«IF returnBool» != 0«ENDIF»; «IF hasReturn»res = «ENDIF»«mainCall»«IF returnBool» != 0«ENDIF»;
«IF useSemaphore(m.ID)» «IF useSemaphore(m.ID)»
} finally { } finally {
«objStatusUpdate»
semISLCall.release(); semISLCall.release();
«objStatusUpdate»
} }
«ENDIF» «ENDIF»
«IF hasReturn» «IF hasReturn»
......
...@@ -2,7 +2,7 @@ Manifest-Version: 1.0 ...@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: JNIMap Runtime Bundle-Name: JNIMap Runtime
Bundle-SymbolicName: fr.irisa.cairn.jnimap.runtime Bundle-SymbolicName: fr.irisa.cairn.jnimap.runtime
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: IRISA Bundle-Vendor: IRISA
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: fr.irisa.cairn.jnimap.runtime Export-Package: fr.irisa.cairn.jnimap.runtime
...@@ -2,7 +2,7 @@ Manifest-Version: 1.0 ...@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: fr.irisa.cairn.jnimap.ui Bundle-Name: fr.irisa.cairn.jnimap.ui
Bundle-Vendor: University of Rennes 1 Bundle-Vendor: University of Rennes 1
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.1.0.qualifier
Bundle-SymbolicName: fr.irisa.cairn.jnimap.ui;singleton:=true Bundle-SymbolicName: fr.irisa.cairn.jnimap.ui;singleton:=true
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext.ui, Require-Bundle: org.eclipse.xtext.ui,
......
...@@ -2,7 +2,7 @@ Manifest-Version: 1.0 ...@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: fr.irisa.cairn.jnimap Bundle-Name: fr.irisa.cairn.jnimap
Bundle-Vendor: University of Rennes 1 Bundle-Vendor: University of Rennes 1
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.1.0.qualifier
Bundle-SymbolicName: fr.irisa.cairn.jnimap;singleton:=true Bundle-SymbolicName: fr.irisa.cairn.jnimap;singleton:=true
Require-Bundle: org.eclipse.xtext;visibility:=reexport, Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport, org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId> <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
<artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId> <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
<version>1.0.0</version> <version>1.1.0</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
......
<?xml version="1.0" encoding="UTF-8"?> <feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature" label="GeCoS JNI Mapper Tools" version="1.1.0.qualifier" provider-name="IRISA/INRIA">
<feature
id="fr.irisa.cairn.gecos.tools.jnimapper.feature"
label="GeCoS JNI Mapper Tools"
version="1.0.0.qualifier"
provider-name="IRISA/INRIA">
<description url="http://gecos.gforge.inria.fr/"> <description url="http://gecos.gforge.inria.fr/">
GeCoS JNI mapper DSL (Xtext-based). GeCoS JNI mapper DSL (Xtext-based).
...@@ -23,11 +18,11 @@ CAIRN Team - INRIA/IRISA - initial API and implementation ...@@ -23,11 +18,11 @@ CAIRN Team - INRIA/IRISA - initial API and implementation
<license url="http://www.eclipse.org/org/documents/epl-v10.php"> <license url="http://www.eclipse.org/org/documents/epl-v10.php">
Eclipse Public License - v 1.0 Eclipse Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENTS 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&#x2019;S ACCEPTANCE OF THIS AGREEMENT.
1. DEFINITIONS 1. DEFINITIONS
&quot;Contribution&quot; means: "Contribution" means:
a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
b) in the case of each subsequent Contributor: b) in the case of each subsequent Contributor:
...@@ -36,15 +31,15 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICE ...@@ -36,15 +31,15 @@ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICE
ii)additions to the Program; 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 &apos;originates&apos; from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributors 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&#x2019;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.
&quot;Contributor&quot; means any person or entity that distributes the Program. "Contributor" means any person or entity that distributes the Program.
&quot;Licensed Patents &quot; mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. "Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
&quot;Program&quot; means the Contributions distributed in accordance with this Agreement. "Program" means the Contributions distributed in accordance with this Agreement.
&quot;Recipient&quot; means anyone who receives the Program under this Agreement, including all Contributors. "Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
2. GRANT OF RIGHTS 2. GRANT OF RIGHTS
...@@ -52,7 +47,7 @@ a) Subject to the terms of this Agreement, each Contributor hereby grants Recipi ...@@ -52,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. 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 Recipients 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&#x2019;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. 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.
...@@ -84,13 +79,13 @@ Each Contributor must identify itself as the originator of its Contribution, if ...@@ -84,13 +79,13 @@ Each Contributor must identify itself as the originator of its Contribution, if
4. COMMERCIAL DISTRIBUTION 4. COMMERCIAL DISTRIBUTION
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 (&quot;Commercial Contributor&quot;) hereby agrees to defend and indemnify every other Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and costs (collectively &quot;Losses&quot;) 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. 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 Contributors 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&#x2019;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 5. NO WARRANTY
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
6. DISCLAIMER OF LIABILITY 6. DISCLAIMER OF LIABILITY
...@@ -100,9 +95,9 @@ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTR ...@@ -100,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 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 Recipients patent(s), then such Recipients 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&#x2019;s patent(s), then such Recipient&#x2019;s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
All Recipients 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 Recipients rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipients obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. All Recipient&#x2019;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&#x2019;s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient&#x2019;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. 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.
...@@ -119,27 +114,11 @@ This Agreement is governed by the laws of the State of New York and the intellec ...@@ -119,27 +114,11 @@ This Agreement is governed by the laws of the State of New York and the intellec
<import feature="fr.irisa.cairn.gecos.tools.emf.feature" version="1.0.0" match="greaterOrEqual"/> <import feature="fr.irisa.cairn.gecos.tools.emf.feature" version="1.0.0" match="greaterOrEqual"/>
</requires> </requires>
<plugin <plugin id="fr.irisa.cairn.jnimap" download-size="0" install-size="0" version="0.0.0"/>
id="fr.irisa.cairn.jnimap"
download-size="0" <plugin id="fr.irisa.cairn.jnimap.generator" download-size="0" install-size="0" version="0.0.0"/>
install-size="0" <plugin id="fr.irisa.cairn.jnimap.runtime" download-size="0" install-size="0" version="0.0.0"/>
version="0.0.0"/>
<plugin id="fr.irisa.cairn.jnimap.ui" download-size="0" install-size="0" version="0.0.0"/>
<plugin
id="fr.irisa.cairn.jnimap.generator"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="fr.irisa.cairn.jnimap.runtime"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="fr.irisa.cairn.jnimap.ui"
download-size="0"
install-size="0"
version="0.0.0"/>
</feature> </feature>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId> <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
<artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId> <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
<version>1.0.0</version> <version>1.1.0</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
......
Subproject commit 95cc77d56574295197d70b7aece2f9d88888df72 Subproject commit fdc8ff68b5ef03ba31ad8d93420d432d44427c75
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId> <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
<artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId> <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
<version>1.0.0</version> <version>1.1.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
<properties> <properties>
<target.groupId>fr.irisa.cairn.gecos.tools.jnimapper</target.groupId> <target.groupId>fr.irisa.cairn.gecos.tools.jnimapper</target.groupId>
<target.artifactId>fr.irisa.cairn.gecos.tools.jnimapper.target</target.artifactId> <target.artifactId>fr.irisa.cairn.gecos.tools.jnimapper.target</target.artifactId>
<target.version>1.0.0</target.version> <target.version>1.1.0</target.version>
</properties> </properties>
<scm> <scm>
<connection>scm:git:https://gitlab.inria.fr/gecos/gecos.tools.jnimapper.git</connection> <connection>scm:git:https://gitlab.inria.fr/gecos/gecos-tools-jnimapper.git</connection>
</scm> </scm>
<modules> <modules>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId> <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
<artifactId>fr.irisa.cairn.gecos.tools.jnimapper.releng</artifactId> <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.releng</artifactId>
<version>1.0.0</version> <version>1.1.0</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
GeCoS JNI Mapper update site GeCoS JNI Mapper update site
</description> </description>
<feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature" version="1.0.0.qualifier"> <feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature" version="1.1.0.qualifier">
<category name="jni"/> <category name="jni"/>
</feature> </feature>
<!-- source features (and their bundles) are automatically generated by maven when using "release" profile --> <!-- source features (and their bundles) are automatically generated by maven when using "release" profile -->
<feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature.source" version="1.0.0.qualifier"> <feature id="fr.irisa.cairn.gecos.tools.jnimapper.feature.source" version="1.1.0.qualifier">
<category name="jni"/> <category name="jni"/>
</feature> </feature>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId> <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
<artifactId>fr.irisa.cairn.gecos.tools.jnimapper.releng</artifactId> <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.releng</artifactId>
<version>1.0.0</version> <version>1.1.0</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId> <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
<artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId> <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
<version>1.0.0</version> <version>1.1.0</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId> <groupId>fr.irisa.cairn.gecos.tools.jnimapper</groupId>
<artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId> <artifactId>fr.irisa.cairn.gecos.tools.jnimapper.root</artifactId>
<version>1.0.0</version> <version>1.1.0</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment