SRE-6187 - Migrate Spinner to liferay-lxc repository

.github/workflows/release.yml

@@ -0,0 +1,19 @@
+jobs:
+    release:
+        env:
+            LIFERAY_RELEASE_GITHUB_PAT: ${{ secrets.LIFERAY_RELEASE_GITHUB_PAT }}
+        if: (github.repository == 'natocesarrego/liferay-docker')
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v2
+            - name: Execute run_tests.sh
+              run: |
+                cd release
+
+                ./run_tests.sh
+              shell: bash
+name: Release
+on:
+    pull_request:
+        types: [opened, reopened]

.releng/docker-image.changelog

@@ -1068,3 +1068,38 @@ docker.image.git.id-6.0.0=ca10bd5d0abeae4e45b35a088595fb629b739070
 
 docker.image.change.log-7.0.0=DOCKER-255 DOCKER-252
 docker.image.git.id-7.0.0=b0f66de42ec364ab56be96091dbdad37e3d02d11
+
+#
+# Liferay Docker Image Version 7.0.1
+#
+
+docker.image.change.log-7.0.1=DOCKER-249
+docker.image.git.id-7.0.1=6928b1afa32f89b10e1892c52a287a7e965de52e
+
+#
+# Liferay Docker Image Version 7.0.2
+#
+
+docker.image.change.log-7.0.2=DOCKER-256
+docker.image.git.id-7.0.2=9593e425d466068cef5d0c3271b87d69fdfeebb0
+
+#
+# Liferay Docker Image Version 7.0.3
+#
+
+docker.image.change.log-7.0.3=DOCKER-257
+docker.image.git.id-7.0.3=f90bf478c9bda90a5727e27f3a90f34a701e405f
+
+#
+# Liferay Docker Image Version 7.0.4
+#
+
+docker.image.change.log-7.0.4=DOCKER-258
+docker.image.git.id-7.0.4=4db964182c3510b2918d456a3ba4aeb06a3b97d2
+
+#
+# Liferay Docker Image Version 7.0.5
+#
+
+docker.image.change.log-7.0.5=DOCKER-259
+docker.image.git.id-7.0.5=56232c5444c9df9259b09bbfb9971d85145f3736

build_nightly.sh

@@ -4,16 +4,20 @@ while true
 do
 	git pull origin master
 
-	LIFERAY_DOCKER_IMAGE_FILTER=7.4.13.nightly ./build_all_images.sh --push
-
 	if [ $(date +%w) == 0 ]
 	then
 		docker system prune --all --force
+
+		git clean -dfx
+
+		LIFERAY_DOCKER_DEVELOPER_MODE=true LIFERAY_DOCKER_IMAGE_FILTER=7.4.13.nightly ./build_all_images.sh --push
+	else
+		LIFERAY_DOCKER_IMAGE_FILTER=7.4.13.nightly ./build_all_images.sh --push
 	fi
 
 	echo ""
 	echo `date`
 	echo ""
 
-	sleep 1d
+	sleep 4h
 done

bundles.yml

@@ -687,6 +687,8 @@
     7.4.13-u122:
     7.4.13-u123:
     7.4.13-u124:
+    7.4.13-u125:
+    7.4.13-u126:
     7.4.13.nightly:
         bundle_url: releases-cdn.liferay.com/dxp/nightly/liferay-dxp-tomcat-7.4.13.nightly.7z
 quarterly:
@@ -729,6 +731,12 @@ quarterly:
     2024.q2.4:
     2024.q2.5:
     2024.q2.6:
+    2024.q2.7:
+    2024.q2.8:
+    2024.q2.9:
+    2024.q2.10:
+    2024.q2.11:
+    2024.q2.12:
         latest: true
 snapshot:
     snapshot-master:

release/_bom.sh

