Skip to content

Commit f7075fa

Browse files
committed
decker preparation for the next release
1 parent 379c972 commit f7075fa

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ It is written in Java, and the solution consists of two standalone applications:
1717
* JRE 8 for V1.6.x releases of Wilma
1818
* JRE 7 in case version earlier than V1.6.x in use
1919
* The latest [release](https://github.com/epam/Wilma/releases) of Wilma application downloaded and extracted into a folder.
20-
### Note on V1.6 and V2.0 versions
20+
#### Note on V1.6 and V2.0 versions
2121
Please be noted that there were non-backward compatible changes when Wilma is upgraded from V1.6 to V2.0. Configurations used in V1.6 (that was xml based) cannot be used for configuring V2.0 (which is json based). You should also know that V1.6 release works reliable with HTTP only, because the supported HTTPS protocols (SSLv3, TLS1) become obsolete in the meantime. On the other hand, V2.0 can be used for TLS1.1, TLS 1.2 and even for TLS1.3 - however extra configurations may be necessary and unexpected events may occur (like the used jdk does not support some of these protocols fully). HTTP part shall work without issue.
2222

23-
#### Configuring Components/Services to use Wilma
23+
### Configuring Components/Services to use Wilma
2424
The most simple way to do this is by configuring the Component/Service to use Wilma **as HTTP(S) proxy**.
2525
In case of Java components/services, this can be done by adding a few VM arguments to the run configuration:
2626

@@ -29,7 +29,7 @@ JAVA_PROXY_FLAGS=-Dhttp.proxyHost=[wilma-url] -Dhttp.proxyPort=[wilma-proxy-port
2929
java ${JAVA_PROXY_FLAGS} ...
3030
```
3131

32-
#### Configure and run Wilma
32+
### Configure and run Wilma
3333

3434
To run Wilma with simplest configuration, just download the release, extract it and run:
3535
`java -jar wilma-x.y.z.jar wilma.conf.properties`
@@ -58,7 +58,7 @@ Feel free to seek for assistance/advise, or discuss usage scenarios by submittin
5858
* **Docker image** of combined Wilma and Wilma Message Search application is available on DockerHub, see details [here](https://github.com/epam/Wilma/wiki/Docker-image-of-Wilma)
5959

6060
#### Requirements
61-
* JDK 11 (pls use earlier Wilma [releases](https://github.com/epam/Wilma/releases) than V2.0.x when you need to use Java 8 version)
61+
* JDK 15 (pls use earlier Wilma [releases](https://github.com/epam/Wilma/releases) than V2.0.x when you need to use Java 8 version)
6262
* The latest [release](https://github.com/epam/Wilma/releases) of Wilma Message Search application downloaded and extracted into a folder.
6363

6464
#### Running
@@ -72,7 +72,7 @@ There are several ways you can help us:
7272
* **Write some code.** We would love to see pull requests to this tool. Feel free to contribute (send pull request) on GitHub.
7373

7474
#### Advised working environment
75-
* OpenJDK 15 for V2.0.x
75+
* OpenJDK 15 for V2.5.x
7676
* IntelliJ IDEA Community Edition
7777
* Gradle (included in source) and Git
7878

config/docker/Dockerfile-Wilma

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ RUN \
1414
apt-get install -y openjdk-17-jre && \
1515
apt-get upgrade -y && \
1616
rm -rf /var/lib/apt/lists/* && \
17-
wget https://github.com/epam/Wilma/releases/download/V2.3.480/wilma-application-2.3.480.zip && \
18-
unzip wilma-application-2.3.480.zip && \
17+
wget https://github.com/epam/Wilma/releases/download/V2.5.493/wilma-application-2.5.493.zip && \
18+
unzip wilma-application-2.5.493.zip && \
1919
mv wilma-2.3.480.jar wilma.jar && \
20-
rm -f wilma-application-2.3.480.zip
20+
rm -f wilma-application-2.5.493.zip
2121

2222
COPY start_wilma.sh /data/
2323
RUN \

config/docker/Dockerfile-Wilma_and_Wilma_Message_Search

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ RUN \
1111
apt-get upgrade -y && \
1212
apt-get install -y openjdk-17-jdk && \
1313
rm -rf /var/libs/apt/lists/* && \
14-
wget https://github.com/epam/Wilma/releases/download/V2.3.480/wilma-message-search-2.3.480.zip && \
15-
unzip -o wilma-message-search-2.3.480.zip && \
16-
mv wilma-message-search-2.3.480.jar wilma-message-search.jar && \
17-
rm -f wilma-message-search-2.3.480.zip
14+
wget https://github.com/epam/Wilma/releases/download/V2.5.493/wilma-message-search-2.5.493.zip && \
15+
unzip -o wilma-message-search-2.5.493.zip && \
16+
mv wilma-message-search-2.5.493.jar wilma-message-search.jar && \
17+
rm -f wilma-message-search-2.5.493.zip
1818

1919
COPY start_wilma_and_message_search.sh /data/
2020
RUN \

0 commit comments

Comments
 (0)