diff options
3 files changed, 25 insertions, 19 deletions
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestValidateRequest.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestValidateRequest.java index f0a0d0d1d..795bf4e32 100644 --- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestValidateRequest.java +++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestValidateRequest.java @@ -30,8 +30,11 @@ public class BugzillaRestValidateRequest extends BugzillaRestAuthenticatedGetReq @Override protected void doValidate(CommonHttpResponse response, IOperationMonitor monitor) throws IOException, - BugzillaRestException { - validate(response, HttpStatus.SC_BAD_REQUEST, monitor); + BugzillaRestException { + // since 4.5.5 we get an HttpStatus.SC_NOT_FOUND instead of an HttpStatus.SC_BAD_REQUEST + validate(response, response.getStatusCode() == HttpStatus.SC_NOT_FOUND + ? HttpStatus.SC_NOT_FOUND + : HttpStatus.SC_BAD_REQUEST, monitor); } @Override diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp index 08822bca2..15af870cd 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp @@ -56,40 +56,40 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug minor => "0", } - bugzilla::site { "bugzilla-4.2.9": + bugzilla::site { "bugzilla-4.2.10": major => "4", minor => "2", } - bugzilla::site { "bugzilla-4.2.9-bugaliases": + bugzilla::site { "bugzilla-4.2.10-bugaliases": major => "4", minor => "2", - branchTag => "bugzilla-4.2.9", + branchTag => "bugzilla-4.2.10", usebugaliases => true, } - bugzilla::site { "bugzilla-4.4.4": + bugzilla::site { "bugzilla-4.4.5": major => "4", minor => "4", envdefault => true, } -bugzilla::site { "bugzilla-4.5.4": +bugzilla::site { "bugzilla-4.5.5": major => "4", minor => "5", branch => "trunk", - branchTag => "bugzilla-4.5.4", - envversion => "4.5.4", + branchTag => "bugzilla-4.5.5", + envversion => "4.5.5", } - -bugzilla::site { "bugzilla-rest-4.5.4": + +bugzilla::site { "bugzilla-rest-4.5.5": major => "4", minor => "5", branch => "trunk", - branchTag => "bugzilla-4.5.4", + branchTag => "bugzilla-4.5.5", rest_enabled => true, - envversion => "4.5.4", - envinfo => "4.5.4, REST enabled" + envversion => "4.5.5", + envinfo => "4.5.5, REST enabled" } bugzilla::site { "bugzilla-trunk": @@ -97,7 +97,7 @@ bugzilla::site { "bugzilla-rest-4.5.4": minor => "5", branch => "trunk", branchTag => "trunk", - envversion => "4.5.4+", + envversion => "4.5.5+", } bugzilla::site { "bugzilla-rest-trunk": @@ -105,9 +105,8 @@ bugzilla::site { "bugzilla-rest-trunk": minor => "5", branch => "trunk", branchTag => "trunk", - envversion => "4.5.4+", + envversion => "4.5.5+", envdefault_rest => true, rest_enabled => true, } - }
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb index 7e2ae20c3..45c7e992d 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb @@ -15,5 +15,9 @@ <% if @operatingsystemrelease = "12.04" && @envversion > "4.4" %> /usr/bin/perl install-module.pl Template <% end %> -echo "Ende1" - +<% if @envversion > "4.5.4" %> +/usr/bin/perl install-module.pl DateTime +/usr/bin/perl install-module.pl DateTime::TimeZone +/usr/bin/perl install-module.pl File::Slurp +<% end %> +echo "Ende1"
\ No newline at end of file |