From 902c40c65b82c0ed7da38cce7ca8b1c1aefaac5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 27 Mar 2020 16:41:14 +0100 Subject: [PATCH 1/8] Fix build warnings about encoding not being set --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index cd04332..2354409 100644 --- a/pom.xml +++ b/pom.xml @@ -267,6 +267,7 @@ 1.2.3 1.2.13 ${project.groupId}.${project.artifactId} + UTF-8 6.3.11 1.30.5 From ecfe209b87b5dd6c57812feb73080d198574eeef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 27 Mar 2020 16:42:53 +0100 Subject: [PATCH 2/8] Fix build warning about duplicated plugin configuration --- pom.xml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 2354409..587881b 100644 --- a/pom.xml +++ b/pom.xml @@ -209,13 +209,6 @@ - - maven-compiler-plugin - - 1.7 - 1.7 - - org.apache.maven.plugins maven-release-plugin @@ -250,14 +243,6 @@ false - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - @@ -277,6 +262,8 @@ 3.0.0 3.0.0 3.0.5 + 1.8 + 1.8 From 56a690f99b8caf8ecbaba1f557510c28004386d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 27 Mar 2020 16:43:33 +0100 Subject: [PATCH 3/8] Prevent spring scanner from scanning itself, which produces warnings --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 587881b..b1fa8ec 100644 --- a/pom.xml +++ b/pom.xml @@ -241,6 +241,7 @@ false + -com.atlassian.plugin.spring.scanner.annotation.* From 6663d208e4738d257139136074f5295cbd3a1a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sun, 29 Mar 2020 15:43:15 +0200 Subject: [PATCH 4/8] Update to AMPS 8.0.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b1fa8ec..772e58f 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ com.atlassian.maven.plugins - maven-jira-plugin + jira-maven-plugin ${amps.version} true @@ -249,7 +249,7 @@ 7.2.0 - 6.2.6 + 8.0.2 1.2.3 1.2.13 ${project.groupId}.${project.artifactId} From 445e6030e68cccafba4a2af798c84ecc30ca3706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sun, 29 Mar 2020 15:43:33 +0200 Subject: [PATCH 5/8] Remove manual quickreload configuration --- pom.xml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 772e58f..006b6e7 100644 --- a/pom.xml +++ b/pom.xml @@ -192,15 +192,7 @@ ${jira.version} src/aps/resources/log4j.properties false - - - - com.atlassian.labs.plugins - quickreload - ${quick.reload.version} - - - + true jira @@ -255,8 +247,6 @@ ${project.groupId}.${project.artifactId} UTF-8 6.3.11 - 1.30.5 - 7.2.0 7.2.0 3.0.8 From c63fa4aad73ec1d3723f51d2995f7b52a2e39a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 3 Jun 2020 15:13:27 +0200 Subject: [PATCH 6/8] Disable Google Analytics tracking during build Allows building when offline without build errors. --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 006b6e7..d8d26f3 100644 --- a/pom.xml +++ b/pom.xml @@ -193,6 +193,7 @@ src/aps/resources/log4j.properties false true + false jira From 585c6aacfdc117c5238043ddf0546dbc3fad02c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 3 Jun 2020 16:39:34 +0200 Subject: [PATCH 7/8] Fix missing twixie class on collapsable blocks --- src/main/resources/templates/gerrit-reviews-agile-panel.vm | 2 +- src/main/resources/templates/gerrit-reviews-side-panel.vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/gerrit-reviews-agile-panel.vm b/src/main/resources/templates/gerrit-reviews-agile-panel.vm index 27b9728..0359091 100644 --- a/src/main/resources/templates/gerrit-reviews-agile-panel.vm +++ b/src/main/resources/templates/gerrit-reviews-agile-panel.vm @@ -99,7 +99,7 @@ $i18n.getText("gerrit-reviews-side-panel.closed_reviews", $numClosed) -
+
Hide diff --git a/src/main/resources/templates/gerrit-reviews-side-panel.vm b/src/main/resources/templates/gerrit-reviews-side-panel.vm index ea192af..a9ab2f8 100644 --- a/src/main/resources/templates/gerrit-reviews-side-panel.vm +++ b/src/main/resources/templates/gerrit-reviews-side-panel.vm @@ -99,7 +99,7 @@ $i18n.getText("gerrit-reviews-side-panel.closed_reviews", $numClosed)
-
+
Hide From 57efcae9458130eeee2509815feb1915b34c0abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 3 Jun 2020 16:43:58 +0200 Subject: [PATCH 8/8] Use AUI icons instead of twixi icons The former are SVG based to support retina displays. --- src/main/resources/templates/gerrit-reviews-agile-panel.vm | 4 ++-- src/main/resources/templates/gerrit-reviews-side-panel.vm | 4 ++-- src/main/resources/templates/gerrit-reviews-tabpanel-item.vm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/templates/gerrit-reviews-agile-panel.vm b/src/main/resources/templates/gerrit-reviews-agile-panel.vm index 0359091..8d8b0d3 100644 --- a/src/main/resources/templates/gerrit-reviews-agile-panel.vm +++ b/src/main/resources/templates/gerrit-reviews-agile-panel.vm @@ -92,7 +92,7 @@