Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c3f73a
#72: Replaces deprecated methods, plugin type: both, Java 17, constan…
Tiliavir Feb 26, 2022
d361e63
Merge branch 'feature/82_cache-issue' into feature/72_dc_ready
Tiliavir Aug 21, 2022
4bacc1b
Command order in md
Tiliavir Aug 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
uses: actions/setup-java@v3
with:
'distribution': adopt
java-version: '11'
java-version: '17'
- name: Build with Maven
run: mvn -B package --file pom.xml
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v3
with:
'distribution': adopt
java-version: '11'
java-version: '17'

- name: Build with Maven 🔧
run: mvn -B package --file pom.xml
Expand Down
17 changes: 13 additions & 4 deletions docs/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
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 postgres -e POSTGRES_PASSWORD=mysecretpassword -d postgres
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
docker inspect postgres # to get IP
```

Start confluence setup and configure Postgres:
Expand All @@ -11,5 +12,13 @@ Start confluence setup and configure Postgres:
- user: postgres
- password: mysecretpassword (defined above)

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"
29 changes: 22 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<organization>
<name>Baloise</name>
<url>http://www.baloise.ch/</url>
<url>https://www.baloise.ch/</url>
</organization>

<issueManagement>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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. -->
Expand Down
Loading