From b267cccca140bae6e89d8ca560b6ae89449e1f13 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 13 Jan 2015 01:25:06 +0100 Subject: Update Software User Agreement Bug: 457262 Change-Id: I7f7303d53cc9cb31809cbd63f35b755590eeeb16 Signed-off-by: Matthias Sohn --- .../feature.properties | 11 +++-- org.eclipse.mylyn.github-feature/license.html | 56 +++++++++++----------- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/org.eclipse.mylyn.github-feature/feature.properties b/org.eclipse.mylyn.github-feature/feature.properties index 51599cec..e50f500e 100644 --- a/org.eclipse.mylyn.github-feature/feature.properties +++ b/org.eclipse.mylyn.github-feature/feature.properties @@ -13,9 +13,16 @@ description=Eclipse Mylyn to GitHub connector. featureName=Eclipse GitHub integration with task focused interface providerName=Eclipse EGit +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +license=\ +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to by "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -February 1, 2011\n\ +April 9, 2014\n\ \n\ Usage Of Content\n\ \n\ @@ -88,7 +95,6 @@ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ @@ -138,4 +144,3 @@ re-export of encryption software, to see if this is permitted.\n\ \n\ Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n ########### end of license property ########################################## - diff --git a/org.eclipse.mylyn.github-feature/license.html b/org.eclipse.mylyn.github-feature/license.html index f19c483b..95ad95e7 100644 --- a/org.eclipse.mylyn.github-feature/license.html +++ b/org.eclipse.mylyn.github-feature/license.html @@ -1,19 +1,18 @@ - - - - + + + Eclipse Foundation Software User Agreement

Eclipse Foundation Software User Agreement

-

February 1, 2011

+

April 9, 2014

Usage Of Content

THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND @@ -22,35 +21,35 @@

Applicable Licenses

Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.

+ ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.

Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code - repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").

+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").

-

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:

-

Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +

Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in that directory.

