diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 7d3b754d2c..9571cfaca2 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -62,10 +62,10 @@ jobs:
sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq python3-pip build-essential libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config libssl-dev git cmake
pip install mkdocs mkdocs-material
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
- java-version: '11'
+ java-version: '17'
distribution: 'temurin'
check-latest: true
cache: 'maven'
@@ -89,7 +89,7 @@ jobs:
- name: Build SW360
run: |
- mvn clean install --no-transfer-progress -P deploy -Dhelp-docs=true -Dbase.deploy.dir=. -Dliferay.deploy.dir=${PWD}/deploy -Dbackend.deploy.dir=${PWD}/deploy/webapps -Drest.deploy.dir=${PWD}/deploy/webapps -DRunComponentVisibilityRestrictionTest=false -DRunPrivateProjectAccessTest=false -DRunRestForceUpdateTest=false
+ mvn clean install --no-transfer-progress -P deploy -Dhelp-docs=true -Dbase.deploy.dir=. -Dliferay.deploy.dir=${PWD}/deploy -Dbackend.deploy.dir=${PWD}/deploy/webapps -Drest.deploy.dir=${PWD}/deploy/webapps -DRunComponentVisibilityRestrictionTest=false -DRunPrivateProjectAccessTest=false -DRunRestForceUpdateTest=false -fae
- name: Run PrivateProjectAccessTest
run: |
@@ -118,3 +118,7 @@ jobs:
run: |
cd clients
mvn clean install --no-transfer-progress -DRunRestIntegrationTest=true
+
+ - name: Publish Test Report
+ if: success() || failure()
+ uses: scacap/action-surefire-report@v1
diff --git a/.github/workflows/docker_deploy.yml b/.github/workflows/docker_deploy.yml
index 623f937e59..54b0d7c919 100644
--- a/.github/workflows/docker_deploy.yml
+++ b/.github/workflows/docker_deploy.yml
@@ -45,10 +45,10 @@ jobs:
- name: Checkout main repository
uses: actions/checkout@v4
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v4
with:
- java-version: '11'
+ java-version: '17'
cache: 'maven'
distribution: 'temurin'
diff --git a/.versions b/.versions
index 52977f040e..2312291000 100755
--- a/.versions
+++ b/.versions
@@ -1,5 +1,5 @@
-THRIFT_VERSION=0.18.1
+THRIFT_VERSION=0.20.0
LIFERAY_VERSION=7.4.3.18-ga18
LIFERAY_SOURCE=liferay-ce-portal-tomcat-7.4.3.18-ga18-20220329092001364.tar.gz
UBUNTU_VERSION=jammy
-JAVA_VERSION=11
+JAVA_VERSION=17
diff --git a/Dockerfile b/Dockerfile
index 193b08298b..df1920a2d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
#-----------------------------------------------------------------------------------
# Base image
# We need use JDK, JRE is not enough as Liferay do runtime changes and require javac
-ARG JAVA_VERSION=11
+ARG JAVA_VERSION=17
ARG UBUNTU_VERSION=jammy
# Use OpenJDK Eclipe Temurin Ubuntu LTS
@@ -120,7 +120,7 @@ COPY --from=sw360thriftbuild /usr/local/bin/thrift /usr/local/bin/thrift
# SW360 Build Test image
# Base image to build with test
-FROM maven:3-eclipse-temurin-11 as sw360test
+FROM maven:3-eclipse-temurin-17 as sw360test
COPY --from=thrift /usr/local/bin/thrift /usr/bin
@@ -148,7 +148,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
# So when decide to use as development, only this last stage
# is triggered by buildkit images
-FROM maven:3.9-eclipse-temurin-11 as sw360build
+FROM maven:3.9-eclipse-temurin-17 as sw360build
ARG COUCHDB_HOST=localhost
@@ -250,7 +250,7 @@ COPY --chown=$USERNAME:$USERNAME ./scripts/docker-config/portal-ext.properties /
COPY --chown=$USERNAME:$USERNAME ./scripts/docker-config/entry_point.sh /app/entry_point.sh
# Tomcat manager for debugging portlets
-COPY --chown=$USERNAME:$USERNAME --from=tomcat:9.0.56-jdk11 /usr/local/tomcat/webapps.dist/manager /app/sw360/tomcat/webapps/manager
+COPY --chown=$USERNAME:$USERNAME --from=tomcat:9.0.56-jdk17 /usr/local/tomcat/webapps.dist/manager /app/sw360/tomcat/webapps/manager
RUN --mount=type=bind,target=/build/sw360,rw \
if [ DEBUG ]; then \
cp /etc/sw360/manager/tomcat-users.xml /app/sw360/tomcat/conf/tomcat-users.xml ; \
diff --git a/pom.xml b/pom.xml
index 0cdfd7c8bc..9765fea53b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,25 +68,27 @@
1.0.0
- 11
- 11
+ 17
+ 17
+ 17
+ 17
UTF-8
UTF-8
2.2.2
3.3.0
- 0.8.8
+ 0.8.12
3.4.2
5.1.8
3.10.1
3.3.0
- 3.1.0
- 3.0.0-M7
+ 3.4.1
+ 3.3.0
3.2.2
3.3.0
3.2.1
- 3.0.0-M7
+ 3.3.0
3.3.2
2.12.0
@@ -202,6 +204,7 @@
-Dcatalina.home=${project.build.directory}/home -Xms128m -Xmx256m -XX:MaxPermSize=512m
+
@@ -587,7 +590,6 @@
${javax.servlet-api.version}
provided
-
@@ -665,6 +667,12 @@
org.apache.maven.plugins
maven-surefire-plugin
${maven-surefire-plugin.version}
+
+ -Xms512m -Xmx1024m -XX:MaxPermSize=512m
+ 0
+ false
+ plain
+
@@ -830,7 +838,7 @@
-
+
@@ -899,6 +907,9 @@
You must set at least the property
'base.deploy.dir'!
+
+ [17,18)
+
true
diff --git a/sw360.code-workspace b/sw360.code-workspace
index 441e892f97..7ad783184d 100644
--- a/sw360.code-workspace
+++ b/sw360.code-workspace
@@ -1,11 +1,26 @@
{
"folders": [
{
- "path": "."
- }
+ "path": ".",
+ },
],
"settings": {
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable",
- "java.compile.nullAnalysis.mode": "automatic"
- }
+ "java.compile.nullAnalysis.mode": "automatic",
+ "workbench.colorCustomizations": {
+ "commandCenter.border": "#15202b99",
+ "sash.hoverBorder": "#65c89b",
+ "statusBar.background": "#42b883",
+ "statusBar.foreground": "#15202b",
+ "statusBarItem.hoverBackground": "#359268",
+ "statusBarItem.remoteBackground": "#42b883",
+ "statusBarItem.remoteForeground": "#15202b",
+ "titleBar.activeBackground": "#42b883",
+ "titleBar.activeForeground": "#15202b",
+ "titleBar.inactiveBackground": "#42b88399",
+ "titleBar.inactiveForeground": "#15202b99",
+ },
+ "peacock.color": "#42b883",
+ "java.configuration.updateBuildConfiguration": "automatic",
+ },
}
diff --git a/third-party/couchdb-lucene/pom.xml b/third-party/couchdb-lucene/pom.xml
index 274613425b..58e096e2b3 100644
--- a/third-party/couchdb-lucene/pom.xml
+++ b/third-party/couchdb-lucene/pom.xml
@@ -34,6 +34,7 @@
UTF-8
UTF-8
${backend.deploy.dir}
+ true
@@ -271,22 +272,11 @@
org.apache.maven.plugins
maven-eclipse-plugin
- 2.9
true
true
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.17
-
-
- **/TikaTest.java
-
-
-