diff options
author | Alexander Kurtakov | 2016-08-25 09:16:02 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-08-25 09:34:51 +0000 |
commit | 473b58db20d584a819afb1fd141d3cb1e14f65d2 (patch) | |
tree | d0d93478c276615d3e89e538a2f23718edd07207 | |
parent | 5b4c508f2c8d5d92f44d927ceb36bde12a89ef74 (diff) | |
download | org.eclipse.linuxtools-473b58db20d584a819afb1fd141d3cb1e14f65d2.tar.gz org.eclipse.linuxtools-473b58db20d584a819afb1fd141d3cb1e14f65d2.tar.xz org.eclipse.linuxtools-473b58db20d584a819afb1fd141d3cb1e14f65d2.zip |
releng: Move to lastest Orbit S-build.
Stop pointing to our own assertj repo as it's now in Orbit proper.
Adjust docker category.xml for the new bouncycastle iu names in Orbit.
Change-Id: I9c9fba231cd7f3b462cb58c50b7260cb99c2281f
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/79709
Tested-by: Hudson CI
-rw-r--r-- | releng/org.eclipse.linuxtools.docker-site/category.xml | 4 | ||||
-rw-r--r-- | releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml index a06a6c7d27..aa02d6bd65 100644 --- a/releng/org.eclipse.linuxtools.docker-site/category.xml +++ b/releng/org.eclipse.linuxtools.docker-site/category.xml @@ -63,10 +63,10 @@ <iu id="jnr.x86asm" version="0.0.0"> <category name="Docker Client Dependencies"/> </iu> - <iu id="org.bouncycastle.bcprov" version="0.0.0"> + <iu id="org.bouncycastle.bcprov-jdk15on" version="0.0.0"> <category name="Docker Client Dependencies"/> </iu> - <iu id="org.bouncycastle.bcpkix" version="0.0.0"> + <iu id="org.bouncycastle.bcpkix-jdk15on" version="0.0.0"> <category name="Docker Client Dependencies"/> </iu> <iu id="org.glassfish.hk2.api" version="0.0.0"> diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target index 105c3378dc..c03b90fb88 100644 --- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target +++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.6.target @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde version="3.8"?><target name="linuxtools-e4.6" sequenceNumber="3"> +<?pde version="3.8"?><target name="linuxtools-e4.6" sequenceNumber="4"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.swtchart" version="0.0.0"/> @@ -11,8 +11,7 @@ <unit id="com.spotify.docker.client.source" version="0.0.0"/> <unit id="org.mockito" version="0.0.0"/> <unit id="org.assertj" version="0.0.0"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/> -<repository location="http://download.eclipse.org/linuxtools/assertj"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S201607281920/"/> <repository location="http://download.eclipse.org/linuxtools/docker-client"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> |