update docker info for the next release

Author: tkohegyi

.gitattributes

@@ -1,2 +1,3 @@
 *.properties text eol=crlf
-*.sh text eol=lf
+*.sh text eol=lf
+Dockerfile-* text eol=lf

build.gradle

@@ -56,7 +56,6 @@ sonarqube {
         property "sonar.exclusions", "**/wilma-functionaltest/**/*"
     }
 }
-//project.tasks["sonarqube"].onlyIf { project.hasProperty('systemProp.sonar.login') }
 
 if (hasProperty('buildScan')) {
     buildScan {

config/docker/Dockerfile-Wilma

@@ -14,10 +14,10 @@ RUN \
   apt-get install -y openjdk-11-jre && \
   apt-get upgrade -y && \
   rm -rf /var/lib/apt/lists/* && \
-  wget https://github.com/epam/Wilma/releases/download/V2.0.459/wilma-application-2.0.459.zip && \
-  unzip wilma-application-2.0.459.zip && \
-  mv wilma-2.0.459.jar wilma.jar && \
-  rm -f wilma-application-2.0.459.zip
+  wget https://github.com/epam/Wilma/releases/download/V2.1.460/wilma-application-2.1.460.zip && \
+  unzip wilma-application-2.1.460.zip && \
+  mv wilma-2.1.460.jar wilma.jar && \
+  rm -f wilma-application-2.1.460.zip
 
 COPY start_wilma.sh /data/
 RUN \

config/docker/Dockerfile-Wilma_and_Wilma_Message_Search

@@ -11,10 +11,10 @@ RUN \
   apt-get upgrade -y && \
   apt-get install -y openjdk-11-jdk && \
   rm -rf /var/libs/apt/lists/* && \
-  wget https://github.com/epam/Wilma/releases/download/V2.0.459/wilma-message-search-2.0.459.zip && \
-  unzip -o wilma-message-search-2.0.459.zip && \
-  mv wilma-message-search-2.0.459.jar wilma-message-search.jar && \
-  rm -f wilma-message-search-2.0.459.zip
+  wget https://github.com/epam/Wilma/releases/download/V2.1.460/wilma-message-search-2.1.460.zip && \
+  unzip -o wilma-message-search-2.1.460.zip && \
+  mv wilma-message-search-2.1.460.jar wilma-message-search.jar && \
+  rm -f wilma-message-search-2.1.460.zip
 
 COPY start_wilma_and_message_search.sh /data/
 RUN \

config/environment/README.txt

@@ -12,14 +12,9 @@ This README is about an example test environment, right now used for continuous
 
      chmod 755 ./gradlew
 
-     #create "Wilma Stub Service and Proxy Application" and "Wilma Message Search Application"
-     ./gradlew -PlocalRepository=file:///opt/wilma/repo/ clean docs build sonarqube release -PbuildNumber=$BUILD_NUMBER
-
-     #create test client
-     ./gradlew -b wilma-test/wilma-test-client/build.gradle clean build -PbuildNumber=${BUILD_NUMBER} -x checkstyleMain -x checkstyleTest
-
-     #create test server
-     ./gradlew -b wilma-test/wilma-test-server/build.gradle clean build -PbuildNumber=${BUILD_NUMBER} -x checkstyleMain -x checkstyleTest
+     #create "Wilma Stub Service and Proxy Application", "Wilma Message Search Application" and related applications/plugins
+     #note: sonarqube target can be called as well with proper additional settings
+     ./gradlew -PlocalRepository=file:///opt/wilma/repo/ clean docs build release -PbuildNumber=$BUILD_NUMBER
 
 - wilma-deploy job exists that is triggered by every successful wilma-continuous job
  wilma-deploy job executes this shell:
@@ -46,8 +41,5 @@ After this, the test environment is ready for integration/functional test.
 
      chmod 755 ./gradlew
 
-     #create a DEV version of the wilma-service-api first
-     ./gradlew -b wilma-service-api/build.gradle clean build createPom uploadArchives -PlocalRepository=file:///opt/wilma/repo/
-
      #run functional test
-     ./gradlew -b wilma-functionaltest/build.gradle clean run -PlocalRepository=file:///opt/wilma/repo/ -Pwilmahost=localhost -PbuildTag=$BUILD_NUMBER
+     ./gradlew runFunctionalTest -PlocalRepository=file:///opt/wilma/repo/ -Pwilmahost=localhost -PbuildTag=$BUILD_NUMBER

config/environment/start-wilma-environment.sh

@@ -7,8 +7,9 @@ nohup /usr/bin/java -Xmx512m -jar wilma-message-search.jar message.search.conf.p
 sleep 10s
 
 # start wilma
+#in case JDK 13 is in use, it might be necessary to add further jdk parameters: -Djdk.tls.namedGroups="secp256r1, secp384r1, ffdhe2048, ffdhe3072"
 cd /opt/wilma/testenv/wilma
-nohup /usr/bin/java -Xmx512m -Djdk.tls.namedGroups="secp256r1, secp384r1, ffdhe2048, ffdhe3072" -jar wilma.jar wilma.conf.properties > wilma.out 2>&1 &
+nohup /usr/bin/java -Xmx512m -jar wilma.jar wilma.conf.properties > wilma.out 2>&1 &
 
 # start test-server
 cd /opt/wilma/testenv/test-server

wilma-application/modules/wilma-webapp/src/main/java/com/epam/wilma/webapp/jetty/ServerFactory.java

@@ -67,5 +67,5 @@ private HttpConfiguration getHttpConnector(final ServerProperties serverProperti
         //NOTE: serverProperties.getRequestBufferSize() is not used anymore
         return httpConfig;
     }
-    
+
 }