Skip to content

Commit 10227bf

Browse files
author
Michail Kuznetsov
authored
Set correct scopes for dependencies (eclipse-che#5416)
1 parent d1b3f93 commit 10227bf

12 files changed

Lines changed: 101 additions & 40 deletions

File tree

  • core/che-core-db
  • ide/che-core-ide-app
  • plugins
    • plugin-java-debugger/che-plugin-java-debugger-server
    • plugin-maven/che-plugin-maven-generator-archetype
    • plugin-svn/che-plugin-svn-ext-server
    • plugin-testing-java/plugin-testing-classpath/che-plugin-testing-classpath-maven-server
    • plugin-zend-debugger/che-plugin-zend-debugger-server
  • wsagent
  • wsmaster/che-core-api-auth

‎core/che-core-db/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
<groupId>org.eclipse.che.core</groupId>
4646
<artifactId>che-core-commons-inject</artifactId>
4747
</dependency>
48-
<dependency>
49-
<groupId>org.eclipse.che.core</groupId>
50-
<artifactId>che-core-commons-lang</artifactId>
51-
</dependency>
5248
<dependency>
5349
<groupId>org.eclipse.persistence</groupId>
5450
<artifactId>eclipselink</artifactId>
@@ -75,6 +71,11 @@
7571
<artifactId>h2</artifactId>
7672
<scope>test</scope>
7773
</dependency>
74+
<dependency>
75+
<groupId>org.eclipse.che.core</groupId>
76+
<artifactId>che-core-commons-lang</artifactId>
77+
<scope>test</scope>
78+
</dependency>
7879
<dependency>
7980
<groupId>org.testng</groupId>
8081
<artifactId>testng</artifactId>

‎ide/che-core-ide-app/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@
109109
<groupId>org.eclipse.che.core</groupId>
110110
<artifactId>che-core-commons-gwt</artifactId>
111111
</dependency>
112-
<dependency>
113-
<groupId>org.eclipse.che.core</groupId>
114-
<artifactId>che-core-commons-lang</artifactId>
115-
</dependency>
116112
<dependency>
117113
<groupId>org.eclipse.che.core</groupId>
118114
<artifactId>che-core-ide-api</artifactId>
@@ -169,6 +165,11 @@
169165
<artifactId>fest-assert</artifactId>
170166
<scope>test</scope>
171167
</dependency>
168+
<dependency>
169+
<groupId>org.eclipse.che.core</groupId>
170+
<artifactId>che-core-commons-lang</artifactId>
171+
<scope>test</scope>
172+
</dependency>
172173
<dependency>
173174
<groupId>org.eclipse.che.core</groupId>
174175
<artifactId>che-core-commons-test</artifactId>

‎plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<run.cmd>java -Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Xmx128m com.HelloWorld</run.cmd>
2929
</properties>
3030
<dependencies>
31-
<dependency>
32-
<groupId>com.google.guava</groupId>
33-
<artifactId>guava</artifactId>
34-
</dependency>
3531
<dependency>
3632
<groupId>com.google.inject</groupId>
3733
<artifactId>guice</artifactId>
@@ -112,6 +108,11 @@
112108
<scope>system</scope>
113109
<systemPath>${java.home}/../lib/tools.jar</systemPath>
114110
</dependency>
111+
<dependency>
112+
<groupId>com.google.guava</groupId>
113+
<artifactId>guava</artifactId>
114+
<scope>test</scope>
115+
</dependency>
115116
<dependency>
116117
<groupId>org.eclipse.che.core</groupId>
117118
<artifactId>che-core-api-model</artifactId>
@@ -184,6 +185,21 @@
184185
</excludes>
185186
</configuration>
186187
</plugin>
188+
<plugin>
189+
<groupId>org.apache.maven.plugins</groupId>
190+
<artifactId>maven-dependency-plugin</artifactId>
191+
<executions>
192+
<execution>
193+
<id>analyze</id>
194+
<configuration>
195+
<ignoredDependencies>
196+
<ignoredDependency>org.eclipse.che.core:che-core-api-core</ignoredDependency>
197+
<ignoredDependency>org.eclipse.che.plugin:org.eclipse.core.resources</ignoredDependency>
198+
</ignoredDependencies>
199+
</configuration>
200+
</execution>
201+
</executions>
202+
</plugin>
187203
</plugins>
188204
</build>
189205
<profiles>

‎plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
<groupId>org.eclipse.che.core</groupId>
4747
<artifactId>che-core-api-dto</artifactId>
4848
</dependency>
49-
<dependency>
50-
<groupId>org.eclipse.che.core</groupId>
51-
<artifactId>che-core-commons-lang</artifactId>
52-
</dependency>
5349
<dependency>
5450
<groupId>org.eclipse.che.plugin</groupId>
5551
<artifactId>che-plugin-java-maven-tools</artifactId>
@@ -72,6 +68,11 @@
7268
<artifactId>junit</artifactId>
7369
<scope>test</scope>
7470
</dependency>
71+
<dependency>
72+
<groupId>org.eclipse.che.core</groupId>
73+
<artifactId>che-core-commons-lang</artifactId>
74+
<scope>test</scope>
75+
</dependency>
7576
<dependency>
7677
<groupId>org.everrest</groupId>
7778
<artifactId>everrest-core</artifactId>

‎plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@
6666
<groupId>org.eclipse.che.core</groupId>
6767
<artifactId>che-core-api-project</artifactId>
6868
</dependency>
69-
<dependency>
70-
<groupId>org.eclipse.che.core</groupId>
71-
<artifactId>che-core-api-user</artifactId>
72-
</dependency>
7369
<dependency>
7470
<groupId>org.eclipse.che.core</groupId>
7571
<artifactId>che-core-api-workspace-shared</artifactId>
@@ -108,6 +104,11 @@
108104
<artifactId>junit</artifactId>
109105
<scope>test</scope>
110106
</dependency>
107+
<dependency>
108+
<groupId>org.eclipse.che.core</groupId>
109+
<artifactId>che-core-api-user</artifactId>
110+
<scope>test</scope>
111+
</dependency>
111112
<dependency>
112113
<groupId>org.hamcrest</groupId>
113114
<artifactId>hamcrest-core</artifactId>

‎plugins/plugin-testing-java/plugin-testing-classpath/che-plugin-testing-classpath-maven-server/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
<groupId>org.eclipse.birt.runtime</groupId>
3434
<artifactId>org.eclipse.equinox.common</artifactId>
3535
</dependency>
36-
<dependency>
37-
<groupId>org.eclipse.che.core</groupId>
38-
<artifactId>che-core-api-dto</artifactId>
39-
</dependency>
4036
<dependency>
4137
<groupId>org.eclipse.che.core</groupId>
4238
<artifactId>che-core-commons-inject</artifactId>
@@ -72,6 +68,11 @@
7268
<artifactId>junit</artifactId>
7369
<scope>test</scope>
7470
</dependency>
71+
<dependency>
72+
<groupId>org.eclipse.che.core</groupId>
73+
<artifactId>che-core-api-dto</artifactId>
74+
<scope>test</scope>
75+
</dependency>
7576
<dependency>
7677
<groupId>org.hamcrest</groupId>
7778
<artifactId>hamcrest-core</artifactId>

‎plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<findbugs.excludeFilterFile>${project.build.testSourceDirectory}/../resources/findbugs-exclude.xml</findbugs.excludeFilterFile>
2323
</properties>
2424
<dependencies>
25-
<dependency>
26-
<groupId>com.google.guava</groupId>
27-
<artifactId>guava</artifactId>
28-
</dependency>
2925
<dependency>
3026
<groupId>com.google.inject</groupId>
3127
<artifactId>guice</artifactId>
@@ -67,6 +63,11 @@
6763
<artifactId>logback-classic</artifactId>
6864
<scope>test</scope>
6965
</dependency>
66+
<dependency>
67+
<groupId>com.google.guava</groupId>
68+
<artifactId>guava</artifactId>
69+
<scope>test</scope>
70+
</dependency>
7071
<dependency>
7172
<groupId>org.hamcrest</groupId>
7273
<artifactId>hamcrest-core</artifactId>

‎wsagent/agent/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,22 @@
9191
<scope>test</scope>
9292
</dependency>
9393
</dependencies>
94+
<build>
95+
<plugins>
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-dependency-plugin</artifactId>
99+
<executions>
100+
<execution>
101+
<id>analyze</id>
102+
<configuration>
103+
<ignoredDependencies>
104+
<ignoredDependency>org.eclipse.che.core:che-core-api-model</ignoredDependency>
105+
</ignoredDependencies>
106+
</configuration>
107+
</execution>
108+
</executions>
109+
</plugin>
110+
</plugins>
111+
</build>
94112
</project>

‎wsagent/che-core-api-project/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,6 @@
127127
<groupId>org.eclipse.che.core</groupId>
128128
<artifactId>wsagent-local</artifactId>
129129
</dependency>
130-
<dependency>
131-
<groupId>org.everrest</groupId>
132-
<artifactId>everrest-core</artifactId>
133-
</dependency>
134130
<dependency>
135131
<groupId>org.everrest</groupId>
136132
<artifactId>everrest-websockets</artifactId>
@@ -180,6 +176,11 @@
180176
<artifactId>che-core-commons-test</artifactId>
181177
<scope>test</scope>
182178
</dependency>
179+
<dependency>
180+
<groupId>org.everrest</groupId>
181+
<artifactId>everrest-core</artifactId>
182+
<scope>test</scope>
183+
</dependency>
183184
<dependency>
184185
<groupId>org.everrest</groupId>
185186
<artifactId>everrest-test</artifactId>

‎wsagent/che-core-api-testing/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@
6060
<groupId>org.eclipse.che.core</groupId>
6161
<artifactId>che-core-api-dto</artifactId>
6262
</dependency>
63-
<dependency>
64-
<groupId>org.eclipse.che.core</groupId>
65-
<artifactId>che-core-api-project</artifactId>
66-
</dependency>
6763
<dependency>
6864
<groupId>org.eclipse.che.core</groupId>
6965
<artifactId>che-core-api-testing-shared</artifactId>
@@ -85,6 +81,11 @@
8581
<artifactId>rest-assured</artifactId>
8682
<scope>test</scope>
8783
</dependency>
84+
<dependency>
85+
<groupId>org.eclipse.che.core</groupId>
86+
<artifactId>che-core-api-project</artifactId>
87+
<scope>test</scope>
88+
</dependency>
8889
<dependency>
8990
<groupId>org.everrest</groupId>
9091
<artifactId>everrest-assured</artifactId>

0 commit comments

Comments
 (0)