diff options
6 files changed, 23 insertions, 10 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs index f09cbe792d5..4759947300a 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.classpath b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.classpath index 8dd013afc8b..50aae142c50 100644 --- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.classpath +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.classpath @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..0c68a61dca8 --- /dev/null +++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.edit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.settings/org.eclipse.jdt.core.prefs index 4d72ad12656..94d61f00da6 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup index fa136627855..803eadf116b 100644 --- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup +++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup @@ -142,7 +142,7 @@ </detail> </annotation> </repository> - <repository url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0/S201609190356"> + <repository url="http://download.eclipse.org/mmt/qvto/updates/milestones/3.7.0/S201611020315"> <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> <detail key="updateFrom"> <value>QVT Operational</value> @@ -184,14 +184,14 @@ </detail> </annotation> </repository> - <repository url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201610160403"> + <repository url="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201611040610"> <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> <detail key="updateFrom"> <value>EMF COMPARE</value> </detail> </annotation> </repository> - <repository url="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M2-20160920000111/repository/"> + <repository url="http://download.eclipse.org/webtools/downloads/drops/R3.9.0/S-3.9.0M3-20161031000121/repository/"> <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> <detail key="updateFrom"> <value>WebTools</value> @@ -1841,10 +1841,10 @@ <requirement name="org.eclipse.oomph.setup.workingsets.feature.group" optional="true"/> <requirement name="org.eclipse.oomph.setup.targlets.feature.group" optional="true"/> <requirement name="org.eclipse.oomph.setup.feature.group" optional="true"/> - <requirement name="org.eclipse.b3.aggregator.engine.feature.feature.group"/> + <requirement name="org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group"/> <repositoryList name="Oxygen"> <repository url="${oomph.update.url}"/> - <repository url="http://download.eclipse.org/cbi/updates/aggregator/ide/4.5/"/> + <repository url="http://download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/> </repositoryList> <repositoryList name="Neon"> <repository url="${oomph.update.url}"/> @@ -1877,10 +1877,10 @@ <setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.master}"/> <setupTask xsi:type="setup.p2:P2Task"> <requirement name="org.eclipse.papyrus.dev.feature.feature.group"/> - <requirement name="org.eclipse.b3.aggregator.engine.feature.feature.group"/> + <requirement name="org.eclipse.cbi.p2repo.aggregator.engine.feature.feature.group"/> <repository url="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/"/> <repository url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/oxygen/main"/> - <repository url="http://download.eclipse.org/cbi/updates/aggregator/ide/4.5/"/> + <repository url="http://download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/> <repository url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"> <annotation source="http://www.eclipse.org/Papyrus/2014/releng/dependencytools"> <detail key="updateFrom"> diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/RealmRunner.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/RealmRunner.java index ce8c9ea3ac4..82568df52eb 100644 --- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/RealmRunner.java +++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/src/org/eclipse/papyrus/infra/tools/databinding/RealmRunner.java @@ -49,7 +49,7 @@ public class RealmRunner extends ClassificationRunner { super(klass); realmField = Stream.iterate(klass, Class::getSuperclass) - .flatMap(c -> Stream.of(c.getDeclaredFields())) + .flatMap(c -> Stream.<Field> of(c.getDeclaredFields())) .filter(f -> Modifier.isStatic(f.getModifiers())) .filter(f -> f.getType() == Realm.class) .findAny().get(); |