Skip to content

Commit 28ba739

Browse files
timoninmaximtimoninmaxim
authored
IGNITE-25843 Shade common libs into ignite-core.jar (#12173)
1 parent 2619efc commit 28ba739

40 files changed

Lines changed: 43 additions & 357 deletions

File tree

‎bin/include/build-classpath.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
@echo off
2727

2828
for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath %%F
29+
for /D %%F in (modules\binary\*) do call :includeToClassPath %%F
2930

3031
for /F %%F in ('dir /A:D /b "%IGNITE_HOME%\modules\*" /b') do call :includeToClassPath "%IGNITE_HOME%\modules\%%F"
32+
for /F %%F in ('dir /A:D /b "%IGNITE_HOME%\modules\binary\*" /b') do call :includeToClassPath "%IGNITE_HOME%\modules\%%F"
3133
goto :eof
3234

3335
:includeToClassPath

‎bin/include/build-classpath.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,10 @@ includeToClassPath() {
7575
# Include target libraries for enterprise modules to classpath.
7676
#
7777
includeToClassPath modules
78+
includeToClassPath modules/binary
7879

7980
#
8081
# Include target libraries for opensourse modules to classpath.
8182
#
8283
includeToClassPath "${IGNITE_HOME}"/modules
84+
includeToClassPath "${IGNITE_HOME}"/modules/binary

‎examples/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@
4040
<artifactId>ignite-core</artifactId>
4141
</dependency>
4242

43-
<dependency>
44-
<groupId>${project.groupId}</groupId>
45-
<artifactId>ignite-commons</artifactId>
46-
<scope>provided</scope>
47-
</dependency>
48-
4943
<dependency>
5044
<groupId>${project.groupId}</groupId>
5145
<artifactId>ignite-spring</artifactId>

‎modules/benchmarks/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@
4444
<artifactId>ignite-core</artifactId>
4545
</dependency>
4646

47-
<dependency>
48-
<groupId>${project.groupId}</groupId>
49-
<artifactId>ignite-commons</artifactId>
50-
<scope>provided</scope>
51-
</dependency>
52-
53-
<dependency>
54-
<groupId>${project.groupId}</groupId>
55-
<artifactId>ignite-binary-api</artifactId>
56-
<scope>provided</scope>
57-
</dependency>
58-
5947
<dependency>
6048
<groupId>${project.groupId}</groupId>
6149
<artifactId>ignite-indexing</artifactId>

‎modules/calcite/pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,6 @@
5757
<artifactId>ignite-core</artifactId>
5858
</dependency>
5959

60-
<dependency>
61-
<groupId>${project.groupId}</groupId>
62-
<artifactId>ignite-commons</artifactId>
63-
<scope>provided</scope>
64-
</dependency>
65-
66-
<dependency>
67-
<groupId>${project.groupId}</groupId>
68-
<artifactId>ignite-binary-api</artifactId>
69-
<scope>provided</scope>
70-
</dependency>
71-
72-
<dependency>
73-
<groupId>${project.groupId}</groupId>
74-
<artifactId>ignite-grid-unsafe</artifactId>
75-
<scope>provided</scope>
76-
</dependency>
77-
7860
<!--
7961
Indexing is required for cross-engines tests.
8062
-->

‎modules/checkstyle/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<plugin>
110110
<groupId>org.codehaus.mojo</groupId>
111111
<artifactId>flatten-maven-plugin</artifactId>
112-
<version>1.2.7</version>
112+
<version>1.7.1</version>
113113

114114
<executions>
115115
<execution>

‎modules/clients/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,6 @@
4040
<artifactId>ignite-core</artifactId>
4141
</dependency>
4242

43-
<dependency>
44-
<groupId>${project.groupId}</groupId>
45-
<artifactId>ignite-commons</artifactId>
46-
<scope>provided</scope>
47-
</dependency>
48-
49-
<dependency>
50-
<groupId>${project.groupId}</groupId>
51-
<artifactId>ignite-binary-api</artifactId>
52-
<scope>provided</scope>
53-
</dependency>
54-
5543
<dependency>
5644
<groupId>com.google.code.simple-spring-memcached</groupId>
5745
<artifactId>spymemcached</artifactId>

‎modules/codegen/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@
4040
<groupId>${project.groupId}</groupId>
4141
<artifactId>ignite-core</artifactId>
4242
</dependency>
43-
<dependency>
44-
<groupId>${project.groupId}</groupId>
45-
<artifactId>ignite-commons</artifactId>
46-
</dependency>
4743

4844
<dependency>
4945
<groupId>${project.groupId}</groupId>

‎modules/compatibility/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,6 @@
4646
<artifactId>ignite-core</artifactId>
4747
</dependency>
4848

49-
<dependency>
50-
<groupId>${project.groupId}</groupId>
51-
<artifactId>ignite-commons</artifactId>
52-
<scope>provided</scope>
53-
</dependency>
54-
55-
<dependency>
56-
<groupId>${project.groupId}</groupId>
57-
<artifactId>ignite-binary-api</artifactId>
58-
<scope>provided</scope>
59-
</dependency>
60-
6149
<dependency>
6250
<groupId>${project.groupId}</groupId>
6351
<artifactId>ignite-indexing</artifactId>

‎modules/compress/pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,6 @@
4141
<artifactId>ignite-core</artifactId>
4242
</dependency>
4343

44-
<dependency>
45-
<groupId>${project.groupId}</groupId>
46-
<artifactId>ignite-commons</artifactId>
47-
<scope>provided</scope>
48-
</dependency>
49-
50-
<dependency>
51-
<groupId>${project.groupId}</groupId>
52-
<artifactId>ignite-binary-api</artifactId>
53-
<scope>provided</scope>
54-
</dependency>
55-
56-
<dependency>
57-
<groupId>${project.groupId}</groupId>
58-
<artifactId>ignite-grid-unsafe</artifactId>
59-
<scope>provided</scope>
60-
</dependency>
61-
6244
<dependency>
6345
<groupId>${project.groupId}</groupId>
6446
<artifactId>ignite-indexing</artifactId>

0 commit comments

Comments
 (0)