Merge branch 'develop'

imeszaros · Jul 23, 2014 · 23553f3 · 23553f3
2 parents 5117aac + 4cf5f80
commit 23553f3
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 4 deletions.
diff --git a/eclipse-rbe-feature/feature.xml b/eclipse-rbe-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.essiembre.eclipse.rbe"
       label="ResourceBundle Editor"
-      version="1.0.0"
+      version="1.0.1"
       provider-name="Pascal Essiembre"
       plugin="com.essiembre.eclipse.rbe">
 
@@ -237,7 +237,7 @@
          id="com.essiembre.eclipse.rbe"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.1"
          unpack="false"/>
 
 </feature>
diff --git a/eclipse-rbe-plugin/CHANGES.txt b/eclipse-rbe-plugin/CHANGES.txt
@@ -1,5 +1,10 @@
 Here is an overview of changes for each release:
 
+Release 1.0.1 (2014-07-22)
+--------------------------
+- Update: re-introduce Eclipse Properties editors for locale-specific 
+  editors.
+
 Release 1.0.0 (2014-07-20)
 --------------------------
 - License change from LGPL to Apache License v2.

diff --git a/eclipse-rbe-plugin/META-INF/MANIFEST.MF b/eclipse-rbe-plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: com.essiembre.eclipse.rbe;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
 Bundle-Activator: com.essiembre.eclipse.rbe.RBEPlugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.editors,
  org.eclipse.ui.ide,
- org.eclipse.ui.views
+ org.eclipse.ui.views,
+ org.eclipse.jdt.ui;resolution:=optional
 
 
diff --git a/eclipse-rbe-update-site/artifacts.jar b/eclipse-rbe-update-site/artifacts.jar
diff --git a/eclipse-rbe-update-site/content.jar b/eclipse-rbe-update-site/content.jar
diff --git a/eclipse-rbe-update-site/features/com.essiembre.eclipse.rbe_1.0.1.jar b/eclipse-rbe-update-site/features/com.essiembre.eclipse.rbe_1.0.1.jar
diff --git a/eclipse-rbe-update-site/plugins/com.essiembre.eclipse.rbe_1.0.1.jar b/eclipse-rbe-update-site/plugins/com.essiembre.eclipse.rbe_1.0.1.jar
diff --git a/eclipse-rbe-update-site/site.xml b/eclipse-rbe-update-site/site.xml
@@ -6,6 +6,9 @@
    <feature url="features/com.essiembre.eclipse.rbe_1.0.0.jar" id="com.essiembre.eclipse.rbe" version="1.0.0">
       <category name="com.essiembre.eclipse.rbe"/>
    </feature>
+   <feature url="features/com.essiembre.eclipse.rbe_1.0.1.jar" id="com.essiembre.eclipse.rbe" version="1.0.1">
+      <category name="com.essiembre.eclipse.rbe"/>
+   </feature>
    <category-def name="com.essiembre.eclipse.rbe" label="Resource Bundle Editor">
       <description>
          Eclipse plugin for editing Java resource bundles. Lets you manage all localized properties files in one screen. Some features: sorted keys, warning icons on missing keys/values, conversion to/from Unicode, hierarchical view of keys, more...