Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove freemarker #28

Draft
wants to merge 1 commit into
base: ibm
Choose a base branch
from
Draft

Remove freemarker #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}..."
Expand Down Expand Up @@ -967,8 +967,7 @@ class Build {
openjdkSource,
dockerImageDigest,
dependency_version["alsa"],
dependency_version["freetype"],
dependency_version["freemarker"]
dependency_version["freetype"]
)

}
Expand Down
8 changes: 2 additions & 6 deletions pipelines/library/src/common/MetaData.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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() {
Expand All @@ -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) {
Expand Down