Skip to content

Commit 475544b

Browse files
committed
Update tycho to 0.18.1, use latest orbit release
This tycho version adds support for maven 3.1.0. Change dependency from hamcrest to hamcrest.core in jshint.ui.
1 parent 67f8c72 commit 475544b

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

jshint.target

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
33

4-
<target name="Running Platform + Rhino" sequenceNumber="21">
4+
<target name="Running Platform + Rhino + SWTBot" sequenceNumber="26">
55
<locations>
6-
<location path="${eclipse_home}" type="Profile"/>
76
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
8-
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
9-
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
10-
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
7+
<unit id="org.eclipse.scout.sdk.feature.feature.group" version="3.7.2.201202140505"/>
8+
<repository location="http://download.eclipse.org/releases/indigo"/>
119
</location>
1210
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
1311
<unit id="org.mozilla.javascript" version="1.7.4.v201209142200"/>
1412
<unit id="org.mozilla.javascript.source" version="1.7.4.v201209142200"/>
15-
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20130308121626/repository/"/>
13+
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
14+
</location>
15+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
16+
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
17+
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
18+
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
1619
</location>
1720
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
1821
<unit id="org.eclipse.swtbot.forms.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
1922
<unit id="org.eclipse.swtbot.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
2023
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
2124
</location>
25+
<location path="/home/ralf/eclipse/targets/mockito-all" type="Directory"/>
26+
<location path="${eclipse_home}" type="Profile"/>
2227
</locations>
2328
<environment>
2429
<os>linux</os>

pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<properties>
8-
<tycho-version>0.16.0</tycho-version>
8+
<tycho-version>0.18.1</tycho-version>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1010
</properties>
1111

@@ -37,18 +37,17 @@
3737
<url>http://download.eclipse.org/releases/indigo/</url>
3838
</repository>
3939
<repository>
40-
<!-- need stable orbit repository, since latest release does not contain rhino 1.7.4 -->
41-
<id>orbit-stable-repo</id>
40+
<id>orbit-repo</id>
4241
<layout>p2</layout>
43-
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/</url>
42+
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/</url>
4443
</repository>
4544
<repository>
4645
<id>swtbot-repo</id>
4746
<layout>p2</layout>
4847
<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url>
4948
</repository>
5049
<repository>
51-
<id>mockito-repo</id>
50+
<id>mockito-all-repo</id>
5251
<layout>p2</layout>
5352
<url>http://download.eclipsesource.com/~rsternberg/mockito-all/</url>
5453
</repository>

tests/com.eclipsesource.jshint.ui.test/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ Import-Package: org.apache.log4j;version="[1.2.13,1.3.0)",
1212
org.eclipse.swtbot.swt.finder.widgets,
1313
org.junit;version="4.8.2",
1414
org.junit.runner;version="4.8.2"
15-
Require-Bundle: org.hamcrest;bundle-version="1.1.0",
15+
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0",
1616
org.mockito.mockito-all;bundle-version="[1.9.5,2.0.0)"

0 commit comments

Comments
 (0)