eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 14:38:45 +00:00
Code Activity

bug5792: fixed prefs file of com.googlecode.mgwt

Browse Source
This commit is contained in:
Axel Uhl
2022-12-12 08:17:33 -08:00
parent bec1f9780f
commit cb343af0ac
6 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile_sapjvm
+2 -1
View File
@@ -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
docker/Dockerfile_windestimation
+2 -1
View File
@@ -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
docker/makeImageForLatestRelease
+1 -2
View File
@@ -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
java/com.github.branflake2267.gwt-maps-api/META-INF/MANIFEST.MF
-1
View File
@@ -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: .
java/com.google.gwt.ajaxloader/META-INF/MANIFEST.MF
+1 -2
View File
@@ -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
java/com.googlecode.mgwt/.settings/org.eclipse.jdt.core.prefs
-19
View File
@@ -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