From 25e64a893091aabc5f00a726cd77794b932bd8ca Mon Sep 17 00:00:00 2001 From: Alex/AT Date: Sat, 28 Sep 2019 14:31:09 +0300 Subject: [PATCH 1/8] [*] Rename unkownUser to unknownUser, fixing the typo --- src/main/resources/org/echocat/adam/messages.properties | 2 +- src/main/resources/org/echocat/adam/messages_de_DE.properties | 2 +- .../org/echocat/adam/profile/UserProfileMacro.unkownUser.vm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/org/echocat/adam/messages.properties b/src/main/resources/org/echocat/adam/messages.properties index 8a70bf3..fbc775d 100644 --- a/src/main/resources/org/echocat/adam/messages.properties +++ b/src/main/resources/org/echocat/adam/messages.properties @@ -33,7 +33,7 @@ org.echocat.adam.user-profile.param.groupLabels.label = Group labels org.echocat.adam.user-profile.param.elements.label = Elements org.echocat.adam.missingUsername = Missing username -org.echocat.adam.unkownUser = Unknown user: {0} +org.echocat.adam.unknownUser = Unknown user: {0} org.echocat.adam.illegalFormat = Illegal format. org.echocat.adam.default = Default diff --git a/src/main/resources/org/echocat/adam/messages_de_DE.properties b/src/main/resources/org/echocat/adam/messages_de_DE.properties index 5081428..801bcc9 100644 --- a/src/main/resources/org/echocat/adam/messages_de_DE.properties +++ b/src/main/resources/org/echocat/adam/messages_de_DE.properties @@ -31,7 +31,7 @@ org.echocat.adam.user-profile.param.border.label = Rahmen org.echocat.adam.user-profile.param.avatar.label = Avatar org.echocat.adam.missingUsername = Benutzername wurde nicht angegeben. -org.echocat.adam.unkownUser = Unbekannter Benutzer: {0} +org.echocat.adam.unknownUser = Unbekannter Benutzer: {0} org.echocat.adam.illegalFormat = Falsches Format. org.echocat.adam.personal = Pers\u00F6nlich diff --git a/src/main/resources/org/echocat/adam/profile/UserProfileMacro.unkownUser.vm b/src/main/resources/org/echocat/adam/profile/UserProfileMacro.unkownUser.vm index 768d34f..aacadfb 100644 --- a/src/main/resources/org/echocat/adam/profile/UserProfileMacro.unkownUser.vm +++ b/src/main/resources/org/echocat/adam/profile/UserProfileMacro.unkownUser.vm @@ -1,2 +1,2 @@ #requireResource("org.echocat.adam:userProfileResources") -
${i18n.getText("org.echocat.adam.unkownUser", $username)}
\ No newline at end of file +
${i18n.getText("org.echocat.adam.unknownUser", $username)}
\ No newline at end of file From abccde065f0883ae101e83dcd437f9184c2867ee Mon Sep 17 00:00:00 2001 From: Alex/AT Date: Sat, 28 Sep 2019 14:33:05 +0300 Subject: [PATCH 2/8] [*] Fix for Confluence 7.0.0 and up: PersonalInformationManager.getPersonalInformation is deprecated and replaced with getOrCreatePersonalInformation --- src/main/java/org/echocat/adam/profile/Profile.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/echocat/adam/profile/Profile.java b/src/main/java/org/echocat/adam/profile/Profile.java index 905f8e6..91d81f4 100644 --- a/src/main/java/org/echocat/adam/profile/Profile.java +++ b/src/main/java/org/echocat/adam/profile/Profile.java @@ -77,7 +77,7 @@ public Profile(@Nonnull String name, @Nullable String fullName, @Nullable String } public void reIndex() { - _confluenceIndexer.index(getPersonalInformation()); + _confluenceIndexer.index(getOrCreatePersonalInformation()); } public void setValue(@Nonnull ElementModel of, @Nullable String to) { @@ -120,7 +120,7 @@ public String getValue(@Nonnull ElementModel of) { } @Nonnull - public PersonalInformation getPersonalInformation() { + public PersonalInformation getOrCreatePersonalInformation() { return _personalInformationManager.getOrCreatePersonalInformation(this); } @@ -136,7 +136,7 @@ protected void setPersonalInformationBody(@Nullable String to) { @Nullable protected String getPersonalInformationBody() { // noinspection deprecation - final PersonalInformation information = _personalInformationManager.getPersonalInformation(this); + final PersonalInformation information = _personalInformationManager.getOrCreatePersonalInformation(this); final String body = information.getBodyAsString(); return body == null || isEmpty(body.trim()) ? null : body; } From 0da3a6c90d729129f057e4842df91d61a097c3ea Mon Sep 17 00:00:00 2001 From: Alex/AT Date: Sat, 28 Sep 2019 14:35:02 +0300 Subject: [PATCH 3/8] [!] Bump version to 0.1.15 [!] Not 100% tested with Confluence 7, but works for me in 7.0.1, so up this plugin to 7.0.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 24a4f43..a8db528 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.echocat adam - 0.1.13 + 0.1.15 echocat Adam atlassian-plugin @@ -39,8 +39,8 @@ 3.20.0-GA 1.7.21 2.6.4 - 6.0.2 - 6.0.2 + 7.0.1 + 7.0.1 6.2.8 1.2.3 UTF-8 From e9cf2b6e05fd699bd284e6eb8e6c8e8e5e328f7f Mon Sep 17 00:00:00 2001 From: Sanjay Govind Date: Fri, 29 Nov 2019 09:37:04 +1300 Subject: [PATCH 4/8] Update to latest version of conveyor, use defaultStack instead of validatingStack as default --- pom.xml | 4 ++-- .../resources/org/echocat/adam/convoyed/conveyor-config.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a8db528..9402a3b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.echocat adam - 0.1.15 + 0.1.16 echocat Adam atlassian-plugin @@ -118,7 +118,7 @@ org.randombits.confluence confluence-conveyor - 1.0.1 + 1.2.1 provided true diff --git a/src/main/resources/org/echocat/adam/convoyed/conveyor-config.xml b/src/main/resources/org/echocat/adam/convoyed/conveyor-config.xml index 7cfaf4f..9ba8620 100644 --- a/src/main/resources/org/echocat/adam/convoyed/conveyor-config.xml +++ b/src/main/resources/org/echocat/adam/convoyed/conveyor-config.xml @@ -66,7 +66,7 @@ - + /dopeopledirectorysearch.action?searchQueryBean.queryString=${oldSearchString}&showOnlyPersonal=${showOnlyPersonal}&startIndex=${oldStartIndex} From 648d8bc7c21d7da410bab7cec81259eb58410e5c Mon Sep 17 00:00:00 2001 From: Sanjay Govind Date: Fri, 29 Nov 2019 09:49:06 +1300 Subject: [PATCH 5/8] Bump confluence version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9402a3b..46ee6e4 100644 --- a/pom.xml +++ b/pom.xml @@ -39,8 +39,8 @@ 3.20.0-GA 1.7.21 2.6.4 - 7.0.1 - 7.0.1 + 7.0.4 + 7.0.4 6.2.8 1.2.3 UTF-8 From f138200a59d50d024fdd28d702b15cac314d9dbb Mon Sep 17 00:00:00 2001 From: cwittenb Date: Wed, 8 Apr 2020 14:27:30 +0200 Subject: [PATCH 6/8] new pom updated to confluence=7.3.4 and version.org.eclipse.persistence=2.7.6 --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index a8db528..ec5cdf6 100644 --- a/pom.xml +++ b/pom.xml @@ -38,10 +38,10 @@ 1.5.0 3.20.0-GA 1.7.21 - 2.6.4 - 7.0.1 - 7.0.1 - 6.2.8 + 2.7.6 + 7.3.4 + 7.3.4 + 8.0.2 1.2.3 UTF-8 UTF-8 @@ -201,7 +201,7 @@ com.atlassian.maven.plugins - maven-confluence-plugin + confluence-maven-plugin ${version.com.atlassian.maven.plugins.amps} true @@ -214,12 +214,12 @@ com.atlassian.maven.plugins - maven-amps-dispatcher-plugin + amps-dispatcher-maven-plugin ${version.com.atlassian.maven.plugins.amps} com.atlassian.maven.plugins - maven-amps-plugin + amps-maven-plugin ${version.com.atlassian.maven.plugins.amps} -Xms128m -Xmx2048m -XX:MaxPermSize=512m -Dconfluence.velocity.deprecation.strictmode=false @@ -300,4 +300,4 @@ HEAD - + \ No newline at end of file From 3fa4e58a85fe3c8d3e1d69ab26542e3a7521ded7 Mon Sep 17 00:00:00 2001 From: cwittenb Date: Wed, 8 Apr 2020 14:29:02 +0200 Subject: [PATCH 7/8] removing throw clauses --- .../org/echocat/adam/profile/ExtendedPeopleDirectoryAction.java | 2 +- .../org/echocat/adam/profile/ExtendedViewUserProfileAction.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/echocat/adam/profile/ExtendedPeopleDirectoryAction.java b/src/main/java/org/echocat/adam/profile/ExtendedPeopleDirectoryAction.java index 34b17dd..b94b64b 100644 --- a/src/main/java/org/echocat/adam/profile/ExtendedPeopleDirectoryAction.java +++ b/src/main/java/org/echocat/adam/profile/ExtendedPeopleDirectoryAction.java @@ -92,7 +92,7 @@ public String doSearch() { } @Override - public String doBrowse() throws Exception { + public String doBrowse() { setQueryString(""); final Report report = getEffectiveReport(); _reports = determinateReports(); diff --git a/src/main/java/org/echocat/adam/profile/ExtendedViewUserProfileAction.java b/src/main/java/org/echocat/adam/profile/ExtendedViewUserProfileAction.java index 75e39b0..c53d24e 100644 --- a/src/main/java/org/echocat/adam/profile/ExtendedViewUserProfileAction.java +++ b/src/main/java/org/echocat/adam/profile/ExtendedViewUserProfileAction.java @@ -30,7 +30,7 @@ public class ExtendedViewUserProfileAction extends ViewUserProfileAction { @Override - public String execute() throws Exception { + public String execute() { final String result = super.execute(); return result; } From bbf378537137e28d355227727a2a4ec8139fefbe Mon Sep 17 00:00:00 2001 From: Alex/AT Date: Mon, 11 May 2020 10:12:38 +0300 Subject: [PATCH 8/8] Facilitate merge with latest changes from cwittenb --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 46ee6e4..9402a3b 100644 --- a/pom.xml +++ b/pom.xml @@ -39,8 +39,8 @@ 3.20.0-GA 1.7.21 2.6.4 - 7.0.4 - 7.0.4 + 7.0.1 + 7.0.1 6.2.8 1.2.3 UTF-8