From 210d2fe75b2267d071a4df52d17e61d354de03ec Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 13 Dec 2022 13:53:37 +0100 Subject: [PATCH] bug5792: exemplary merge of .settings and .classpath for two bundles --- java/com.sap.sse.common/.classpath | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 3 +++ .../.settings/org.eclipse.jdt.core.prefs | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sse.common/.classpath b/java/com.sap.sse.common/.classpath index 51b78f1f7b5..ae0f9de279e 100644 --- a/java/com.sap.sse.common/.classpath +++ b/java/com.sap.sse.common/.classpath @@ -1,9 +1,9 @@ - - + + diff --git a/java/com.sap.sse.common/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sse.common/.settings/org.eclipse.jdt.core.prefs index 144c60c0ff4..d7826f4b61f 100644 --- a/java/com.sap.sse.common/.settings/org.eclipse.jdt.core.prefs +++ b/java/com.sap.sse.common/.settings/org.eclipse.jdt.core.prefs @@ -8,5 +8,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/java/com.sap.sse.datamining.annotations/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sse.datamining.annotations/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca8..d7826f4b61f 100644 --- a/java/com.sap.sse.datamining.annotations/.settings/org.eclipse.jdt.core.prefs +++ b/java/com.sap.sse.datamining.annotations/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=1.8