upgrade to use gradle 7.4.2, new mitmjavaproxy lib, compiled with jdk15

epam · May 12, 2022 · 3f751e3 · 3f751e3
1 parent bc3b8bf
commit 3f751e3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,8 @@ It is written in Java, and the solution consists of two standalone applications:
 # Quick intro for end users
 ## Wilma application
 #### Requirements
-* \>=JRE 11 for V2.0.x releases of Wilma
+* JRE 15 for V2.3.x releases of Wilma
+* JRE 11 for V2.0.x-V2.2.x releases of Wilma
 * JRE 8 for V1.6.x releases of Wilma
 * JRE 7 in case version earlier than V1.6.x in use
 * The latest [release](https://github.com/epam/Wilma/releases) of Wilma application downloaded and extracted into a folder.
@@ -35,6 +36,10 @@ To run Wilma with simplest configuration, just download the release, extract it
 
 See [this page](http://epam.github.io/Wilma/endusers/index.html) for more detailed information on how to configure Wilma, and Component/Service that uses Wilma.
 
+In case you would like to use Wilma with its HTTPS support, it is suggested to start Wilma with additional parameters:
+`java -Djdk.tls.namedGroups="secp256r1, secp384r1, ffdhe2048, ffdhe3072" -jar wilma-x.y.z.jar wilma.conf.properties`
+
+
 #### Docker Image of Wilma
 * **Docker image** of Wilma is available on DockerHub, see details [here](https://github.com/epam/Wilma/wiki/Docker-image-of-Wilma)
 

diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ ext {
     componentName='wilma'
     javaxServletApi='javax.servlet:javax.servlet-api:3.1.0'
     javaxAnnotationApi='javax.annotation:javax.annotation-api:1.3.2'
-    orgJsonApi='org.json:json:20210307'
+    orgJsonApi='org.json:json:20220320'
 }
 
 apply from: 'common.gradle'

diff --git a/config/docker/Dockerfile-Wilma b/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.2.461/wilma-application-2.2.461.zip && \
-  unzip wilma-application-2.2.461.zip && \
-  mv wilma-2.2.461.jar wilma.jar && \
-  rm -f wilma-application-2.2.461.zip
+  wget https://github.com/epam/Wilma/releases/download/V2.3.480/wilma-application-2.3.480.zip && \
+  unzip wilma-application-2.3.480.zip && \
+  mv wilma-2.3.480.jar wilma.jar && \
+  rm -f wilma-application-2.3.480.zip
 
 COPY start_wilma.sh /data/
 RUN \

diff --git a/config/docker/Dockerfile-Wilma_and_Wilma_Message_Search b/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.2.461/wilma-message-search-2.2.461.zip && \
-  unzip -o wilma-message-search-2.2.461.zip && \
-  mv wilma-message-search-2.2.461.jar wilma-message-search.jar && \
-  rm -f wilma-message-search-2.2.461.zip
+  wget https://github.com/epam/Wilma/releases/download/V2.3.480/wilma-message-search-2.3.480.zip && \
+  unzip -o wilma-message-search-2.3.480.zip && \
+  mv wilma-message-search-2.3.480.jar wilma-message-search.jar && \
+  rm -f wilma-message-search-2.3.480.zip
 
 COPY start_wilma_and_message_search.sh /data/
 RUN \

diff --git a/config/docker/start_wilma.sh b/config/docker/start_wilma.sh
@@ -10,7 +10,7 @@ WILMA_BUILD=wilma.jar
 if [ -n "$WILMA_JMX_PORT" ]; then
     WILMA_JMX="-Dcom.sun.management.jmxremote.port=$WILMA_JMX_PORT -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 fi
-WILMA_START_CMD="java $WILMA_JMX $WILMA_MX_SIZE $WILMA_KEYSTORE $WILMA_KEYSTORE_PASSWORD -jar $WILMA_BUILD $WILMA_CONFIGURATION"
+WILMA_START_CMD="java -Djdk.tls.namedGroups=\"secp256r1, secp384r1, ffdhe2048, ffdhe3072\" $WILMA_JMX $WILMA_MX_SIZE $WILMA_KEYSTORE $WILMA_KEYSTORE_PASSWORD -jar $WILMA_BUILD $WILMA_CONFIGURATION"
 
 echo
 echo "Welcome to dockerized Wilma!"

diff --git a/config/docker/start_wilma_and_message_search.sh b/config/docker/start_wilma_and_message_search.sh
@@ -10,7 +10,7 @@ WILMA_BUILD=wilma.jar
 if [ -n "$WILMA_JMX_PORT" ]; then
     WILMA_JMX="-Dcom.sun.management.jmxremote.port=$WILMA_JMX_PORT -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 fi
-WILMA_START_CMD="java $WILMA_JMX $WILMA_MX_SIZE $WILMA_KEYSTORE $WILMA_KEYSTORE_PASSWORD -jar $WILMA_BUILD $WILMA_CONFIGURATION"
+WILMA_START_CMD="java -Djdk.tls.namedGroups=\"secp256r1, secp384r1, ffdhe2048, ffdhe3072\" $WILMA_JMX $WILMA_MX_SIZE $WILMA_KEYSTORE $WILMA_KEYSTORE_PASSWORD -jar $WILMA_BUILD $WILMA_CONFIGURATION"
 
 WILMA_MS_BUILD=wilma-message-search.jar
 #WILMA_MS_CONFIGURATION is an external environment variable, usually: message.search.conf.properties

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/wilma-application/modules/wilma-proxy-integration/build.gradle b/wilma-application/modules/wilma-proxy-integration/build.gradle
@@ -28,8 +28,7 @@ dependencies {
     implementation project(':wilma-application:wilma-common')
     implementation project(':wilma-application:wilma-core')
     implementation project(':wilma-application:wilma-properties')
-//    implementation('website.magyar:mitm-java-proxy:2.1.24.108') {
-    implementation('website.magyar:mitm-java-proxy:2.0.23.105') {
+    implementation('website.magyar:mitm-java-proxy:2.1.24.112') {
         exclude(group: 'ch.qos.logback', module: 'logback-classic')
         exclude(group: 'org.eclipse.jetty', module: 'jetty-io')
         exclude(group: 'org.slf4j', module: 'jcl-over-slf4j')