diff options
author | Steffen Pingel | 2017-02-10 16:51:14 +0000 |
---|---|---|
committer | Steffen Pingel | 2017-02-13 15:09:15 +0000 |
commit | f1a0f40978e4d08f85a46c6f0acb98df7a2e5fc9 (patch) | |
tree | 4b76016b145084e8a010629337cc6d8b09503100 | |
parent | 7963edcae900ee79f97589649b738253635c8111 (diff) | |
download | org.eclipse.mylyn-f1a0f40978e4d08f85a46c6f0acb98df7a2e5fc9.tar.gz org.eclipse.mylyn-f1a0f40978e4d08f85a46c6f0acb98df7a2e5fc9.tar.xz org.eclipse.mylyn-f1a0f40978e4d08f85a46c6f0acb98df7a2e5fc9.zip |
510997: update Guava and HttpClient versions in targets and poms
Change-Id: I508893447d5e5257ec7b7efdd727a8f6ad98c080
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=510997
-rw-r--r-- | org.eclipse.mylyn-parent/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn-target/mylyn-e4.2.target | 8 | ||||
-rw-r--r-- | org.eclipse.mylyn-target/mylyn-e4.3.target | 8 | ||||
-rw-r--r-- | org.eclipse.mylyn-target/mylyn-e4.4.target | 8 | ||||
-rw-r--r-- | org.eclipse.mylyn-target/mylyn-e4.5.target | 8 | ||||
-rw-r--r-- | org.eclipse.mylyn-target/mylyn-e4.6.target | 8 | ||||
-rw-r--r-- | org.eclipse.mylyn-target/mylyn-e4.7.target | 8 | ||||
-rw-r--r-- | org.eclipse.mylyn-target/mylyn-emaintenance.target | 6 | ||||
-rw-r--r-- | org.eclipse.mylyn-target/mylyn-estaging.target | 8 | ||||
-rwxr-xr-x | org.eclipse.mylyn.releng/oomph/Mylyn.setup | 9 |
10 files changed, 38 insertions, 35 deletions
diff --git a/org.eclipse.mylyn-parent/pom.xml b/org.eclipse.mylyn-parent/pom.xml index d898223f..6f370b74 100644 --- a/org.eclipse.mylyn-parent/pom.xml +++ b/org.eclipse.mylyn-parent/pom.xml @@ -72,7 +72,7 @@ <alt-target-version>4.6</alt-target-version> <alt-platform-repository-url>http://download.eclipse.org/releases/neon/</alt-platform-repository-url> - <orbit-repository-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/</orbit-repository-url> + <orbit-repository-url>http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository/</orbit-repository-url> <jdt-annotation-repository-url>http://download.eclipse.org/mylyn/snapshots/jdt-annotation/</jdt-annotation-repository-url> <mylyn-repository-url>http://download.eclipse.org/mylyn/snapshots/nightly/</mylyn-repository-url> <mylyn-builds-repository-url>http://download.eclipse.org/mylyn/snapshots/nightly/builds/</mylyn-builds-repository-url> diff --git a/org.eclipse.mylyn-target/mylyn-e4.2.target b/org.eclipse.mylyn-target/mylyn-e4.2.target index 63e9d40e..6d538591 100644 --- a/org.eclipse.mylyn-target/mylyn-e4.2.target +++ b/org.eclipse.mylyn-target/mylyn-e4.2.target @@ -29,19 +29,19 @@ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/> <unit id="org.mockito" version="1.9.5.v201311280930"/> <unit id="org.objenesis" version="1.0.0.v201505121915"/> -<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/> -<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/> <unit id="org.jsoup" version="1.7.2.v201411291515"/> <unit id="org.apache.lucene.core" version="2.9.1.v201101211721"/> <unit id="org.apache.tika.core" version="1.3.0.v201505121915"/> <unit id="org.apache.tika.parsers" version="1.3.0"/> -<unit id="com.google.guava" version="15.0.0.v201403281430"/> +<unit id="com.google.guava" version="21.0.0.v20170206-1425"/> <unit id="javax.xml" version="1.3.4.v201005080400"/> <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/> <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/> <unit id="org.apache.xerces" version="2.9.0.v201101211617"/> <unit id="javax.servlet" version="3.0.0.v201112011016"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository/"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </location> <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> diff --git a/org.eclipse.mylyn-target/mylyn-e4.3.target b/org.eclipse.mylyn-target/mylyn-e4.3.target index 4d3fa853..3e6bc7fb 100644 --- a/org.eclipse.mylyn-target/mylyn-e4.3.target +++ b/org.eclipse.mylyn-target/mylyn-e4.3.target @@ -27,19 +27,19 @@ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/> <unit id="org.mockito" version="1.9.5.v201311280930"/> <unit id="org.objenesis" version="1.0.0.v201505121915"/> -<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/> -<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/> <unit id="org.jsoup" version="1.7.2.v201411291515"/> <unit id="org.apache.lucene.core" version="2.9.1.v201101211721"/> <unit id="org.apache.tika.core" version="1.3.0.v201505121915"/> <unit id="org.apache.tika.parsers" version="1.3.0"/> -<unit id="com.google.guava" version="15.0.0.v201403281430"/> +<unit id="com.google.guava" version="21.0.0.v20170206-1425"/> <unit id="javax.xml" version="1.3.4.v201005080400"/> <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/> <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/> <unit id="org.apache.xerces" version="2.9.0.v201101211617"/> <unit id="javax.servlet" version="3.0.0.v201112011016"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository/"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </location> <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> diff --git a/org.eclipse.mylyn-target/mylyn-e4.4.target b/org.eclipse.mylyn-target/mylyn-e4.4.target index 35f47115..3276a014 100644 --- a/org.eclipse.mylyn-target/mylyn-e4.4.target +++ b/org.eclipse.mylyn-target/mylyn-e4.4.target @@ -27,19 +27,19 @@ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/> <unit id="org.mockito" version="1.9.5.v201311280930"/> <unit id="org.objenesis" version="1.0.0.v201505121915"/> -<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/> -<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/> <unit id="org.jsoup" version="1.7.2.v201411291515"/> <unit id="org.apache.lucene.core" version="2.9.1.v201101211721"/> <unit id="org.apache.tika.core" version="1.3.0.v201505121915"/> <unit id="org.apache.tika.parsers" version="1.3.0"/> -<unit id="com.google.guava" version="15.0.0.v201403281430"/> +<unit id="com.google.guava" version="21.0.0.v20170206-1425"/> <unit id="javax.xml" version="1.3.4.v201005080400"/> <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/> <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/> <unit id="org.apache.xerces" version="2.9.0.v201101211617"/> <unit id="javax.servlet" version="3.0.0.v201112011016"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150821153341/repository/"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </location> <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> diff --git a/org.eclipse.mylyn-target/mylyn-e4.5.target b/org.eclipse.mylyn-target/mylyn-e4.5.target index ed8b9ba0..7171d9ad 100644 --- a/org.eclipse.mylyn-target/mylyn-e4.5.target +++ b/org.eclipse.mylyn-target/mylyn-e4.5.target @@ -27,19 +27,19 @@ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/> <unit id="org.mockito" version="1.9.5.v201311280930"/> <unit id="org.objenesis" version="1.0.0.v201505121915"/> -<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/> -<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/> <unit id="org.jsoup" version="1.7.2.v201411291515"/> <unit id="org.apache.lucene.core" version="2.9.1.v201101211721"/> <unit id="org.apache.tika.core" version="1.3.0.v201505121915"/> <unit id="org.apache.tika.parsers" version="1.3.0"/> -<unit id="com.google.guava" version="15.0.0.v201403281430"/> +<unit id="com.google.guava" version="21.0.0.v20170206-1425"/> <unit id="javax.xml" version="1.3.4.v201005080400"/> <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/> <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/> <unit id="org.apache.xerces" version="2.9.0.v201101211617"/> <unit id="javax.servlet" version="3.0.0.v201112011016"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </location> <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> diff --git a/org.eclipse.mylyn-target/mylyn-e4.6.target b/org.eclipse.mylyn-target/mylyn-e4.6.target index f9c2a826..dd66beb5 100644 --- a/org.eclipse.mylyn-target/mylyn-e4.6.target +++ b/org.eclipse.mylyn-target/mylyn-e4.6.target @@ -32,17 +32,17 @@ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/> <unit id="org.mockito" version="1.9.5.v201605172210"/> <unit id="org.objenesis" version="1.0.0.v201505121915"/> -<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/> -<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/> <unit id="org.jsoup" version="1.7.2.v201411291515"/> <unit id="org.apache.tika.core" version="1.3.0.v201505121915"/> <unit id="org.apache.tika.parsers" version="1.3.0.v201605180015"/> -<unit id="com.google.guava" version="15.0.0.v201403281430"/> +<unit id="com.google.guava" version="21.0.0.v20170206-1425"/> <unit id="javax.xml" version="1.3.4.v201005080400"/> <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/> <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/> <unit id="org.apache.xerces" version="2.9.0.v201101211617"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </location> <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> diff --git a/org.eclipse.mylyn-target/mylyn-e4.7.target b/org.eclipse.mylyn-target/mylyn-e4.7.target index 26c4d20f..4f65d954 100644 --- a/org.eclipse.mylyn-target/mylyn-e4.7.target +++ b/org.eclipse.mylyn-target/mylyn-e4.7.target @@ -32,17 +32,17 @@ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/> <unit id="org.mockito" version="1.9.5.v201605172210"/> <unit id="org.objenesis" version="1.0.0.v201505121915"/> -<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/> -<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/> <unit id="org.jsoup" version="1.7.2.v201411291515"/> <unit id="org.apache.tika.core" version="1.3.0.v201505121915"/> <unit id="org.apache.tika.parsers" version="1.3.0.v201605180015"/> -<unit id="com.google.guava" version="15.0.0.v201403281430"/> +<unit id="com.google.guava" version="21.0.0.v20170206-1425"/> <unit id="javax.xml" version="1.3.4.v201005080400"/> <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/> <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/> <unit id="org.apache.xerces" version="2.9.0.v201101211617"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> diff --git a/org.eclipse.mylyn-target/mylyn-emaintenance.target b/org.eclipse.mylyn-target/mylyn-emaintenance.target index a8f02b6d..c20c4af0 100644 --- a/org.eclipse.mylyn-target/mylyn-emaintenance.target +++ b/org.eclipse.mylyn-target/mylyn-emaintenance.target @@ -28,13 +28,13 @@ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/>
<unit id="org.mockito" version="1.9.5.v201311280930"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
-<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/>
<unit id="org.jsoup" version="1.7.2.v201411291515"/>
<unit id="org.apache.lucene.core" version="2.9.1.v201101211721"/>
<unit id="org.apache.tika.core" version="1.3.0.v201505121915"/>
<unit id="org.apache.tika.parsers" version="1.3.0"/>
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>
<unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
diff --git a/org.eclipse.mylyn-target/mylyn-estaging.target b/org.eclipse.mylyn-target/mylyn-estaging.target index 733bf033..3f398126 100644 --- a/org.eclipse.mylyn-target/mylyn-estaging.target +++ b/org.eclipse.mylyn-target/mylyn-estaging.target @@ -32,17 +32,17 @@ <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/> <unit id="org.mockito" version="1.9.5.v201605172210"/> <unit id="org.objenesis" version="1.0.0.v201505121915"/> -<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/> -<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/> +<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/> +<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/> <unit id="org.jsoup" version="1.7.2.v201411291515"/> <unit id="org.apache.tika.core" version="1.3.0.v201505121915"/> <unit id="org.apache.tika.parsers" version="1.3.0.v201605180015"/> -<unit id="com.google.guava" version="15.0.0.v201403281430"/> +<unit id="com.google.guava" version="21.0.0.v20170206-1425"/> <unit id="javax.xml" version="1.3.4.v201005080400"/> <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/> <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/> <unit id="org.apache.xerces" version="2.9.0.v201101211617"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit"> <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> diff --git a/org.eclipse.mylyn.releng/oomph/Mylyn.setup b/org.eclipse.mylyn.releng/oomph/Mylyn.setup index 25049c09..d9ad7eb9 100755 --- a/org.eclipse.mylyn.releng/oomph/Mylyn.setup +++ b/org.eclipse.mylyn.releng/oomph/Mylyn.setup @@ -147,6 +147,9 @@ <requirement name="org.objenesis" versionRange="[1.0.0,2.0.0)"/> + <requirement + name="com.google.guava" + versionRange="[21.0.0,22.0.0)"/> <repositoryList name="Oxygen"> <repository @@ -158,7 +161,7 @@ <repository url="http://download.eclipse.org/eclipse/updates/3.8"/> <repository - url="http://download.eclipse.org/tools/orbit/downloads/drops/S20170120205402/repository/"/> + url="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </repositoryList> <repositoryList name="Neon"> @@ -171,7 +174,7 @@ <repository url="http://download.eclipse.org/eclipse/updates/3.8"/> <repository - url="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/> + url="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </repositoryList> <repositoryList name="Mars"> @@ -184,7 +187,7 @@ <repository url="http://download.eclipse.org/eclipse/updates/3.8"/> <repository - url="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/> + url="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository"/> </repositoryList> </targlet> </setupTask> |