Change-Id: Id86724842e819f5335a32c1fb68b595fceed0405

Merge remote-tracking branch 'Polarsys/562302-Implement-unit-tests-for-existing-features' into neon-orig

Signed-off-by: Nicholas Pacini <nicholas.pacini@intecs.it>

Change-Id: I1bea7abf7bee1722e2db1a22c3306e59ebce78bd

Change-Id: I79ee991519431bbb5c0f239bce7ac7c5917f01b1

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>

Change-Id: I09a7b27be424c329b421a36db884ffd571e2bcb7

Conflicts:
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/.classpath
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/META-INF/MANIFEST.MF
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/plugin.xml_gen
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/FlaDslUiModule.java
	plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/contentassist/FlaDslProposalProvider.xtend
	plugins/fla/org.polarsys.chess.xtext.fladsl/.classpath
	plugins/fla/org.polarsys.chess.xtext.fladsl/META-INF/MANIFEST.MF
	plugins/fla/org.polarsys.chess.xtext.fladsl/plugin.xml_gen
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslRuntimeModule.java
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/FlaDslStandaloneSetup.java
	plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend

Change-Id: I53087b42678e799d1486c9ffc95f7d067c904987

neon

Conflicts:
	plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/util/EntityUtil.java

Change-Id: Ic71a82e6298bac55dc19b7a28b9ec78c4c3fe74d

Change-Id: I276bc62b5d825213b69c65a43c0e1946c6783268

Change-Id: I03b08c8e852ca377398949ce2203cc5ed44a6603

Change-Id: I03488353081aa90d389d6cf7ecc72d6dae991501

updated site.xml

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>

Change-Id: If24c76035787c989e31614b973528e8ebe03810d

Change-Id: Id69d76b935b56b7803b32400364fec3048b3a72c

Change-Id: I8e80e10ceef2b9ba1e4cda1da5afa02f56edc96f

Change-Id: Ieda556bd121483919e0659584b357bfb513c1418

Change-Id: I2cb9c69d1c3fe1f446a68e9c1b5dabc6c350d617

Change-Id: I7828382967377c53dddf419e72cce0da07ae9806

Change-Id: I8258649f3b1b1be4d6b6b5485ae016c25f47d5be

Change-Id: If1457cd3177cf169d9f04c8fe66fc25110b70a11

Change-Id: I3960bd6a10dce373d5e791071bb7ec3224edf6ce

Change-Id: I4078435626a2250d72fdc9f8c4869058c2fac086

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>

Signed-off-by: Nicholas Pacini <nicholas.pacini@intecs.it>

valid_property, contract_refin tests.

Change-Id: Iad573223beb9058e27978fc4d7fe7a1aa0570698

Signed-off-by: Stefano Puri <stefano.puri@intecs.it>

Change-Id: Ic85e982f6e05b2363f6f3226888b371bc55b8813

Change-Id: Id2f57b35fe17473afa047a42718ef712ba8e82c0

Change-Id: I67bb6927a90d8121390571be338beff3c146b5e9

Resolve "Mavenize FLA DSL Plugins"

Closes #248

See merge request CPS_Design/CHESS!57