Skip to content

Commit afba1ac

Browse files
committed
Issue #2 - Resolved.
- Also updated all projects to Java 7.
1 parent 04308a3 commit afba1ac

File tree

12 files changed

+28
-19
lines changed

12 files changed

+28
-19
lines changed

org.modeldriven.alf.eclipse.papyrus/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="bin"/>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4-
org.eclipse.jdt.core.compiler.compliance=1.6
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.compliance=1.7
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.6
7+
org.eclipse.jdt.core.compiler.source=1.7

org.modeldriven.alf.eclipse.papyrus/META-INF/MANIFEST.MF

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: Alf Compiler
44
Bundle-SymbolicName: org.modeldriven.alf.eclipse.papyrus;singleton:=true
55
Bundle-Version: 0.1.0.qualifier
6-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7-
Require-Bundle: org.eclipse.uml2;bundle-version="4.0.2",
8-
org.eclipse.uml2.uml.ecore.exporter;bundle-version="2.6.1",
9-
org.eclipse.uml2.uml.ecore.importer;bundle-version="2.6.0",
6+
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
7+
Require-Bundle: org.eclipse.uml2;bundle-version="4.0.2";resolution:=optional,
8+
org.eclipse.uml2.uml.ecore.exporter;bundle-version="2.6.1";resolution:=optional,
9+
org.eclipse.uml2.uml.ecore.importer;bundle-version="2.6.0";resolution:=optional,
1010
org.eclipse.uml2.uml.resources;bundle-version="4.0.1",
1111
org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.1",
1212
org.apache.log4j;bundle-version="1.2.15",

org.modeldriven.alf.eclipse/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry exported="true" kind="lib" path="lib/alf-base.jar" sourcepath="/org.modeldriven.alf/src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
55
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
66
<classpathentry kind="src" path="src"/>
77
<classpathentry kind="output" path="bin"/>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4-
org.eclipse.jdt.core.compiler.compliance=1.6
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.compliance=1.7
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.6
7+
org.eclipse.jdt.core.compiler.source=1.7

org.modeldriven.alf.eclipse/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Bundle-Name: Eclipse Alf
44
Bundle-SymbolicName: org.modeldriven.alf.eclipse
55
Bundle-Version: 0.1.0.qualifier
66
Bundle-Vendor: Model Driven Solutions
7-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7+
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
88
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.8.3",
99
org.eclipse.emf.ecore.xmi;bundle-version="2.8.1",
10-
org.eclipse.uml2;bundle-version="4.0.2",
10+
org.eclipse.uml2;bundle-version="4.0.2";resolution:=optional,
1111
org.eclipse.uml2.uml;bundle-version="4.0.2",
1212
org.eclipse.uml2.uml.resources;bundle-version="4.0.2"
1313
Bundle-ClassPath: .,
6.3 MB
Binary file not shown.
66 Bytes
Binary file not shown.
66 Bytes
Binary file not shown.

org.modeldriven.alf/src/org/modeldriven/alf/execution/AlfBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2015 Data Access Technologies, Inc. (Model Driven Solutions)
2+
* Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
33
* All rights reserved worldwide. This program and the accompanying materials
44
* are made available for use under the terms of the GNU General Public License
55
* (GPL) version 3 that accompanies this distribution and is available at
@@ -19,7 +19,7 @@
1919

2020
public abstract class AlfBase {
2121

22-
public static final String ALF_VERSION = "0.6.0";
22+
public static final String ALF_VERSION = "0.6.0a";
2323

2424
protected boolean isVerbose = false;
2525

0 commit comments

Comments
 (0)