From a58420520e37145376d051934c7b78870f0ee8e7 Mon Sep 17 00:00:00 2001
From: Sebastian Krings <sebastian@krin.gs>
Date: Wed, 18 Nov 2015 11:25:18 +0100
Subject: [PATCH] merge
---
org.eventb.texteditor.feature/feature.xml | 9 +++++----
org.eventb.texteditor.feature/pom.xml | 4 ++--
org.eventb.texteditor.parent/pom.xml | 2 +-
org.eventb.texteditor.parsers/build.gradle | 6 +-----
org.eventb.texteditor.parsers/pom.xml | 2 +-
org.eventb.texteditor.repository/category.xml | 2 +-
org.eventb.texteditor.repository/pom.xml | 4 ++--
org.eventb.texteditor.ui/META-INF/MANIFEST.MF | 2 +-
org.eventb.texteditor.ui/pom.xml | 11 +++++------
org.eventb.texttools/META-INF/MANIFEST.MF | 2 +-
org.eventb.texttools/pom.xml | 11 +++++------
11 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/org.eventb.texteditor.feature/feature.xml b/org.eventb.texteditor.feature/feature.xml
index 44ed5e5..b415042 100644
--- a/org.eventb.texteditor.feature/feature.xml
+++ b/org.eventb.texteditor.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eventb.texteditor.feature"
label="Camille TextEditor"
- version="3.1.1.qualifier"
+ version="3.1.2.qualifier"
provider-name="Heinrich-Heine University Dusseldorf"
plugin="org.eventb.texteditor.ui">
@@ -10,6 +10,7 @@
A text editor for the Rodin platform to edit Event-B models
-----------------------------------------------------------
Release History:
+3.1.2 - Fix some more bugs regarding theory parsing, fix saving changes to seen contexts.
3.1.1 - Fix parsing of theory operators with more than one operand
3.1.0 - Initial release for Rodin 3.1
3.0.3 - Fix bugs / regressions intruduces by the Rodin 3.0 migration
@@ -188,21 +189,21 @@ Inc. in the United States, other countries, or both.
id="org.eventb.texteditor.ui"
download-size="0"
install-size="0"
- version="3.1.1.qualifier"
+ version="3.1.2.qualifier"
unpack="false"/>
<plugin
id="org.eventb.texttools"
download-size="0"
install-size="0"
- version="3.1.1.qualifier"
+ version="3.1.2.qualifier"
unpack="false"/>
<plugin
id="org.eventb.texteditor.parsers"
download-size="0"
install-size="0"
- version="3.1.1.qualifier"
+ version="3.1.2.qualifier"
unpack="false"/>
</feature>
diff --git a/org.eventb.texteditor.feature/pom.xml b/org.eventb.texteditor.feature/pom.xml
index ede7bbc..61023c6 100644
--- a/org.eventb.texteditor.feature/pom.xml
+++ b/org.eventb.texteditor.feature/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
</parent>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.feature</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/org.eventb.texteditor.parent/pom.xml b/org.eventb.texteditor.parent/pom.xml
index 99455c8..8137e8a 100644
--- a/org.eventb.texteditor.parent/pom.xml
+++ b/org.eventb.texteditor.parent/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<packaging>pom</packaging>
diff --git a/org.eventb.texteditor.parsers/build.gradle b/org.eventb.texteditor.parsers/build.gradle
index 8fd8391..a070b04 100644
--- a/org.eventb.texteditor.parsers/build.gradle
+++ b/org.eventb.texteditor.parsers/build.gradle
@@ -2,17 +2,13 @@ apply plugin: 'java'
repositories {
mavenCentral()
- maven {
- name "cobra"
- url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
- }
}
def parser_version = '2.4.40'
dependencies {
compile group: "de.hhu.stups", name: "bparser", version: parser_version, changing: true
- compile group: "de.hhu.stups", name: "eventbstruct", version: parser_version, changing: true
+ compile group: "de.hhu.stups", name: "eventbstruct", version: parser_version, changing: true
compile 'com.google.guava:guava:14.0.1'// Apache Licence 2.0
}
diff --git a/org.eventb.texteditor.parsers/pom.xml b/org.eventb.texteditor.parsers/pom.xml
index 8552c7e..874a0ca 100644
--- a/org.eventb.texteditor.parsers/pom.xml
+++ b/org.eventb.texteditor.parsers/pom.xml
@@ -6,7 +6,7 @@
<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
</parent>
<artifactId>org.eventb.texteditor.parsers</artifactId>
diff --git a/org.eventb.texteditor.repository/category.xml b/org.eventb.texteditor.repository/category.xml
index e6c522d..b52afd4 100644
--- a/org.eventb.texteditor.repository/category.xml
+++ b/org.eventb.texteditor.repository/category.xml
@@ -2,7 +2,7 @@
<site>
- <feature url="features/org.eventb.texteditor.feature_3.1.1.qualifier.jar" id="org.eventb.texteditor.feature" version="3.1.1.qualifier">
+ <feature url="features/org.eventb.texteditor.feature_3.1.2.qualifier.jar" id="org.eventb.texteditor.feature" version="3.1.2.qualifier">
<category name="org.eventb.texteditor.feature.category"/>
</feature>
diff --git a/org.eventb.texteditor.repository/pom.xml b/org.eventb.texteditor.repository/pom.xml
index 48cc57a..ce28b56 100644
--- a/org.eventb.texteditor.repository/pom.xml
+++ b/org.eventb.texteditor.repository/pom.xml
@@ -6,14 +6,14 @@
<parent>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
</parent>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.repository</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<packaging>eclipse-repository</packaging>
diff --git a/org.eventb.texteditor.ui/META-INF/MANIFEST.MF b/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
index 722f3b6..5c43c00 100644
--- a/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
+++ b/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Camille Texteditor
Bundle-SymbolicName: org.eventb.texteditor.ui;singleton:=true
-Bundle-Version: 3.1.1.qualifier
+Bundle-Version: 3.1.2.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.eventb.texteditor.ui.TextEditorPluginImplementation
Require-Bundle: org.eventb.texttools;bundle-version="[3.1.0,3.2.0)";visibility:=reexport,
diff --git a/org.eventb.texteditor.ui/pom.xml b/org.eventb.texteditor.ui/pom.xml
index 94d26ad..30676b2 100644
--- a/org.eventb.texteditor.ui/pom.xml
+++ b/org.eventb.texteditor.ui/pom.xml
@@ -2,18 +2,17 @@
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
</parent>
-
+
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.ui</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<packaging>eclipse-plugin</packaging>
-
+
</project>
-
diff --git a/org.eventb.texttools/META-INF/MANIFEST.MF b/org.eventb.texttools/META-INF/MANIFEST.MF
index 4c9875f..3b8dfe5 100644
--- a/org.eventb.texttools/META-INF/MANIFEST.MF
+++ b/org.eventb.texttools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Event-B EMF Texttools
Bundle-SymbolicName: org.eventb.texttools;singleton:=true
-Bundle-Version: 3.1.1.qualifier
+Bundle-Version: 3.1.2.qualifier
Bundle-Activator: org.eventb.texttools.TextToolsPlugin
Require-Bundle: org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",
org.eventb.emf.formulas;bundle-version="[1.4.0,2.0.0)",
diff --git a/org.eventb.texttools/pom.xml b/org.eventb.texttools/pom.xml
index 1b58a8d..f75bd1f 100644
--- a/org.eventb.texttools/pom.xml
+++ b/org.eventb.texttools/pom.xml
@@ -2,18 +2,17 @@
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
</parent>
-
+
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texttools</artifactId>
- <version>3.1.1.qualifier</version>
+ <version>3.1.2.qualifier</version>
<packaging>eclipse-plugin</packaging>
-
+
</project>
-
--
GitLab