diff options
author | Matthias Sohn | 2015-05-19 14:09:05 +0000 |
---|---|---|
committer | Matthias Sohn | 2015-05-19 14:09:14 +0000 |
commit | 054f32aa55dd6acdf818bf7f0f47d593354a7462 (patch) | |
tree | aebe31b568de73ad07c924fe8593748918100470 | |
parent | 92a4ce06930abd611b16b928477c39b33bb30621 (diff) | |
parent | bf76c493e9fda0734ecd382138ac3e007f4eb696 (diff) | |
download | egit-github-054f32aa55dd6acdf818bf7f0f47d593354a7462.tar.gz egit-github-054f32aa55dd6acdf818bf7f0f47d593354a7462.tar.xz egit-github-054f32aa55dd6acdf818bf7f0f47d593354a7462.zip |
Merge branch 'master' into stable-4.0
* master:
Relax gson dependencies to version range [1.6,3.0)
Update build to use Mars based target platform
Change-Id: I5c14954c00a7a20d9af0704f9e5ac77b3611c4e9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r-- | org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.egit.github.core/META-INF/MANIFEST.MF | 8 | ||||
-rw-r--r-- | org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF | 8 | ||||
-rw-r--r-- | org.eclipse.mylyn.github-feature/github.target | 6 | ||||
-rw-r--r-- | pom.xml | 35 |
5 files changed, 39 insertions, 22 deletions
diff --git a/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF b/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF index 9b638cd5..fe916bf0 100644 --- a/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.egit.github.core.tests Bundle-Version: 4.0.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: com.google.gson;version="[1.6.0,2.2.0]", - com.google.gson.reflect;version="[1.6.0,2.2.0]", +Import-Package: com.google.gson;version="[1.6.0,3.0.0]", + com.google.gson.reflect;version="[1.6.0,3.0.0)", org.eclipse.egit.github.core;version="[4.0.0,4.1.0)", org.eclipse.egit.github.core.client;version="[4.0.0,4.1.0)", org.eclipse.egit.github.core.event;version="[4.0.0,4.1.0)", diff --git a/org.eclipse.egit.github.core/META-INF/MANIFEST.MF b/org.eclipse.egit.github.core/META-INF/MANIFEST.MF index 882a052f..51773263 100644 --- a/org.eclipse.egit.github.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-SymbolicName: org.eclipse.egit.github.core Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: com.google.gson;version="[1.6.0,2.2.0]", - com.google.gson.annotations;version="[1.6.0,2.2.0]", - com.google.gson.reflect;version="[1.6.0,2.2.0]", - com.google.gson.stream;version="[1.6.0,2.2.0]" +Import-Package: com.google.gson;version="[1.6.0,3.0.0)", + com.google.gson.annotations;version="[1.6.0,3.0.0)", + com.google.gson.reflect;version="[1.6.0,3.0.0)", + com.google.gson.stream;version="[1.6.0,3.0.0)" Export-Package: org.eclipse.egit.github.core;version="4.0.0", org.eclipse.egit.github.core.client;version="4.0.0", org.eclipse.egit.github.core.event;version="4.0.0", diff --git a/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF index 0be03a66..a0e9f29f 100644 --- a/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF @@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.egit.github.core Bundle-Version: 4.0.0.qualifier Bundle-Vendor: Eclipse EGit Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: com.google.gson;version="[1.6.0,2.2.0]", - com.google.gson.annotations;version="[1.6.0,2.2.0]", - com.google.gson.reflect;version="[1.6.0,2.2.0]", - com.google.gson.stream;version="[1.6.0,2.2.0] +Import-Package: com.google.gson;version="[1.6.0,3.0.0)", + com.google.gson.annotations;version="[1.6.0,3.0.0)", + com.google.gson.reflect;version="[1.6.0,3.0.0)", + com.google.gson.stream;version="[1.6.0,3.0.0)" Export-Package: org.eclipse.egit.github.core;version="4.0.0", org.eclipse.egit.github.core.client;version="4.0.0", org.eclipse.egit.github.core.service;version="4.0.0", diff --git a/org.eclipse.mylyn.github-feature/github.target b/org.eclipse.mylyn.github-feature/github.target index 3116272c..472d352f 100644 --- a/org.eclipse.mylyn.github-feature/github.target +++ b/org.eclipse.mylyn.github-feature/github.target @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde version="3.6"?> -<target includeMode="feature" name="Mylyn GitHub Connector Target" sequenceNumber="2"> +<target includeMode="feature" name="Mylyn GitHub Connector Target" sequenceNumber="3"> <locations> <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <unit id="com.google.gson" version="1.6.0.v201101131530"/> <unit id="org.mockito" version="1.8.4.v201303031500"/> <unit id="org.objenesis" version="1.0.0.v201105211943"/> -<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> -<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/> +<unit id="org.junit" version="4.11.0.v201303080030"/> +<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/"/> </location> <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.platform.ide" version="0.0.0"/> @@ -43,10 +43,10 @@ <tycho-version>0.22.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <egit-site>file:/${basedir}/../../egit/org.eclipse.egit.repository/target/repository</egit-site> - <platform-version-name>kepler</platform-version-name> + <platform-version-name>mars</platform-version-name> <mylyn-site>http://download.eclipse.org/mylyn/releases/3.7</mylyn-site> <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site> - <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/</orbit-site> + <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/</orbit-site> <download-publish-path>/home/data/httpd/download.eclipse.org/egit/github/updates-nightly</download-publish-path> </properties> @@ -159,11 +159,6 @@ <environment> <os>macosx</os> <ws>cocoa</ws> - <arch>x86</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> <arch>x86_64</arch> </environment> </environments> @@ -257,7 +252,6 @@ </activation> <properties> <eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site> - <platform-version>[3.8,3.9)</platform-version> </properties> </profile> <profile> @@ -270,7 +264,30 @@ </activation> <properties> <eclipse-site>http://download.eclipse.org/releases/kepler</eclipse-site> - <platform-version>[3.9,4.0)</platform-version> + </properties> + </profile> + <profile> + <id>platform-luna</id> + <activation> + <property> + <name>platform-version-name</name> + <value>luna</value> + </property> + </activation> + <properties> + <eclipse-site>http://download.eclipse.org/releases/luna</eclipse-site> + </properties> + </profile> + <profile> + <id>platform-mars</id> + <activation> + <property> + <name>platform-version-name</name> + <value>mars</value> + </property> + </activation> + <properties> + <eclipse-site>http://download.eclipse.org/releases/mars</eclipse-site> </properties> </profile> <profile> |