7.0.1 compatibility (not extensively tested)

pom.xml

@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.echocat</groupId>
     <artifactId>adam</artifactId>
-    <version>0.1.13</version>
+    <version>0.1.16</version>
     <name>echocat Adam</name>
     <packaging>atlassian-plugin</packaging>
 
@@ -38,10 +38,10 @@
         <version.org.echocat.jomon>1.5.0</version.org.echocat.jomon>
         <version.org.javassist>3.20.0-GA</version.org.javassist>
         <version.org.slf4j>1.7.21</version.org.slf4j>
-        <version.org.eclipse.persistence>2.6.4</version.org.eclipse.persistence>
-        <version.com.atlassian.confluence>6.0.2</version.com.atlassian.confluence>
-        <version.com.atlassian.confluence.data>6.0.2</version.com.atlassian.confluence.data>
-        <version.com.atlassian.maven.plugins.amps>6.2.8</version.com.atlassian.maven.plugins.amps>
+        <version.org.eclipse.persistence>2.7.6</version.org.eclipse.persistence>
+        <version.com.atlassian.confluence>7.3.4</version.com.atlassian.confluence>
+        <version.com.atlassian.confluence.data>7.3.4</version.com.atlassian.confluence.data>
+        <version.com.atlassian.maven.plugins.amps>8.0.2</version.com.atlassian.maven.plugins.amps>
         <version.com.atlassian.plugins.testrunner>1.2.3</version.com.atlassian.plugins.testrunner>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.randombits.confluence</groupId>
             <artifactId>confluence-conveyor</artifactId>
-            <version>1.0.1</version>
+            <version>1.2.1</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
@@ -201,7 +201,7 @@
         <plugins>
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-confluence-plugin</artifactId>
+                <artifactId>confluence-maven-plugin</artifactId>
                 <version>${version.com.atlassian.maven.plugins.amps}</version>
                 <extensions>true</extensions>
                 <configuration>
@@ -214,12 +214,12 @@
             </plugin>
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-amps-dispatcher-plugin</artifactId>
+                <artifactId>amps-dispatcher-maven-plugin</artifactId>
                 <version>${version.com.atlassian.maven.plugins.amps}</version>
             </plugin>
             <plugin>
                 <groupId>com.atlassian.maven.plugins</groupId>
-                <artifactId>maven-amps-plugin</artifactId>
+                <artifactId>amps-maven-plugin</artifactId>
                 <version>${version.com.atlassian.maven.plugins.amps}</version>
                 <configuration>
                     <jvmArgs>-Xms128m -Xmx2048m -XX:MaxPermSize=512m -Dconfluence.velocity.deprecation.strictmode=false</jvmArgs>
@@ -300,4 +300,4 @@
         <tag>HEAD</tag>
     </scm>
 
-</project>
+</project>

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();

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;
     }

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;
     }

src/main/resources/org/echocat/adam/convoyed/conveyor-config.xml

@@ -66,7 +66,7 @@
     </package-override>
 
     <package-override name="default">
-        <default-interceptor-ref name="validatingStack"/>
+        <default-interceptor-ref name="defaultStack"/>
         <action-override name="peopledirectory" class="org.echocat.adam.profile.ExtendedPeopleDirectoryAction" inherit="false">
             <interceptor-ref name="validatingStack"/>
             <result name="oldsearch" type="redirect">/dopeopledirectorysearch.action?searchQueryBean.queryString=${oldSearchString}&amp;showOnlyPersonal=${showOnlyPersonal}&amp;startIndex=${oldStartIndex}</result>

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

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

src/main/resources/org/echocat/adam/profile/UserProfileMacro.unkownUser.vm

@@ -1,2 +1,2 @@
 #requireResource("org.echocat.adam:userProfileResources")
-<div class="profile-marco error">${i18n.getText("org.echocat.adam.unkownUser", $username)}</div>
+<div class="profile-marco error">${i18n.getText("org.echocat.adam.unknownUser", $username)}</div>