@@ -62,7 +61,6 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

  • Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
  • Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
  • Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
    • -
  • Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
  • Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
    • @@ -73,11 +71,10 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha

    Use of Provisioning Technology

    The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse - Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or - other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to - install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html - ("Specification").

    + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").

    You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology @@ -85,13 +82,13 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:

      -
    1. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology - on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based +
    2. A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based product.
    3. During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be accessed and copied to the Target Machine.
    4. Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable - Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
      5. @@ -104,5 +101,6 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha possession, or use, and re-export of encryption software, to see if this is permitted.

      Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.

      - - + + + \ No newline at end of file -- cgit v1.2.3 From 6cfb33a2494902b7e9da4b83d013fcd97f4ecaa1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 12 Jan 2015 14:26:04 +0100 Subject: Relax JGit/EGit dependencies to allow versions in range [3.2,4.0) Change version.sh to no longer flip versions of JGit and EGit dependencies. They are now set to [3.2.0,4.0.0) and have to be maintained manually from now on. Bug: 427778 Change-Id: I771e15533aa7f59bea66fd50c6e68ab967c149e0 Signed-off-by: Matthias Sohn --- org.eclipse.mylyn.github-feature/feature.xml | 1 + org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF | 6 +-- org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF | 32 ++++++++-------- tools/version.sh | 43 ++++------------------ 4 files changed, 28 insertions(+), 54 deletions(-) diff --git a/org.eclipse.mylyn.github-feature/feature.xml b/org.eclipse.mylyn.github-feature/feature.xml index 9f7a1b65..f61bce7c 100644 --- a/org.eclipse.mylyn.github-feature/feature.xml +++ b/org.eclipse.mylyn.github-feature/feature.xml @@ -19,6 +19,7 @@ + diff --git a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF index 7974b369..86e5681d 100644 --- a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF @@ -13,10 +13,10 @@ Export-Package: org.eclipse.mylyn.internal.github.core;version="3.6.1";x-friends Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.tasks.core;bundle-version="[3.4.0,4.0.0)", org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)" -Import-Package: org.eclipse.egit.core;version="[3.6.1,3.7.0)", +Import-Package: org.eclipse.egit.core;version="[3.2.0,4.0.0)", org.eclipse.egit.github.core;version="[3.6.1,3.7.0)", org.eclipse.egit.github.core.client;version="[3.6.1,3.7.0)", org.eclipse.egit.github.core.service;version="[3.6.1,3.7.0)", org.eclipse.egit.github.core.util;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)" + org.eclipse.jgit.lib;version="[3.2.0,4.0.0)", + org.eclipse.jgit.transport;version="[3.2.0,4.0.0)" diff --git a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF index 14ca9f5b..fa528596 100644 --- a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF @@ -27,26 +27,26 @@ Export-Package: org.eclipse.mylyn.internal.github.ui;version="3.6.1";x-internal: org.eclipse.mylyn.internal.github.ui.gist;version="3.6.1";x-internal:=true, org.eclipse.mylyn.internal.github.ui.issue;version="3.6.1";x-internal:=true Bundle-ActivationPolicy: lazy -Import-Package: org.eclipse.egit.core;version="[3.6.1,3.7.0)", - org.eclipse.egit.core.op;version="[3.6.1,3.7.0)", +Import-Package: org.eclipse.egit.core;version="[3.2.0,4.0.0)", + org.eclipse.egit.core.op;version="[3.2.0,4.0.0)", org.eclipse.egit.github.core;version="[3.6.1,3.7.0)", org.eclipse.egit.github.core.client;version="[3.6.1,3.7.0)", org.eclipse.egit.github.core.service;version="[3.6.1,3.7.0)", org.eclipse.egit.github.core.util;version="[3.6.1,3.7.0)", - org.eclipse.egit.ui;version="[3.6.1,3.7.0)", - org.eclipse.egit.ui.internal;version="[3.6.1,3.7.0)", - org.eclipse.egit.ui.internal.branch;version="[3.6.1,3.7.0)", - org.eclipse.egit.ui.internal.commit;version="[3.6.1,3.7.0)", - org.eclipse.egit.ui.internal.components;version="[3.6.1,3.7.0)", - org.eclipse.egit.ui.internal.fetch;version="[3.6.1,3.7.0)", - org.eclipse.egit.ui.internal.provisional.wizards;version="[3.6.1,3.7.0)", - org.eclipse.egit.ui.internal.pull;version="[3.6.1,3.7.0)", - org.eclipse.jgit.errors;version="[3.6.1,3.7.0)", - org.eclipse.jgit.lib;version="[3.6.1,3.7.0)", - org.eclipse.jgit.revwalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.transport;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk;version="[3.6.1,3.7.0)", - org.eclipse.jgit.treewalk.filter;version="[3.6.1,3.7.0)", + org.eclipse.egit.ui;version="[3.2.0,4.0.0)", + org.eclipse.egit.ui.internal;version="[3.2.0,4.0.0)", + org.eclipse.egit.ui.internal.branch;version="[3.2.0,4.0.0)", + org.eclipse.egit.ui.internal.commit;version="[3.2.0,4.0.0)", + org.eclipse.egit.ui.internal.components;version="[3.2.0,4.0.0)", + org.eclipse.egit.ui.internal.fetch;version="[3.2.0,4.0.0)", + org.eclipse.egit.ui.internal.provisional.wizards;version="[3.2.0,4.0.0)", + org.eclipse.egit.ui.internal.pull;version="[3.2.0,4.0.0)", + org.eclipse.jgit.errors;version="[3.2.0,4.0.0)", + org.eclipse.jgit.lib;version="[3.2.0,4.0.0)", + org.eclipse.jgit.revwalk;version="[3.2.0,4.0.0)", + org.eclipse.jgit.transport;version="[3.2.0,4.0.0)", + org.eclipse.jgit.treewalk;version="[3.2.0,4.0.0)", + org.eclipse.jgit.treewalk.filter;version="[3.2.0,4.0.0)", org.eclipse.mylyn.internal.github.core;version="[3.6.1,3.7.0)", org.eclipse.mylyn.internal.github.core.gist;version="[3.6.1,3.7.0)", org.eclipse.mylyn.internal.github.core.issue;version="[3.6.1,3.7.0)", diff --git a/tools/version.sh b/tools/version.sh index 27eac1dd..f679df37 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -38,13 +38,8 @@ case "$1" in shift ;; ---jgit=*) - J=${1##--jgit=} - shift - ;; - *) - echo >&2 "usage: $0 {--snapshot=0.n.0 | --release} [--jgit=0.n.0]" + echo >&2 "usage: $0 {--snapshot=0.n.0 | --release}" exit 1 esac done @@ -95,37 +90,15 @@ next_version() { ' "$1" } -EGIT_V=$(to_version "$V") -EGIT_N=$(next_version "$EGIT_V") - -[ -z "$J" ] && J=$V -JGIT_V=$(to_version "$J") -JGIT_N=$(next_version "$JGIT_V") +GITHUB_V=$(to_version "$V") +GITHUB_N=$(next_version "$GITHUB_V") perl -pi~ -e ' s/^(Bundle-Version:\s*).*$/${1}'"$OSGI_V"'/; - s/(org.eclipse.egit.*;version=")[^"[(]*(")/${1}'"$EGIT_V"'${2}/; - s/(org.eclipse.egit.*;version="\[)[^"]*(\)")/${1}'"$EGIT_V,$EGIT_N"'${2}/; - s/(org.eclipse.mylyn.internal.github.*;version=")[^"[(]*(")/${1}'"$EGIT_V"'${2}/; - s/(org.eclipse.mylyn.internal.github.*;version="\[)[^"]*(\)")/${1}'"$EGIT_V,$EGIT_N"'${2}/; - s/(org.eclipse.jgit.*;version="\[)[^"]*(\)")/${1}'"$JGIT_V,$JGIT_N"'${2}/; + s/(org.eclipse.mylyn.internal.github.*;version=")[^"[(]*(")/${1}'"$GITHUB_V"'${2}/; + s/(org.eclipse.mylyn.internal.github.*;version="\[)[^"]*(\)")/${1}'"$GITHUB_V,$GITHUB_N"'${2}/; ' $(git ls-files | egrep "META-INF/MANIFEST.MF|META-INF/SOURCE-MANIFEST.MF") -perl -pi~ -e ' - if ($ARGV ne $old_argv) { - $seen_version = 0; - $old_argv = $ARGV; - } - if ($seen_version < 4) { - $seen_version++ if (!/<\?xml/ && - s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/); - } - s/(feature="org.eclipse.egit.github.core" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/; - s/(feature="org.eclipse.mylyn.github.core" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/; - s/(feature="org.eclipse.mylyn.github.ui" version=")[^"]*(")/${1}'"$EGIT_V"'${2}/; - s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/; - ' org.eclipse.egit.mylyn-feature/feature.xml - perl -pi~ -e ' if ($ARGV ne $old_argv) { $seen_version = 0; @@ -135,8 +108,9 @@ perl -pi~ -e ' $seen_version = 1 if (!/<\?xml/ && s/(version=")[^"]*(")/${1}'"$OSGI_V"'${2}/); } - s/(feature="org.eclipse.jgit" version=")[^"]*(")/${1}'"$JGIT_V"'${2}/; - ' $(git ls-files | grep feature.xml) + s/(feature="org.eclipse.mylyn.github.core" version=")[^"]*(")/${1}'"$GITHUB_V"'${2}/; + s/(feature="org.eclipse.mylyn.github.ui" version=")[^"]*(")/${1}'"$GITHUB_V"'${2}/; + ' org.eclipse.mylyn.github-feature/feature.xml perl -pi~ -e ' s{<(version)>[^<\$]*}{<${1}>'"$POM_V"'}; @@ -174,7 +148,6 @@ perl -pi~ -e ' $seen_version = 1 if s{<(version)>[^<\$]*}{<${1}>'"$POM_V"'}; } - s{<(jgit-version)>[^<]*}{<${1}>'"$J"'}; ' $(git ls-files | grep pom.*.xml) find . -name '*~' | xargs rm -f -- cgit v1.2.3 From 2675dee8f7c42465f5cd2d7c8884697a27e85194 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 21 Jan 2015 16:04:04 +0100 Subject: EGit Mylyn Github Connector v3.6.2.201501210735-r Change-Id: Ie22bdb0bfdbc3ec7f60535f3e4799f659a5eb2db Signed-off-by: Matthias Sohn --- org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.github.core.tests/pom.xml | 2 +- org.eclipse.egit.github.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF | 2 +- org.eclipse.egit.github.core/pom-jar.xml | 2 +- org.eclipse.egit.github.core/pom.xml | 2 +- org.eclipse.mylyn.github-feature/feature.xml | 2 +- org.eclipse.mylyn.github-feature/pom.xml | 2 +- org.eclipse.mylyn.github-site/pom.xml | 2 +- org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF | 10 +++++----- org.eclipse.mylyn.github.core/pom.xml | 2 +- org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.mylyn.github.doc/pom.xml | 2 +- org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.mylyn.github.tests/pom.xml | 2 +- org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF | 16 ++++++++-------- org.eclipse.mylyn.github.ui/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 31 insertions(+), 31 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 e7cbb589..d002c151 100644 --- a/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.egit.github.core.tests -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.2.201501210735-r Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.0]", diff --git a/org.eclipse.egit.github.core.tests/pom.xml b/org.eclipse.egit.github.core.tests/pom.xml index fec8e2ca..019704de 100644 --- a/org.eclipse.egit.github.core.tests/pom.xml +++ b/org.eclipse.egit.github.core.tests/pom.xml @@ -16,7 +16,7 @@ org.eclipse.mylyn.github github-parent - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r org.eclipse.egit.github.core.tests diff --git a/org.eclipse.egit.github.core/META-INF/MANIFEST.MF b/org.eclipse.egit.github.core/META-INF/MANIFEST.MF index 3a7604de..5f5eda74 100644 --- a/org.eclipse.egit.github.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.egit.github.core -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.2.201501210735-r Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.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 6391731e..669d7b26 100644 --- a/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit GitHub API Core Bundle-SymbolicName: org.eclipse.egit.github.core -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.2.201501210735-r Bundle-Vendor: Eclipse EGit Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.0]", diff --git a/org.eclipse.egit.github.core/pom-jar.xml b/org.eclipse.egit.github.core/pom-jar.xml index eaed492b..7471ce58 100644 --- a/org.eclipse.egit.github.core/pom-jar.xml +++ b/org.eclipse.egit.github.core/pom-jar.xml @@ -5,7 +5,7 @@ org.eclipse.mylyn.github org.eclipse.egit.github.core - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r org.sonatype.oss diff --git a/org.eclipse.egit.github.core/pom.xml b/org.eclipse.egit.github.core/pom.xml index 4ad37626..c5940a10 100644 --- a/org.eclipse.egit.github.core/pom.xml +++ b/org.eclipse.egit.github.core/pom.xml @@ -15,7 +15,7 @@ org.eclipse.mylyn.github github-parent - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r 4.0.0 diff --git a/org.eclipse.mylyn.github-feature/feature.xml b/org.eclipse.mylyn.github-feature/feature.xml index f61bce7c..1e3e390a 100644 --- a/org.eclipse.mylyn.github-feature/feature.xml +++ b/org.eclipse.mylyn.github-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.mylyn.github-feature/pom.xml b/org.eclipse.mylyn.github-feature/pom.xml index c45cd392..984f95db 100644 --- a/org.eclipse.mylyn.github-feature/pom.xml +++ b/org.eclipse.mylyn.github-feature/pom.xml @@ -14,7 +14,7 @@ github-parent org.eclipse.mylyn.github - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r 4.0.0 org.eclipse.mylyn.github.feature diff --git a/org.eclipse.mylyn.github-site/pom.xml b/org.eclipse.mylyn.github-site/pom.xml index 2a373ab1..be07916c 100644 --- a/org.eclipse.mylyn.github-site/pom.xml +++ b/org.eclipse.mylyn.github-site/pom.xml @@ -15,7 +15,7 @@ org.eclipse.mylyn.github github-parent - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r github-updatesite diff --git a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF index 86e5681d..af0d7b47 100644 --- a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.core;singleton:=true -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.2.201501210735-r Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.mylyn.internal.github.core;version="3.6.1";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.gist;version="3.6.1";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.issue;version="3.6.1";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.pr;version="3.6.1";x-friends:="org.eclipse.mylyn.github.ui" +Export-Package: org.eclipse.mylyn.internal.github.core;version="3.6.2";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.gist;version="3.6.2";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.issue;version="3.6.2";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.pr;version="3.6.2";x-friends:="org.eclipse.mylyn.github.ui" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.tasks.core;bundle-version="[3.4.0,4.0.0)", org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)" diff --git a/org.eclipse.mylyn.github.core/pom.xml b/org.eclipse.mylyn.github.core/pom.xml index 8f2db401..3df5fbf8 100644 --- a/org.eclipse.mylyn.github.core/pom.xml +++ b/org.eclipse.mylyn.github.core/pom.xml @@ -15,7 +15,7 @@ org.eclipse.mylyn.github github-parent - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r 4.0.0 diff --git a/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF index ae2e5783..f3ec9501 100755 --- a/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.doc;singleton:=true -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.2.201501210735-r Bundle-Vendor: %providerName Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional, org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional diff --git a/org.eclipse.mylyn.github.doc/pom.xml b/org.eclipse.mylyn.github.doc/pom.xml index 5d017e9d..a76de8e3 100755 --- a/org.eclipse.mylyn.github.doc/pom.xml +++ b/org.eclipse.mylyn.github.doc/pom.xml @@ -18,7 +18,7 @@ http://www.eclipse.org/legal/epl-v10.html org.eclipse.mylyn.github github-parent - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r org.eclipse.mylyn.github.doc diff --git a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF index 1b3007d0..e0225ee6 100644 --- a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Eclipse EGit Mylyn GitHub Tests Bundle-SymbolicName: org.eclipse.mylyn.github.tests -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.2.201501210735-r Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.tasks.ui;bundle-version="[3.2.0,4.0.0)", @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.objenesis;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: Eclipse EGit -Import-Package: org.eclipse.mylyn.internal.github.core;version="[3.6.1,3.7.0)", - org.eclipse.mylyn.internal.github.ui.issue;version="[3.6.1,3.7.0)", +Import-Package: org.eclipse.mylyn.internal.github.core;version="[3.6.2,3.7.0)", + org.eclipse.mylyn.internal.github.ui.issue;version="[3.6.2,3.7.0)", org.mockito;version="[1.8.4,2.0.0)", org.mockito.runners;version="[1.8.4,2.0.0)", org.mockito.stubbing;version="[1.8.4,2.0.0)" diff --git a/org.eclipse.mylyn.github.tests/pom.xml b/org.eclipse.mylyn.github.tests/pom.xml index 713252e4..daeea608 100644 --- a/org.eclipse.mylyn.github.tests/pom.xml +++ b/org.eclipse.mylyn.github.tests/pom.xml @@ -16,7 +16,7 @@ org.eclipse.mylyn.github github-parent - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r org.eclipse.mylyn.github.tests diff --git a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF index fa528596..8b61af7e 100644 --- a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.ui;singleton:=true Bundle-Activator: org.eclipse.mylyn.internal.github.ui.GitHubUi -Bundle-Version: 3.6.1.qualifier +Bundle-Version: 3.6.2.201501210735-r Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -23,9 +23,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.context.core;bundle-version="[3.7.0,4.0.0)", org.eclipse.mylyn.monitor.core;bundle-version="[3.7.0,4.0.0)", org.eclipse.mylyn.resources.ui;bundle-version="[3.7.0,4.0.0)" -Export-Package: org.eclipse.mylyn.internal.github.ui;version="3.6.1";x-internal:=true, - org.eclipse.mylyn.internal.github.ui.gist;version="3.6.1";x-internal:=true, - org.eclipse.mylyn.internal.github.ui.issue;version="3.6.1";x-internal:=true +Export-Package: org.eclipse.mylyn.internal.github.ui;version="3.6.2";x-internal:=true, + org.eclipse.mylyn.internal.github.ui.gist;version="3.6.2";x-internal:=true, + org.eclipse.mylyn.internal.github.ui.issue;version="3.6.2";x-internal:=true Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.egit.core;version="[3.2.0,4.0.0)", org.eclipse.egit.core.op;version="[3.2.0,4.0.0)", @@ -47,7 +47,7 @@ Import-Package: org.eclipse.egit.core;version="[3.2.0,4.0.0)", org.eclipse.jgit.transport;version="[3.2.0,4.0.0)", org.eclipse.jgit.treewalk;version="[3.2.0,4.0.0)", org.eclipse.jgit.treewalk.filter;version="[3.2.0,4.0.0)", - org.eclipse.mylyn.internal.github.core;version="[3.6.1,3.7.0)", - org.eclipse.mylyn.internal.github.core.gist;version="[3.6.1,3.7.0)", - org.eclipse.mylyn.internal.github.core.issue;version="[3.6.1,3.7.0)", - org.eclipse.mylyn.internal.github.core.pr;version="[3.6.1,3.7.0)" + org.eclipse.mylyn.internal.github.core;version="[3.6.2,3.7.0)", + org.eclipse.mylyn.internal.github.core.gist;version="[3.6.2,3.7.0)", + org.eclipse.mylyn.internal.github.core.issue;version="[3.6.2,3.7.0)", + org.eclipse.mylyn.internal.github.core.pr;version="[3.6.2,3.7.0)" diff --git a/org.eclipse.mylyn.github.ui/pom.xml b/org.eclipse.mylyn.github.ui/pom.xml index c9670717..2bd567f0 100644 --- a/org.eclipse.mylyn.github.ui/pom.xml +++ b/org.eclipse.mylyn.github.ui/pom.xml @@ -14,7 +14,7 @@ github-parent org.eclipse.mylyn.github - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r 4.0.0 org.eclipse.mylyn.github.ui diff --git a/pom.xml b/pom.xml index 9a2e21fa..4fc7252a 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - 3.6.1-SNAPSHOT + 3.6.2.201501210735-r 3.0 -- cgit v1.2.3 From 5af5a3062746147be8ea0e38500b23a83d4899e0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 21 Jan 2015 17:26:08 +0100 Subject: Prepare 3.6.3-SNAPSHOT builds Change-Id: I15e652b1b230df8770302cb2a16b4c1dc360373b Signed-off-by: Matthias Sohn --- org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.github.core.tests/pom.xml | 2 +- org.eclipse.egit.github.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF | 2 +- org.eclipse.egit.github.core/pom-jar.xml | 2 +- org.eclipse.egit.github.core/pom.xml | 2 +- org.eclipse.mylyn.github-feature/feature.xml | 2 +- org.eclipse.mylyn.github-feature/pom.xml | 2 +- org.eclipse.mylyn.github-site/pom.xml | 2 +- org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF | 10 +++++----- org.eclipse.mylyn.github.core/pom.xml | 2 +- org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF | 2 +- org.eclipse.mylyn.github.doc/pom.xml | 2 +- org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.mylyn.github.tests/pom.xml | 2 +- org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF | 16 ++++++++-------- org.eclipse.mylyn.github.ui/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 31 insertions(+), 31 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 d002c151..5825a2fc 100644 --- a/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.egit.github.core.tests -Bundle-Version: 3.6.2.201501210735-r +Bundle-Version: 3.6.3.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.0]", diff --git a/org.eclipse.egit.github.core.tests/pom.xml b/org.eclipse.egit.github.core.tests/pom.xml index 019704de..732a0afe 100644 --- a/org.eclipse.egit.github.core.tests/pom.xml +++ b/org.eclipse.egit.github.core.tests/pom.xml @@ -16,7 +16,7 @@ org.eclipse.mylyn.github github-parent - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT org.eclipse.egit.github.core.tests diff --git a/org.eclipse.egit.github.core/META-INF/MANIFEST.MF b/org.eclipse.egit.github.core/META-INF/MANIFEST.MF index 5f5eda74..b89bdba6 100644 --- a/org.eclipse.egit.github.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.github.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.egit.github.core -Bundle-Version: 3.6.2.201501210735-r +Bundle-Version: 3.6.3.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.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 669d7b26..21772f32 100644 --- a/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.egit.github.core/META-INF/SOURCE-MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EGit GitHub API Core Bundle-SymbolicName: org.eclipse.egit.github.core -Bundle-Version: 3.6.2.201501210735-r +Bundle-Version: 3.6.3.qualifier Bundle-Vendor: Eclipse EGit Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: com.google.gson;version="[1.6.0,2.2.0]", diff --git a/org.eclipse.egit.github.core/pom-jar.xml b/org.eclipse.egit.github.core/pom-jar.xml index 7471ce58..8f292050 100644 --- a/org.eclipse.egit.github.core/pom-jar.xml +++ b/org.eclipse.egit.github.core/pom-jar.xml @@ -5,7 +5,7 @@ org.eclipse.mylyn.github org.eclipse.egit.github.core - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT org.sonatype.oss diff --git a/org.eclipse.egit.github.core/pom.xml b/org.eclipse.egit.github.core/pom.xml index c5940a10..b75ae63e 100644 --- a/org.eclipse.egit.github.core/pom.xml +++ b/org.eclipse.egit.github.core/pom.xml @@ -15,7 +15,7 @@ org.eclipse.mylyn.github github-parent - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT 4.0.0 diff --git a/org.eclipse.mylyn.github-feature/feature.xml b/org.eclipse.mylyn.github-feature/feature.xml index 1e3e390a..1fa2b949 100644 --- a/org.eclipse.mylyn.github-feature/feature.xml +++ b/org.eclipse.mylyn.github-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.mylyn.github-feature/pom.xml b/org.eclipse.mylyn.github-feature/pom.xml index 984f95db..c9d5e8af 100644 --- a/org.eclipse.mylyn.github-feature/pom.xml +++ b/org.eclipse.mylyn.github-feature/pom.xml @@ -14,7 +14,7 @@ github-parent org.eclipse.mylyn.github - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT 4.0.0 org.eclipse.mylyn.github.feature diff --git a/org.eclipse.mylyn.github-site/pom.xml b/org.eclipse.mylyn.github-site/pom.xml index be07916c..9a849e06 100644 --- a/org.eclipse.mylyn.github-site/pom.xml +++ b/org.eclipse.mylyn.github-site/pom.xml @@ -15,7 +15,7 @@ org.eclipse.mylyn.github github-parent - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT github-updatesite diff --git a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF index af0d7b47..7d88faf8 100644 --- a/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.core/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.core;singleton:=true -Bundle-Version: 3.6.2.201501210735-r +Bundle-Version: 3.6.3.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.mylyn.internal.github.core;version="3.6.2";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.gist;version="3.6.2";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.issue;version="3.6.2";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.mylyn.internal.github.core.pr;version="3.6.2";x-friends:="org.eclipse.mylyn.github.ui" +Export-Package: org.eclipse.mylyn.internal.github.core;version="3.6.3";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.gist;version="3.6.3";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.issue;version="3.6.3";x-friends:="org.eclipse.mylyn.github.ui", + org.eclipse.mylyn.internal.github.core.pr;version="3.6.3";x-friends:="org.eclipse.mylyn.github.ui" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.tasks.core;bundle-version="[3.4.0,4.0.0)", org.eclipse.mylyn.commons.net;bundle-version="[3.4.0,4.0.0)" diff --git a/org.eclipse.mylyn.github.core/pom.xml b/org.eclipse.mylyn.github.core/pom.xml index 3df5fbf8..42f2e6b4 100644 --- a/org.eclipse.mylyn.github.core/pom.xml +++ b/org.eclipse.mylyn.github.core/pom.xml @@ -15,7 +15,7 @@ org.eclipse.mylyn.github github-parent - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT 4.0.0 diff --git a/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF index f3ec9501..618b0fe4 100755 --- a/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-Localization: plugin Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.doc;singleton:=true -Bundle-Version: 3.6.2.201501210735-r +Bundle-Version: 3.6.3.qualifier Bundle-Vendor: %providerName Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional, org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional diff --git a/org.eclipse.mylyn.github.doc/pom.xml b/org.eclipse.mylyn.github.doc/pom.xml index a76de8e3..780ae608 100755 --- a/org.eclipse.mylyn.github.doc/pom.xml +++ b/org.eclipse.mylyn.github.doc/pom.xml @@ -18,7 +18,7 @@ http://www.eclipse.org/legal/epl-v10.html org.eclipse.mylyn.github github-parent - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT org.eclipse.mylyn.github.doc diff --git a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF index e0225ee6..d60c5559 100644 --- a/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Eclipse EGit Mylyn GitHub Tests Bundle-SymbolicName: org.eclipse.mylyn.github.tests -Bundle-Version: 3.6.2.201501210735-r +Bundle-Version: 3.6.3.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.tasks.ui;bundle-version="[3.2.0,4.0.0)", @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.hamcrest;bundle-version="[1.1.0,2.0.0)", org.objenesis;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: Eclipse EGit -Import-Package: org.eclipse.mylyn.internal.github.core;version="[3.6.2,3.7.0)", - org.eclipse.mylyn.internal.github.ui.issue;version="[3.6.2,3.7.0)", +Import-Package: org.eclipse.mylyn.internal.github.core;version="[3.6.3,3.7.0)", + org.eclipse.mylyn.internal.github.ui.issue;version="[3.6.3,3.7.0)", org.mockito;version="[1.8.4,2.0.0)", org.mockito.runners;version="[1.8.4,2.0.0)", org.mockito.stubbing;version="[1.8.4,2.0.0)" diff --git a/org.eclipse.mylyn.github.tests/pom.xml b/org.eclipse.mylyn.github.tests/pom.xml index daeea608..d95c67f5 100644 --- a/org.eclipse.mylyn.github.tests/pom.xml +++ b/org.eclipse.mylyn.github.tests/pom.xml @@ -16,7 +16,7 @@ org.eclipse.mylyn.github github-parent - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT org.eclipse.mylyn.github.tests diff --git a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF index 8b61af7e..4cb2bd9c 100644 --- a/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.github.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.mylyn.github.ui;singleton:=true Bundle-Activator: org.eclipse.mylyn.internal.github.ui.GitHubUi -Bundle-Version: 3.6.2.201501210735-r +Bundle-Version: 3.6.3.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -23,9 +23,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.mylyn.context.core;bundle-version="[3.7.0,4.0.0)", org.eclipse.mylyn.monitor.core;bundle-version="[3.7.0,4.0.0)", org.eclipse.mylyn.resources.ui;bundle-version="[3.7.0,4.0.0)" -Export-Package: org.eclipse.mylyn.internal.github.ui;version="3.6.2";x-internal:=true, - org.eclipse.mylyn.internal.github.ui.gist;version="3.6.2";x-internal:=true, - org.eclipse.mylyn.internal.github.ui.issue;version="3.6.2";x-internal:=true +Export-Package: org.eclipse.mylyn.internal.github.ui;version="3.6.3";x-internal:=true, + org.eclipse.mylyn.internal.github.ui.gist;version="3.6.3";x-internal:=true, + org.eclipse.mylyn.internal.github.ui.issue;version="3.6.3";x-internal:=true Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.egit.core;version="[3.2.0,4.0.0)", org.eclipse.egit.core.op;version="[3.2.0,4.0.0)", @@ -47,7 +47,7 @@ Import-Package: org.eclipse.egit.core;version="[3.2.0,4.0.0)", org.eclipse.jgit.transport;version="[3.2.0,4.0.0)", org.eclipse.jgit.treewalk;version="[3.2.0,4.0.0)", org.eclipse.jgit.treewalk.filter;version="[3.2.0,4.0.0)", - org.eclipse.mylyn.internal.github.core;version="[3.6.2,3.7.0)", - org.eclipse.mylyn.internal.github.core.gist;version="[3.6.2,3.7.0)", - org.eclipse.mylyn.internal.github.core.issue;version="[3.6.2,3.7.0)", - org.eclipse.mylyn.internal.github.core.pr;version="[3.6.2,3.7.0)" + org.eclipse.mylyn.internal.github.core;version="[3.6.3,3.7.0)", + org.eclipse.mylyn.internal.github.core.gist;version="[3.6.3,3.7.0)", + org.eclipse.mylyn.internal.github.core.issue;version="[3.6.3,3.7.0)", + org.eclipse.mylyn.internal.github.core.pr;version="[3.6.3,3.7.0)" diff --git a/org.eclipse.mylyn.github.ui/pom.xml b/org.eclipse.mylyn.github.ui/pom.xml index 2bd567f0..b75d7040 100644 --- a/org.eclipse.mylyn.github.ui/pom.xml +++ b/org.eclipse.mylyn.github.ui/pom.xml @@ -14,7 +14,7 @@ github-parent org.eclipse.mylyn.github - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT 4.0.0 org.eclipse.mylyn.github.ui diff --git a/pom.xml b/pom.xml index 4fc7252a..b692a3af 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - 3.6.2.201501210735-r + 3.6.3-SNAPSHOT 3.0 -- cgit v1.2.3