Merge remote-tracking branch 'upstream/master'

forge · Nov 20, 2013 · af1f8f5 · af1f8f5
2 parents 6f18004 + f30d0c3
commit af1f8f5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 31 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>java-parser-parent</artifactId>
-      <version>1.1.6-SNAPSHOT</version>
+      <version>1.1.7-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>java-parser-api</artifactId>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>java-parser-parent</artifactId>
-      <version>1.1.6-SNAPSHOT</version>
+      <version>1.1.7-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>java-parser-impl</artifactId>
@@ -17,57 +17,41 @@
       <dependency>
          <groupId>org.eclipse.tycho</groupId>
          <artifactId>org.eclipse.jdt.core</artifactId>
-         <version>3.8.2.v20120814-155456</version>
+         <version>3.9.1.v20130905-0837</version>
       </dependency>
 
       <dependency>
          <groupId>org.eclipse.core</groupId>
-         <artifactId>resources</artifactId>
-         <version>3.3.0-v20070604</version>
+         <artifactId>org.eclipse.core.resources</artifactId>
+         <version>3.7.100</version>
          <exclusions>
             <exclusion>
+               <artifactId>org.eclipse.core.filesystem</artifactId>
                <groupId>org.eclipse.core</groupId>
-               <artifactId>expressions</artifactId>
             </exclusion>
             <exclusion>
-               <groupId>org.eclipse.core</groupId>
-               <artifactId>filesystem</artifactId>
+               <artifactId>org.eclipse.equinox.registry</artifactId>
+               <groupId>org.eclipse.equinox</groupId>
             </exclusion>
             <exclusion>
+               <artifactId>org.eclipse.core.expressions</artifactId>
                <groupId>org.eclipse.core</groupId>
-               <artifactId>runtime</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-
-      <dependency>
-         <groupId>org.eclipse.core</groupId>
-         <artifactId>runtime</artifactId>
-         <version>3.3.100-v20070530</version>
-         <exclusions>
-            <exclusion>
-               <groupId>org.eclipse.equinox</groupId>
-               <artifactId>registry</artifactId>
             </exclusion>
             <exclusion>
+               <artifactId>org.eclipse.equinox.app</artifactId>
                <groupId>org.eclipse.equinox</groupId>
-               <artifactId>app</artifactId>
             </exclusion>
          </exclusions>
       </dependency>
 
       <dependency>
-         <groupId>org.eclipse</groupId>
-         <artifactId>text</artifactId>
-         <version>3.3.0-v20070606-0010</version>
+         <groupId>org.eclipse.text</groupId>
+         <artifactId>org.eclipse.text</artifactId>
+         <version>3.5.101</version>
          <exclusions>
             <exclusion>
+               <artifactId>org.eclipse.core.commands</artifactId>
                <groupId>org.eclipse.core</groupId>
-               <artifactId>commands</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>org.eclipse.equinox</groupId>
-               <artifactId>common</artifactId>
             </exclusion>
          </exclusions>
       </dependency>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
    </parent>
    <groupId>org.jboss.forge</groupId>
    <artifactId>java-parser-parent</artifactId>
-   <version>1.1.6-SNAPSHOT</version>
+   <version>1.1.7-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Forge - Java Parser Parent</name>
    <licenses>