From cb343af0ac022591e4a0ad784dd29982ef63de62 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 12 Dec 2022 08:17:33 -0800 Subject: [PATCH] bug5792: fixed prefs file of com.googlecode.mgwt --- docker/Dockerfile_sapjvm | 3 ++- docker/Dockerfile_windestimation | 3 ++- docker/makeImageForLatestRelease | 3 +-- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 3 +-- .../.settings/org.eclipse.jdt.core.prefs | 19 ------------------- 6 files changed, 6 insertions(+), 26 deletions(-) diff --git a/docker/Dockerfile_sapjvm b/docker/Dockerfile_sapjvm index 494064ea383..439781faca3 100644 --- a/docker/Dockerfile_sapjvm +++ b/docker/Dockerfile_sapjvm @@ -1,4 +1,5 @@ FROM buildpack-deps:latest +ARG SAPJVM_VERSION=8.1.091 LABEL maintainer=axel.uhl@sap.com # Download and extract the SAP JVM 8 ENV PATH=${PATH}:/opt/sapjvm_8/bin @@ -7,7 +8,7 @@ WORKDIR /opt RUN apt-get update \ && apt-get install -y wget apt-utils unzip \ && apt-get -y upgrade \ - && curl --cookie eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt "https://tools.hana.ondemand.com/additional/sapjvm-8.1.088-linux-x64.zip" --output sapjvm8-linux-x64.zip \ + && curl --cookie eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt "https://tools.hana.ondemand.com/additional/sapjvm-${SAPJVM_VERSION}-linux-x64.zip" --output sapjvm8-linux-x64.zip \ && unzip sapjvm8-linux-x64.zip \ && rm sapjvm8-linux-x64.zip \ && echo "export JAVA_HOME=/opt/sapjvm_8; export PATH=\${PATH}:/opt/sapjvm_8/bin" > /etc/profile.d/javahome.sh diff --git a/docker/Dockerfile_windestimation b/docker/Dockerfile_windestimation index bc8a3851457..b08e1ae3a6b 100755 --- a/docker/Dockerfile_windestimation +++ b/docker/Dockerfile_windestimation @@ -1,4 +1,5 @@ -FROM docker.sapsailing.com/sapjvm8:8.1.088 +ARG SAPJVM_VERSION=8.1.091 +FROM docker.sapsailing.com/sapjvm8:${SAPJVM_VERSION} LABEL maintainer=axel.uhl@sap.com # Download and extract the release WORKDIR /home/sailing diff --git a/docker/makeImageForLatestRelease b/docker/makeImageForLatestRelease index 946dbb36bc8..076a2be5a83 100755 --- a/docker/makeImageForLatestRelease +++ b/docker/makeImageForLatestRelease @@ -12,9 +12,8 @@ echo "Copying files from GITROOT $GITROOT into Docker workspace" cp "$GITROOT/java/target/env.sh" "$DOCKERDIR" cp "$GITROOT/java/target/start" "$DOCKERDIR" cp "$GITROOT/java/target/configuration/JavaSE-11.profile" "$DOCKERDIR" -cat ${DOCKERFILE}.tpl | sed -e "s/RELEASE/${release}/g" >${DOCKERFILE} cd "$DOCKERDIR" -docker build -t sapsailing:$release . +docker build --build-arg RELEASE=${release} -t sapsailing:$release . echo "Cleaning up..." rm start env.sh JavaSE-11.profile Dockerfile docker tag sapsailing:$release docker.sapsailing.com:443/sapsailing:$release diff --git a/java/com.github.branflake2267.gwt-maps-api/META-INF/MANIFEST.MF b/java/com.github.branflake2267.gwt-maps-api/META-INF/MANIFEST.MF index 0d07d33d35d..05ef6f99005 100644 --- a/java/com.github.branflake2267.gwt-maps-api/META-INF/MANIFEST.MF +++ b/java/com.github.branflake2267.gwt-maps-api/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 3.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Require-Bundle: com.google.gwt.user;bundle-version="2.10.0";resolution:=optional, - com.google.gwt.dev;bundle-version="2.10.0";resolution:=optional, com.google.gwt.ajaxloader;bundle-version="1.1.0";visibility:=reexport Automatic-Module-Name: com.github.branflake2267.gwt-maps-api Bundle-ClassPath: . diff --git a/java/com.google.gwt.ajaxloader/META-INF/MANIFEST.MF b/java/com.google.gwt.ajaxloader/META-INF/MANIFEST.MF index 3e834088516..181f30ad493 100644 --- a/java/com.google.gwt.ajaxloader/META-INF/MANIFEST.MF +++ b/java/com.google.gwt.ajaxloader/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: com.google.gwt.ajaxloader Bundle-Version: 1.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Require-Bundle: com.google.gwt.user;bundle-version="2.10.0";resolution:=optional, - com.google.gwt.dev;bundle-version="2.10.0";resolution:=optional +Require-Bundle: com.google.gwt.user;bundle-version="2.10.0";resolution:=optional Automatic-Module-Name: com.google.gwt.ajaxloader Bundle-ClassPath: . Export-Package: com.google.gwt.ajaxloader.client diff --git a/java/com.googlecode.mgwt/.settings/org.eclipse.jdt.core.prefs b/java/com.googlecode.mgwt/.settings/org.eclipse.jdt.core.prefs index d8b6f7ba7e4..144c60c0ff4 100755 --- a/java/com.googlecode.mgwt/.settings/org.eclipse.jdt.core.prefs +++ b/java/com.googlecode.mgwt/.settings/org.eclipse.jdt.core.prefs @@ -1,21 +1,3 @@ -<<<<<<< HEAD:java/com.googlecode.mgwt/.settings/org.eclipse.jdt.core.prefs -#Thu Jan 19 09:46:08 CET 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 -||||||| merged common ancestors -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 -======= eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=generate @@ -28,4 +10,3 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.8 ->>>>>>> origin/master:java/com.sap.sailing.datamining.test/.settings/org.eclipse.jdt.core.prefs