From 1874eeccfdd7def442e40cf3304d859423d295e5 Mon Sep 17 00:00:00 2001 From: Adam Brousseau Date: Tue, 5 Oct 2021 12:31:19 -0400 Subject: [PATCH] Remove freemarker Signed-off-by: Adam Brousseau --- pipelines/build/common/openjdk_build_pipeline.groovy | 5 ++--- pipelines/library/src/common/MetaData.groovy | 8 ++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index d0ce9f969..9907f7547 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -933,7 +933,7 @@ class Build { } // Get dependency_versions - def deps = ["alsa", "freetype", "freemarker"] + def deps = ["alsa", "freetype"] for (dep in deps) { String depVerPath = "workspace/target/metadata/dependency_version_${dep}.txt" context.println "INFO: Attempting to read ${depVerPath}..." @@ -967,8 +967,7 @@ class Build { openjdkSource, dockerImageDigest, dependency_version["alsa"], - dependency_version["freetype"], - dependency_version["freemarker"] + dependency_version["freetype"] ) } diff --git a/pipelines/library/src/common/MetaData.groovy b/pipelines/library/src/common/MetaData.groovy index b11b1f306..04d6638cd 100644 --- a/pipelines/library/src/common/MetaData.groovy +++ b/pipelines/library/src/common/MetaData.groovy @@ -20,7 +20,6 @@ class MetaData { final String build_env_docker_image_digest final String dependency_version_alsa final String dependency_version_freetype - final String dependency_version_freemarker String binary_type String sha256 @@ -43,8 +42,7 @@ class MetaData { String openjdk_source, String build_env_docker_image_digest, String dependency_version_alsa, - String dependency_version_freetype, - String dependency_version_freemarker + String dependency_version_freetype ) { this.vendor = vendor this.os = os @@ -65,7 +63,6 @@ class MetaData { this.build_env_docker_image_digest = build_env_docker_image_digest this.dependency_version_alsa = dependency_version_alsa this.dependency_version_freetype = dependency_version_freetype - this.dependency_version_freemarker = dependency_version_freemarker } Map asMap() { @@ -89,8 +86,7 @@ class MetaData { openjdk_source : openjdk_source, build_env_docker_image_digest : build_env_docker_image_digest, dependency_version_alsa : dependency_version_alsa, - dependency_version_freetype : dependency_version_freetype, - dependency_version_freemarker : dependency_version_freemarker + dependency_version_freetype : dependency_version_freetype ] if (variant_version) {