Merge pull request #1973 from eclipse/1887

#1887 Move che-plugin-java-jdt-core-repack module to che-lib project
eclipse-che · Jul 28, 2016 · 3022234 · 3022234
2 parents 16de7a0 + ca94fc2
commit 3022234
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 155 deletions.
diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml
@@ -66,8 +66,8 @@
             <artifactId>che-core-commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-jdt-core-repack</artifactId>
+            <groupId>org.eclipse.che.lib</groupId>
+            <artifactId>org-eclipse-jdt-core-repack</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>org.eclipse.jdt.core</artifactId>

diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/che-plugin-java-jdt-core-repack/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/che-plugin-java-jdt-core-repack/pom.xml
diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml
@@ -67,19 +67,19 @@
             <artifactId>wsagent-local</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-jdt-core-repack</artifactId>
+            <groupId>org.eclipse.che.lib</groupId>
+            <artifactId>org-eclipse-jdt-core-repack</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>org.eclipse.jdt.core</artifactId>
                     <groupId>org.eclipse.tycho</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>org.eclipse.core.filebuffers</artifactId>

diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml
@@ -29,7 +29,6 @@
         <module>org-eclipse-core-filebuffers</module>
         <module>org-eclipse-search</module>
         <module>org-eclipse-ui-ide</module>
-        <module>che-plugin-java-jdt-core-repack</module>
         <module>org-eclipse-jdt-ui</module>
         <module>org-eclipse-ltk-core-refactoring</module>
     </modules>

diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml
@@ -98,20 +98,20 @@
             <artifactId>che-core-commons-schedule</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-jdt-core-repack</artifactId>
+            <groupId>org.eclipse.che.lib</groupId>
+            <artifactId>org-eclipse-jdt-core-repack</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>org.eclipse.jdt.core</artifactId>
                     <groupId>org.eclipse.tycho</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>org.eclipse.core.filebuffers</artifactId>

diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml
@@ -62,23 +62,23 @@
             <artifactId>che-core-commons-lang</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-ext-lang-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-jdt-core-repack</artifactId>
+            <groupId>org.eclipse.che.lib</groupId>
+            <artifactId>org-eclipse-jdt-core-repack</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>org.eclipse.jdt.core</artifactId>
                     <groupId>org.eclipse.tycho</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-java-plain-shared</artifactId>

diff --git a/plugins/plugin-maven/che-plugin-maven-server/pom.xml b/plugins/plugin-maven/che-plugin-maven-server/pom.xml
@@ -99,23 +99,23 @@
             <artifactId>che-core-commons-xml</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-ext-lang-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.plugin</groupId>
-            <artifactId>che-plugin-java-jdt-core-repack</artifactId>
+            <groupId>org.eclipse.che.lib</groupId>
+            <artifactId>org-eclipse-jdt-core-repack</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>org.eclipse.jdt.core</artifactId>
                     <groupId>org.eclipse.tycho</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-java-ext-lang-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-java-maven-tools</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -334,6 +334,11 @@
                 <type>zip</type>
                 <classifier>linux_arm7</classifier>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.che.lib</groupId>
+                <artifactId>org-eclipse-jdt-core-repack</artifactId>
+                <version>${che.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-cpp-lang-ide</artifactId>
@@ -449,11 +454,6 @@
                 <artifactId>che-plugin-java-ext-lang-shared</artifactId>
                 <version>${che.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.che.plugin</groupId>
-                <artifactId>che-plugin-java-jdt-core-repack</artifactId>
-                <version>${che.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.che.plugin</groupId>
                 <artifactId>che-plugin-java-maven-tools</artifactId>