@@ -28,7 +28,6 @@ function generate_api_jars {
 	for artifact in ${enforce_version_artifacts}
 	do
 		if (! echo "${artifact}" | grep -q "com.fasterxml") &&
-			(! echo "${artifact}" | grep -q "com.liferay.alloy-taglibs:alloy-taglib:") &&
 			(! echo "${artifact}" | grep -q "com.liferay.alloy-taglibs:alloy-taglib:") &&
 			(! echo "${artifact}" | grep -q "com.liferay.portletmvc4spring:com.liferay.portletmvc4spring.test:") &&
 			(! echo "${artifact}" | grep -q "com.liferay:biz.aQute.bnd.annotation:") &&
@@ -50,13 +49,16 @@ function generate_api_jars {
 		local name=$(echo "${artifact}" | sed -e "s/.*:\(.*\):.*/\\1/")
 		local version=${artifact##*:}
 
-		lc_log INFO "Downloading and unzipping https://repository-cdn.liferay.com/nexus/content/groups/public/${group_path}/${name}/${version}/${name}-${version}-sources.jar."
+		if (! echo "${artifact}" | grep -q "com.liferay.alloy-taglibs:alloy-taglib:")
+		then
+			lc_log INFO "Downloading and unzipping https://repository-cdn.liferay.com/nexus/content/groups/public/${group_path}/${name}/${version}/${name}-${version}-sources.jar."
 
-		lc_download "https://repository-cdn.liferay.com/nexus/content/groups/public/${group_path}/${name}/${version}/${name}-${version}-sources.jar" "${name}-${version}-sources.jar"
+			lc_download "https://repository-cdn.liferay.com/nexus/content/groups/public/${group_path}/${name}/${version}/${name}-${version}-sources.jar" "${name}-${version}-sources.jar"
 
-		unzip -d api-sources-jar -o -q "${name}-${version}-sources.jar"
+			unzip -d api-sources-jar -o -q "${name}-${version}-sources.jar"
 
-		rm -f "${name}-${version}-sources.jar"
+			rm -f "${name}-${version}-sources.jar"
+		fi
 
 		lc_log INFO "Downloading and unzipping https://repository-cdn.liferay.com/nexus/content/groups/public/${group_path}/${name}/${version}/${name}-${version}.jar."
 
@@ -67,15 +69,64 @@ function generate_api_jars {
 		rm -f "${name}-${version}.jar"
 	done
 
-	for portal_jar in portal-impl portal-kernel support-tomcat util-bridges util-java util-slf4j util-taglib
-	do
-		_manage_bom_jar "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF/shielded-container-lib/${portal_jar}.jar"
-	done
+	if [[ "${_PRODUCT_VERSION}" == "7.3."* ]]
+	then
+		for portal_jar in portal-kernel support-tomcat
+		do
+			_manage_bom_jar "${_BUNDLES_DIR}/tomcat/lib/ext/${portal_jar}.jar"
+		done
+
+		for portal_jar in portal-impl util-bridges util-java util-slf4j util-taglib
+		do
+			_manage_bom_jar "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF/lib/${portal_jar}.jar"
+		done
+
+		find "${_BUNDLES_DIR}/osgi" "${_BUNDLES_DIR}/tomcat/lib/ext" "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF/lib" -name "com.liferay.*.jar" -type f -print0 | while IFS= read -r -d '' module_jar
+		do
+			_manage_bom_jar "${module_jar}"
+		done
+
+		for artifact in "commons*.jar" "org.apache.commons.*.jar" "poi*.jar" "spring*.jar"
+		do
+			find "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF/lib" -name "${artifact}" -type f -print0 | while IFS= read -r -d '' module_jar
+			do
+				local module_jar_basename=$(basename "${module_jar}")
+
+				if (grep $(echo "${module_jar_basename%.jar}:") "${_PROJECTS_DIR}/liferay-portal-ee/lib/development/dependencies.properties" || grep $(echo "${module_jar_basename%.jar}:") "${_PROJECTS_DIR}/liferay-portal-ee/lib/portal/dependencies.properties")
+				then
+					_manage_bom_jar "${module_jar}"
+				fi
+			done
+		done
+	else
+		for portal_jar in portal-impl portal-kernel support-tomcat util-bridges util-java util-slf4j util-taglib
+		do
+			_manage_bom_jar "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF/shielded-container-lib/${portal_jar}.jar"
+		done
+
+		find "${_BUNDLES_DIR}/osgi" "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF/shielded-container-lib" -name "com.liferay.*.jar" -type f -print0 | while IFS= read -r -d '' module_jar
+		do
+			_manage_bom_jar "${module_jar}"
+		done
+	fi
 
-	find "${_BUNDLES_DIR}/osgi" "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF/shielded-container-lib" -name "com.liferay.*.jar" -type f -print0 | while IFS= read -r -d '' module_jar
+	for file in $(ls api-jar/META-INF --almost-all | grep --extended-regexp --invert-match '^(alloy-util.tld|alloy.tld|c.tld|liferay.tld)$')
 	do
-		_manage_bom_jar "${module_jar}"
+		if [[ "$file" == *.tld ]]
+		then
+			rm "api-jar/META-INF/${file}"
+		fi
 	done
+
+	_copy_tld "api-jar/META-INF" "liferay-*.tld" "ratings.tld"
+
+	mkdir -p api-jar/META-INF/resources
+
+	_copy_tld "api-jar/META-INF/resources" "liferay-application-list.tld" "liferay-data-engine.tld" "liferay-ddm.tld" "liferay-export-import-changeset.tld" "liferay-form.tld" "liferay-staging.tld" "liferay-template.tld"  "react.tld" "soy.tld"
+
+	mkdir api-jar/META-INF/resources/WEB-INF
+
+	_copy_tld "api-jar/META-INF/resources/WEB-INF" "liferay-*.tld" "ratings.tld" "react.tld" "soy.tld"
 }
 
 function generate_api_source_jar {
@@ -108,6 +159,11 @@ function generate_api_source_jar {
 
 		local package_dir=$(dirname "${packageinfo_file}")
 
+		if [ ! -d "${package_dir}" ]
+		then
+			continue
+		fi
+
 		lc_log DEBUG "Copying ${package_dir} because it has a packageinfo."
 
 		_copy_source_package "${package_dir}"
@@ -144,6 +200,10 @@ function generate_distro_jar {
 	lc_cd "${_BUNDLES_DIR}/tomcat/bin"
 
 	./catalina.sh stop
+
+	rm -fr "${_BUNDLES_DIR}"/logs/*
+	rm -f "${_BUNDLES_DIR}/osgi/modules/biz.aQute.remote.agent-6.4.0.jar"
+	rm -fr "${_BUNDLES_DIR}"/tomcat/logs/*
 }
 
 function generate_pom_release_api {
@@ -167,6 +227,7 @@ function generate_pom_release_bom {
 	sed \
 		-e "s/__ARTIFACT_ID__/release.${LIFERAY_RELEASE_PRODUCT_NAME}.bom/" \
 		-e "s/__BUILD_TIMESTAMP__/${_BUILD_TIMESTAMP}/" \
+		-e "s/__GITHUB_REPOSITORY__/liferay-${LIFERAY_RELEASE_PRODUCT_NAME}/" \
 		-e "s/__PRODUCT_VERSION__/${_PRODUCT_VERSION}/" \
 		-e "w ${pom_file_name}" \
 		"${_RELEASE_TOOL_DIR}/templates/release.bom.pom.tpl" > /dev/null
@@ -178,7 +239,7 @@ function generate_pom_release_bom {
 		> /tmp/artifact_urls.txt
 
 	for artifact_file in $(
-		find "${_BUNDLES_DIR}/osgi" "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF" -name '*.jar' | \
+		find "${_BUNDLES_DIR}/osgi" "${_BUNDLES_DIR}/tomcat/lib/ext" "${_BUNDLES_DIR}/tomcat/webapps/ROOT/WEB-INF" -name '*.jar' | \
 			sed \
 				-e 's/\.jar$//' \
 				-e "s@.*/@@" \
@@ -229,6 +290,7 @@ function generate_pom_release_bom_compile_only {
 	sed \
 		-e "s/__ARTIFACT_ID__/release.${LIFERAY_RELEASE_PRODUCT_NAME}.bom.compile.only/" \
 		-e "s/__BUILD_TIMESTAMP__/${_BUILD_TIMESTAMP}/" \
+		-e "s/__GITHUB_REPOSITORY__/liferay-${LIFERAY_RELEASE_PRODUCT_NAME}/" \
 		-e "s/__PRODUCT_VERSION__/${_PRODUCT_VERSION}/" \
 		-e "s/__RELEASE_API_DEPENDENCY__/release.${LIFERAY_RELEASE_PRODUCT_NAME}.api/" \
 		-e "w ${pom_file_name}" \
@@ -261,6 +323,7 @@ function generate_pom_release_bom_third_party {
 	sed \
 		-e "s/__ARTIFACT_ID__/release.${LIFERAY_RELEASE_PRODUCT_NAME}.bom.third.party/" \
 		-e "s/__BUILD_TIMESTAMP__/${_BUILD_TIMESTAMP}/" \
+		-e "s/__GITHUB_REPOSITORY__/liferay-${LIFERAY_RELEASE_PRODUCT_NAME}/" \
 		-e "s/__PRODUCT_VERSION__/${_PRODUCT_VERSION}/" \
 		-e "w ${pom_file_name}" \
 		"${_RELEASE_TOOL_DIR}/templates/release.bom.third.party.pom.tpl" > /dev/null
@@ -364,6 +427,31 @@ function _copy_source_package {
 	cp -a "${1}" "${new_dir_name}"
 }
 
+function _copy_tld {
+	local arguments=""
+
+	local tlds=("${@:2}")
+
+	for tld in "${tlds[@]}"
+	do
+		if [ -n "${arguments}" ]
+		then
+			arguments+=" -o "
+		fi
+
+		arguments+="-name \"${tld}\""
+	done
+
+	for file in $(eval find "${_PROJECTS_DIR}" \
+		"${arguments}" -type f | \
+			awk -F "/" '{print $NF, $0}' | \
+			sort -k 1,1 -u | \
+			awk '{print $2}')
+	do
+		cp "${file}" "${1}"
+	done
+}
+
 function _manage_bom_jar {
 	lc_log DEBUG "Processing ${1} for api jar."
 

release/_github.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+source _liferay_common.sh
+
+function invoke_github_api_delete {
+	_invoke_github_api "${1}" "${2}" "DELETE"
+
+	echo $?
+}
+
+function invoke_github_api_post {
+	_invoke_github_api "${1}" "${2}" "POST"
+
+	echo $?
+}
+
+function _invoke_github_api {
+	if [ -z "${LIFERAY_RELEASE_REPOSITORY_OWNER}" ]
+	then
+		LIFERAY_RELEASE_REPOSITORY_OWNER=liferay
+	fi
+
+	local curl_response=$(\
+		curl \
+			"https://api.github.com/repos/${LIFERAY_RELEASE_REPOSITORY_OWNER}/${1}" \
+			--data "${2}" \
+			--fail \
+			--header "Accept: application/vnd.github+json" \
+			--header "Authorization: Bearer ${LIFERAY_RELEASE_GITHUB_PAT}" \
+			--header "X-GitHub-Api-Version: 2022-11-28" \
+			--include \
+			--max-time 10 \
+			--request "${3}" \
+			--retry 3 \
+			--silent)
+
+	if ! [[ $(echo "${curl_response}" | awk '/^HTTP/{print $2}') =~ ^2 ]]
+	then
+		echo "Unable to inkove GitHub API."
+
+		return "${LIFERAY_COMMON_EXIT_CODE_SKIPPED}"
+	fi
+
+	return "${LIFERAY_COMMON_EXIT_CODE_OK}"
+}