Merge branch 'develop', release 1.5.2

cfeclipse · Dec 26, 2016 · 4c6009c · 4c6009c
2 parents d25e4a7 + 78724e1
commit 4c6009c
Show file tree

Hide file tree

Showing 37 changed files with 368 additions and 587 deletions.
diff --git a/org.cfeclipse.cfml.feature/feature.xml b/org.cfeclipse.cfml.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.cfeclipse.cfml.feature"
       label="CFEclipse (including MXUnit and Frameworks)"
-      version="1.5.1.qualifier"
+      version="1.5.2.qualifier"
       provider-name="CFEclipse Project"
       plugin="org.cfeclipse.cfml">
 
@@ -68,8 +68,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    <url>
       <update label="CFEclipse Update Site" url="http://www.cfeclipse.org/update"/>
       <discovery label="CFEclipse discovery site" url="http://cfeclipse.org/update"/>
+      <discovery label="CFParser discovery site" url="http://cfeclipse.org/cfparser/update"/>
+      <discovery label="[dev] CFParser discovery site" url="http://cfeclipse.org/cfparser/update-dev"/>
+      <discovery label="CFLint discovery site" url="http://cfeclipse.org/cflint/update"/>
+      <discovery label="[dev] CFLint discovery site" url="http://cfeclipse.org/cflint/update-dev"/>
       <discovery label="MXUnit discovery site" url="http://mxunit.org/update"/>
-      <discovery label="Snippets discovery site" url="http://www.cfeclipse.org/snippets/update"/>
+      <discovery label="Snippets discovery site" url="http://cfeclipse.org/snippets/update"/>
    </url>
 
    <includes
@@ -78,7 +82,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
          search-location="both"/>
 
    <requires>
-      <import feature="org.mxunit.eclipseplugin.feature"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.jface.text"/>
@@ -88,11 +91,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.ui.browser"/>
-      <import plugin="com.ibm.icu"/>
-      <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.search"/>
+      <import plugin="org.cfeclipse.cfparser" version="2.2.11" match="greaterOrEqual"/>
+      <import plugin="org.cfeclipse.cflint" version="1.0.10" match="greaterOrEqual"/>
+      <import plugin="com.ibm.icu"/>
       <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.help"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.core.filesystem"/>
+      <import feature="org.mxunit.eclipseplugin.feature" version="1.5.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/org.cfeclipse.cfml.feature/p2.inf b/org.cfeclipse.cfml.feature/p2.inf
@@ -1,5 +1,9 @@
 instructions.configure=org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//mxunit.org/update/,type:0,name:MXUnit,enabled:true); \
    org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//mxunit.org/update/,type:1,name:MXUnit,enabled:true); \
+   org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//cfeclipse.org/cfparser/update/,type:0,name:MXUnit CFE,enabled:true); \
+   org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//cfeclipse.org/cfparser/update/,type:1,name:MXUnit CFE,enabled:true); \
+   org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//cfeclipse.org/cflint/update/,type:0,name:MXUnit CFE,enabled:true); \
+   org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//cfeclipse.org/cflint/update/,type:1,name:MXUnit CFE,enabled:true); \
    org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//cfeclipse.org/mxunit-update/,type:0,name:MXUnit CFE,enabled:true); \
    org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//cfeclipse.org/mxunit-update/,type:1,name:MXUnit CFE,enabled:true);
 
@@ -17,4 +21,12 @@ requires.3.range = [1.0.0, 9.9.9)
 
 requires.4.namespace = org.eclipse.equinox.p2.iu
 requires.4.name = org.cfeclipse.cfml.snippets.feature.feature.group
-requires.4.range = [1.0.0, 9.9.9)
+requires.4.range = [1.0.0, 9.9.9)
+
+requires.5.namespace = org.eclipse.equinox.p2.iu
+requires.5.name = org.cfeclipse.cfparser
+requires.5.range = [1.0.0, 9.9.9)
+
+requires.5.namespace = org.eclipse.equinox.p2.iu
+requires.5.name = org.cfeclipse.cflint
+requires.5.range = [1.0.0, 9.9.9)
diff --git a/org.cfeclipse.cfml.feature/pom.xml b/org.cfeclipse.cfml.feature/pom.xml
@@ -7,8 +7,7 @@
     <artifactId>cfeclipse</artifactId>
     <version>0.0.1-SNAPSHOT</version>
   </parent>
-  <groupId>org.cfeclipse.ide</groupId>
   <artifactId>org.cfeclipse.cfml.feature</artifactId>
-  <version>1.5.1-SNAPSHOT</version>
+  <version>1.5.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.cfeclipse.cfml.snippets/.gitignore b/org.cfeclipse.cfml.snippets/.gitignore
@@ -1 +1,2 @@
 /bin
+/target/
diff --git a/org.cfeclipse.cfml.update-dev/Publish.xml b/org.cfeclipse.cfml.update-dev/Publish.xml
diff --git a/org.cfeclipse.cfml.update-dev/associateSites.xml b/org.cfeclipse.cfml.update-dev/associateSites.xml
diff --git a/org.cfeclipse.cfml.update-dev/category.xml b/org.cfeclipse.cfml.update-dev/category.xml
@@ -16,4 +16,9 @@
          [Dev] CFEclipse DocShare Support (Optional)
       </description>
    </category-def>
-</site>
+   <repository-reference location="http://mxunit.org/update" enabled="true" />
+   <repository-reference location="http://cfeclipse.org/cfparser/update" enabled="true" />
+   <repository-reference location="http://cfeclipse.org/cfparser/update-dev" enabled="true" />
+   <repository-reference location="http://cfeclipse.org/cflint/update" enabled="true" />
+   <repository-reference location="http://cfeclipse.org/cflint/update-dev" enabled="true" />
+</site>