diff options
author | Axel Richard | 2015-07-07 09:50:59 +0000 |
---|---|---|
committer | Axel RICHARD | 2015-07-07 10:35:56 +0000 |
commit | 9afd308f73ce27c0e7f09edfe6533adeed8df500 (patch) | |
tree | 343e841791eddd6cad1a664774a76ae84a393c0c /org.eclipse.emf.compare-parent | |
parent | 5b53964f614a68b5c33c26bd9f90e122f4caa6e3 (diff) | |
download | org.eclipse.emf.compare-9afd308f73ce27c0e7f09edfe6533adeed8df500.tar.gz org.eclipse.emf.compare-9afd308f73ce27c0e7f09edfe6533adeed8df500.tar.xz org.eclipse.emf.compare-9afd308f73ce27c0e7f09edfe6533adeed8df500.zip |
Update Mars TPs with jdt.annotation plugin
Also update mockito version
Change-Id: I97830e51a9499ccd37c63fe26b9fdd7d42c3d411
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Diffstat (limited to 'org.eclipse.emf.compare-parent')
12 files changed, 62 insertions, 15 deletions
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd index 3e31b8fb1..ca06e9c6f 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd +++ b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd @@ -11,6 +11,6 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/R2015051921075 org.apache.commons.compress org.kohsuke.args4j /* Egit/Jgit */ - org.mockito + org.mockito [1.8.0,1.9.0) org.hamcrest } diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target index f88e4e72d..d78128931 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target +++ b/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="EMF Compare based on Helios SDK" sequenceNumber="1433172537"> +<target name="EMF Compare based on Helios SDK" sequenceNumber="1436263567"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/> @@ -14,7 +14,7 @@ <unit id="javaewah" version="0.7.9.v201401101600"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> - <unit id="org.mockito" version="1.9.5.v201311280930"/> + <unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> </location> diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target index cf2951430..fff92d5a6 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target +++ b/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="EMF Compare based on Indigo SDK" sequenceNumber="1433172441"> +<target name="EMF Compare based on Indigo SDK" sequenceNumber="1436263557"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/> @@ -14,7 +14,7 @@ <unit id="javaewah" version="0.7.9.v201401101600"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> - <unit id="org.mockito" version="1.9.5.v201311280930"/> + <unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> </location> diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target index 76ece4af3..1dee83cd1 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target +++ b/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="EMF Compare based on Juno SDK" sequenceNumber="1433172423"> +<target name="EMF Compare based on Juno SDK" sequenceNumber="1436263542"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/> @@ -14,7 +14,7 @@ <unit id="javaewah" version="0.7.9.v201401101600"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> - <unit id="org.mockito" version="1.9.5.v201311280930"/> + <unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> </location> diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/kepler-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/kepler-sdk.target index 4341f6a89..2aac2fd25 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/kepler-sdk.target +++ b/org.eclipse.emf.compare-parent/targetPlatforms/kepler-sdk.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="EMF Compare based on Kepler SDK" sequenceNumber="1433172327"> +<target name="EMF Compare based on Kepler SDK" sequenceNumber="1436263533"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/> @@ -14,7 +14,7 @@ <unit id="javaewah" version="0.7.9.v201401101600"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> - <unit id="org.mockito" version="1.9.5.v201311280930"/> + <unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> </location> diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target index e8ecd3a8e..8763e538a 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target +++ b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="EMF Compare based on Luna SDK" sequenceNumber="1433172121"> +<target name="EMF Compare based on Luna SDK" sequenceNumber="1436263514"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/> @@ -14,7 +14,7 @@ <unit id="javaewah" version="0.7.9.v201401101600"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> - <unit id="org.mockito" version="1.9.5.v201311280930"/> + <unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> </location> diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target index 8978f0b1c..775f157ec 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target +++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="EMF Compare based on Mars SDK" sequenceNumber="1433171371"> +<target name="EMF Compare based on Mars SDK" sequenceNumber="1436262546"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/> @@ -14,7 +14,7 @@ <unit id="javaewah" version="0.7.9.v201401101600"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> - <unit id="org.mockito" version="1.9.5.v201311280930"/> + <unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> </location> @@ -44,6 +44,7 @@ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/> + <unit id="org.eclipse.jdt.annotation" version="1.1.100.v20140704-0625"/> <repository location="http://download.eclipse.org/releases/mars"/> </location> </locations> diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd index d483995fc..6d94a3c7a 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd +++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd @@ -22,4 +22,5 @@ location "http://download.eclipse.org/releases/mars" { org.eclipse.papyrus.sdk.feature.feature.group lazy org.eclipse.emf.ecoretools.sdk.feature.group lazy org.eclipse.team.svn.feature.group lazy + org.eclipse.jdt.annotation [1.1.100,2.0.0) } diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.target new file mode 100644 index 000000000..7b3bcbb33 --- /dev/null +++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.target @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> +<target name="EMF Compare based on Mars SDK" sequenceNumber="1436260762"> + <locations> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/> + <repository location="http://download.eclipse.org/cbi/updates/license"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="com.google.guava" version="11.0.2.v201303041551"/> + <unit id="org.junit" version="4.12.0.v201504281640"/> + <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> + <unit id="javaewah" version="0.7.9.v201401101600"/> + <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> + <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> + <unit id="org.mockito" version="1.8.4.v201303031500"/> + <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> + <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.egit.feature.group" version="0.0.0"/> + <repository location="http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="fr.obeo.performance" version="1.0.0.201402071743"/> + <repository location="http://axelrichard.github.io/fr.obeo.performance/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.platform.sdk" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/> + <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/> + <unit id="org.eclipse.jdt.annotation" version="1.1.100.v20140704-0625"/> + <repository location="http://download.eclipse.org/releases/mars"/> + </location> + </locations> +</target> diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd index 2ff87b95a..5451eff6a 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd +++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd @@ -21,4 +21,5 @@ location "http://download.eclipse.org/releases/mars" { org.eclipse.emf.ecoretools.sdk.feature.group lazy org.eclipse.papyrus.sdk.feature.feature.group lazy org.eclipse.team.svn.feature.group lazy + org.eclipse.jdt.annotation [1.1.100,2.0.0) } diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target index 44d7c446a..2030f1cee 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target +++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="EMF Compare based on Mars SDK" sequenceNumber="1433171291"> +<target name="EMF Compare based on Mars SDK" sequenceNumber="1436262511"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/> @@ -14,7 +14,7 @@ <unit id="javaewah" version="0.7.9.v201401101600"/> <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/> <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> - <unit id="org.mockito" version="1.9.5.v201311280930"/> + <unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> </location> @@ -35,6 +35,7 @@ <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/> <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/> <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/> + <unit id="org.eclipse.jdt.annotation" version="1.1.100.v20140704-0625"/> <repository location="http://download.eclipse.org/releases/mars"/> </location> </locations> diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd index f002a9f26..1da87fd59 100644 --- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd +++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd @@ -17,4 +17,5 @@ location "http://download.eclipse.org/releases/mars" { org.eclipse.emf.ecoretools.sdk.feature.group lazy org.eclipse.papyrus.sdk.feature.feature.group lazy org.eclipse.team.svn.feature.group lazy + org.eclipse.jdt.annotation [1.1.100,2.0.0) } |