Merge branch 'stable-3.9'
* stable-3.9:
docs/config: set code block language to ini
docs/config: correct section for association policy
docs/config: say which association policy is the default
Release-Notes: skip
Change-Id: I88c7c8983c31a24752643bb1f9833f9020edad30
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..e404c2f
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,12 @@
+- job:
+ name: plugins-its-jira-build
+ parent: gerrit-plugin-build
+ required-projects:
+ - plugins/its-base
+
+- project:
+ description: |
+ Build the plugin in check.
+ check:
+ jobs:
+ - plugins-its-jira-build
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index 63536af..5214732 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -298,7 +298,7 @@
```
{namespace etc.its.templates}
-{template .link}
+{template link}
{@param changeUrl: string}
{@param subject: string}
{@param status: string}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraITTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraITTest.java
index a656a06..d5f5d32 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraITTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraITTest.java
@@ -37,6 +37,7 @@
import com.google.gerrit.acceptance.UseLocalDisk;
import com.google.gerrit.acceptance.config.GerritConfig;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
+import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.testing.ConfigSuite;
import com.google.inject.Inject;
import java.io.IOException;
@@ -70,7 +71,7 @@
private static final int PORT = 19888;
private static final String URL = "http://localhost:" + PORT;
private static final String COMMENT_SECTION = "commentLink." + PLUGIN_NAME;
-
+ @Inject private SitePaths sitePaths;
private Path its_dir;
@Rule public WireMockRule wireMockRule = new WireMockRule(options().port(PORT));
@@ -300,7 +301,7 @@
}
private void createItsDir() throws IOException {
- its_dir = server.getSitePath().resolve("etc").resolve("its");
+ its_dir = sitePaths.resolve("etc").resolve("its");
Files.createDirectories(its_dir);
}
