#72: Replaces deprecated methods, plugin type: both, Java 17, constan…

…ts for text keys

.github/workflows/ci.yml

@@ -15,6 +15,6 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '17'
     - name: Build with Maven
       run: mvn -B package --file pom.xml

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '17'
 
     - name: Build with Maven 🔧
       run: mvn -B package --file pom.xml

docs/docker.md

@@ -1,14 +1,19 @@
-Setup following a [tutorial from coffeetime.solutions]( http://coffeetime.solutions/run-atlassian-jira-and-confluence-with-postgresql-on-docker/#Overview_of_series_How_to_run_Jira_and_Confluence_behind_NGINX_reverse_proxy_on_Docker):
+# Simple Confluence Setup
 
 ```bash
 docker run --name=confluence -d -p 8090:8090 -p 8091:8091 atlassian/confluence-server:latest
 docker run --name postgres -e POSTGRES_PASSWORD=mysecretpassword -d postgres
-```
 
-Start confluence setup and configure Postgres:
-- jdbc:postgresql://192.168.65.2:5432/postgres (`docker inspect postgres` to get ip address)
-- user: postgres
-- password: mysecretpassword (defined above)
+docker inspect postgres # to get IP
+```
 
-Skip tutorial
-Create new space "Test"
+Start confluence setup
+- add a new license
+- and configure Postgres connection:
+  - hostname: IP from docker inspect
+  - port: 5432
+  - db: postgres
+  - user: postgres
+  - password: `mysecretpassword` (defined above)
+- Skip tutorial
+- Create new space "Test"

pom.xml

@@ -14,7 +14,7 @@
 
     <organization>
         <name>Baloise</name>
-        <url>http://www.baloise.ch/</url>
+        <url>https://www.baloise.ch/</url>
     </organization>
 
     <issueManagement>
@@ -32,13 +32,13 @@
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark</artifactId>
-            <version>0.62.2</version>
+            <version>0.64.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.9.0</version>
         </dependency>
 
         <dependency>
@@ -105,10 +105,16 @@
             <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.0-alpha6</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.0-alpha1</version>
+            <version>2.0.0-alpha6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -176,13 +182,22 @@
                     <verbose>false</verbose>
                 </configuration>
             </plugin>
+            <plugin>
+                <version>3.8.1</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
     <properties>
-        <confluence.version>7.4.0</confluence.version>
-        <confluence.data.version>7.4.0</confluence.data.version>
-        <amps.version>8.1.0</amps.version>
+        <confluence.version>7.9.3</confluence.version>
+        <confluence.data.version>7.9.3</confluence.data.version>
+        <amps.version>8.4.0</amps.version>
         <plugin.testrunner.version>2.0.1</plugin.testrunner.version>
         <atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
         <!-- This property ensures consistency between the key in atlassian-plugin.xml and the OSGi bundle's key. -->