Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2015-01-27 01:48:07 +0000
committerFrank Becker2015-02-01 07:43:25 +0000
commite671ccca5330361bfd0026b86fc380ce8cea19bd (patch)
tree8892ec23e5b6475f7bc1babfdc118efaa4c74a1f
parent21d670406d5f085b37d56d32795aa8e5a9a102c9 (diff)
downloadorg.eclipse.mylyn.tasks-e671ccca5330361bfd0026b86fc380ce8cea19bd.tar.gz
org.eclipse.mylyn.tasks-e671ccca5330361bfd0026b86fc380ce8cea19bd.tar.xz
org.eclipse.mylyn.tasks-e671ccca5330361bfd0026b86fc380ce8cea19bd.zip
458453: update of Bugzilla to Version 5.0rc2, 4.4.8, 4.2.13, and 4.0.17
Change-Id: I9caf143ac40c28436b1065b6f1f3c9143baa1324 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458453
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestClientTest.java18
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestConfigurationTest.java6
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/test/support/BugzillaRestTestFixture.java3
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/configuration.json (renamed from connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/configuration.json)0
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/fieldName.json (renamed from connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/fieldName.json)0
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/fields.json (renamed from connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/fields.json)0
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/parameters.json (renamed from connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/parameters.json)0
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/products.json (renamed from connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/products.json)0
-rw-r--r--connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestVersion.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp63
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp1
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb1
12 files changed, 52 insertions, 42 deletions
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestClientTest.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestClientTest.java
index 47870448a..e1e15caf9 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestClientTest.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestClientTest.java
@@ -146,16 +146,18 @@ public class BugzillaRestClientTest {
Collection<Field> fieldCollection = fields.values();
assertConfigurationFieldNames(fieldCollection);
assertEquals(
- IOUtils.toString(CommonTestUtil.getResource(this, "testdata/" + actualFixture.getVersion()
- + "/fields.json")), new Gson().toJson(fields));
+ IOUtils.toString(CommonTestUtil.getResource(this, actualFixture.getTestDataFolder() + "/fields.json")),
+ new Gson().toJson(fields));
Map<String, Product> products = configuration.getProducts();
- assertEquals(IOUtils.toString(CommonTestUtil.getResource(this, "testdata/products.json")),
+ assertEquals(
+ IOUtils.toString(CommonTestUtil.getResource(this, actualFixture.getTestDataFolder() + "/products.json")),
new Gson().toJson(products));
Parameters parameter = configuration.getParameters();
- assertEquals(IOUtils.toString(CommonTestUtil.getResource(this, "testdata/parameters.json")),
- new Gson().toJson(parameter));
assertEquals(
- IOUtils.toString(CommonTestUtil.getResource(this, "testdata/" + actualFixture.getVersion()
+ IOUtils.toString(CommonTestUtil.getResource(this, actualFixture.getTestDataFolder()
+ + "/parameters.json")), new Gson().toJson(parameter));
+ assertEquals(
+ IOUtils.toString(CommonTestUtil.getResource(this, actualFixture.getTestDataFolder()
+ "/configuration.json")),
new Gson().toJson(configuration).replaceAll(repository.getRepositoryUrl(), "http://dummy.url"));
@@ -168,8 +170,8 @@ public class BugzillaRestClientTest {
}
Collections.sort(fieldNameList);
assertEquals(
- IOUtils.toString(CommonTestUtil.getResource(this, "testdata/" + actualFixture.getVersion()
- + "/fieldName.json")), new Gson().toJson(fieldNameList));
+ IOUtils.toString(CommonTestUtil.getResource(this, actualFixture.getTestDataFolder() + "/fieldName.json")),
+ new Gson().toJson(fieldNameList));
}
}
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestConfigurationTest.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestConfigurationTest.java
index 7b5cf074e..2e4c476cc 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestConfigurationTest.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/core/tests/BugzillaRestConfigurationTest.java
@@ -83,10 +83,10 @@ public class BugzillaRestConfigurationTest {
BugzillaRestConfiguration configuration = connector.getRepositoryConfiguration(actualFixture.repository());
assertNotNull(configuration);
assertEquals(
- IOUtils.toString(CommonTestUtil.getResource(this, "testdata/" + actualFixture.getVersion()
+ IOUtils.toString(CommonTestUtil.getResource(this, actualFixture.getTestDataFolder()
+ "/configuration.json")),
- new Gson().toJson(configuration).replaceAll(actualFixture.repository().getRepositoryUrl(),
- "http://dummy.url"));
+ new Gson().toJson(configuration).replaceAll(actualFixture.repository().getRepositoryUrl(),
+ "http://dummy.url"));
}
}
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/test/support/BugzillaRestTestFixture.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/test/support/BugzillaRestTestFixture.java
index defde2aa1..fa6bc2598 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/test/support/BugzillaRestTestFixture.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/src/org/eclipse/mylyn/internal/bugzilla/rest/test/support/BugzillaRestTestFixture.java
@@ -53,4 +53,7 @@ public class BugzillaRestTestFixture extends AbstractTestFixture {
return repository;
}
+ public String getTestDataFolder() {
+ return "testdata/" + getProperty("testdataVersion");
+ }
}
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/configuration.json b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/configuration.json
index a5f798842..a5f798842 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/configuration.json
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/configuration.json
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/fieldName.json b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/fieldName.json
index 6601d5d3a..6601d5d3a 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/fieldName.json
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/fieldName.json
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/fields.json b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/fields.json
index 1fd38f007..1fd38f007 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/4.5.6+/fields.json
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/fields.json
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/parameters.json b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/parameters.json
index 362d1d6a8..362d1d6a8 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/parameters.json
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/parameters.json
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/products.json b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/products.json
index 5d60ffe08..5d60ffe08 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/products.json
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core.tests/testdata/Version1/products.json
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestVersion.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestVersion.java
index b1ab0fb41..845182ce8 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestVersion.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/src/org/eclipse/mylyn/internal/bugzilla/rest/core/BugzillaRestVersion.java
@@ -135,7 +135,7 @@ public class BugzillaRestVersion implements Comparable<BugzillaRestVersion>, Ser
if (micro > 0) {
sb.append(".").append(Integer.toString(micro)); //$NON-NLS-1$
} else if (micro < 0) {
- sb.append("RC").append(Integer.toString(micro + 100)); //$NON-NLS-1$
+ sb.append("rc").append(Integer.toString(micro + 100)); //$NON-NLS-1$
}
if (plus) {
sb.append("+"); //$NON-NLS-1$
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 7a74304fa..feea33337 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -23,78 +23,81 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
/* Sites */
- bugzilla::site { "bugzilla-4.0.15":
+ bugzilla::site { "bugzilla-4.0.17":
major => "4",
minor => "0",
}
- bugzilla::site { "bugzilla-4.2.11":
+ bugzilla::site { "bugzilla-4.2.13":
major => "4",
minor => "2",
}
- bugzilla::site { "bugzilla-4.2.11-bugaliases":
+ bugzilla::site { "bugzilla-4.2.13-bugaliases":
major => "4",
minor => "2",
- branchTag => "bugzilla-4.2.11",
+ branchTag => "bugzilla-4.2.13",
usebugaliases => true,
}
- bugzilla::site { "bugzilla-4.4.6":
+ bugzilla::site { "bugzilla-4.4.8":
major => "4",
minor => "4",
envdefault => true,
}
- bugzilla::site { "bugzilla-4.4.6-custom-wf":
+ bugzilla::site { "bugzilla-4.4.8-custom-wf":
major => "4",
minor => "4",
- branchTag => "bugzilla-4.4.6",
+ branchTag => "bugzilla-4.4.8",
custom_wf => true,
}
- bugzilla::site { "bugzilla-4.4.6-custom-wf-and-status":
+ bugzilla::site { "bugzilla-4.4.8-custom-wf-and-status":
major => "4",
minor => "4",
- branchTag => "bugzilla-4.4.6",
+ branchTag => "bugzilla-4.4.8",
custom_wf_and_status => true,
}
-/*
- bugzilla::site { "bugzilla-master":
+ bugzilla::site { "bugzilla-5.0rc2":
major => "5",
- minor => "1",
- branchTag => "HEAD",
- envversion => "5.1",
+ minor => "0",
+ branch => "5.0",
+ envversion => "5.0rc2",
}
- bugzilla::site { "bugzilla-rest-master":
- major => "5",
- minor => "1",
+ bugzilla::site { "bugzilla-master":
+ major => "5",
+ minor => "1",
branchTag => "HEAD",
envversion => "5.1",
- envtype => "bugzillaREST",
- rest_enabled => true,
}
-*/
- bugzilla::site { "bugzilla-5.0":
- major => "5",
- minor => "0",
- branch => "5.0",
- branchTag => "5.0",
- envversion => "4.5.6+",
- }
+/*******************************************************************************
+ * REST sites
+ *******************************************************************************/
- bugzilla::site { "bugzilla-5.0-rest":
+ bugzilla::site { "bugzilla-5.0rc2-rest":
major => "5",
minor => "0",
branch => "5.0",
- branchTag => "5.0",
+ branchTag => "bugzilla-5.0rc2",
envtype => "bugzillaREST",
rest_enabled => true,
envdefault_rest => true,
- envversion => "4.5.6+",
+ envversion => "5.0rc2",
+ testdataVersion => "Version1",
+ }
+
+ bugzilla::site { "bugzilla-rest-master":
+ major => "5",
+ minor => "1",
+ branchTag => "HEAD",
+ envversion => "5.1",
+ envtype => "bugzillaREST",
+ rest_enabled => true,
+ testdataVersion => "Version1",
}
} \ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
index 0685316bf..af9b7d43c 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -35,6 +35,7 @@ define bugzilla::site (
$clearMode = $bugzilla::clearMode,
$rest_enabled = false,
$envinfo = "",
+ $testdataVersion = "",
) {
include "bugzilla"
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
index e8abf3ae3..782077850 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
@@ -14,5 +14,6 @@
<% if @branch %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"branch": "<%= @branch %>"<% end %>
<% if @branchTag %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"branchTag": "<%= @branchTag %>"<% end %>
<% if @rest_enabled %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"rest_enabled": "<%= @rest_enabled %>"<% end %>
+<% if @testdataVersion %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"testdataVersion": "<%= @testdataVersion %>"<% end %>
}
} \ No newline at end of file

Back to the top