Skip to content

Commit c01cee8

Browse files
hostettlerhostettler
authored
Merge pull request #3 from apache/master
Merge latest changes
2 parents 2a21727 + 48700d9 commit c01cee8

File tree

1,287 files changed

+29690
-9327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,287 files changed

+29690
-9327
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ we ask you to ensure the following steps have been taken:
1010
- [ ] The pull request body describes changes that have been made.
1111
The description explains _WHAT_ and _WHY_ was made instead of _HOW_.
1212
- [ ] The pull request title is treated as the final commit message.
13-
The following pattern must be used: `IGNITE-12407: Add Cluster API support to Java thin client`
13+
The following pattern must be used: `IGNITE-XXXX Change summary` where `XXXX` - number of JIRA issue.
1414
- [ ] A reviewer has been mentioned through the JIRA comments
1515
(see [the Maintainers list](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-ReviewProcessandMaintainers))
1616
- [ ] The pull request has been checked by the Teamcity Bot and
@@ -22,4 +22,4 @@ the `green visa` attached to the JIRA ticket (see [TC.Bot: Check PR](https://mtc
2222
- [Coding Guidelines](https://cwiki.apache.org/confluence/display/IGNITE/Coding+Guidelines)
2323
- [Apache Ignite Teamcity Bot](https://cwiki.apache.org/confluence/display/IGNITE/Apache+Ignite+Teamcity+Bot)
2424

25-
If you need any help, please email [email protected] or ask anу advice on http://asf.slack.com _#ignite_ channel.
25+
If you need any help, please email [email protected] or ask anу advice on http://asf.slack.com _#ignite_ channel.

‎.gitignore‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -73,34 +73,8 @@ ipch/
7373
packages
7474
*.nupkg
7575

76-
#Autotools temp files
77-
/modules/platforms/cpp/**/Makefile
78-
/modules/platforms/cpp/**/Makefile.in
79-
/modules/platforms/cpp/**/aclocal.m4
80-
/modules/platforms/cpp/**/.libs/
81-
/modules/platforms/cpp/**/.dirstamp
82-
/modules/platforms/cpp/**/*.la
83-
/modules/platforms/cpp/ar-lib
84-
/modules/platforms/cpp/compile
85-
/modules/platforms/cpp/confdefs.h
86-
/modules/platforms/cpp/config.guess
87-
/modules/platforms/cpp/config.h
88-
/modules/platforms/cpp/config.h.in
89-
/modules/platforms/cpp/config.status
90-
/modules/platforms/cpp/config.sub
91-
/modules/platforms/cpp/configure
92-
/modules/platforms/cpp/core-test/ignite-tests
93-
/modules/platforms/cpp/core/ignite.pc
94-
/modules/platforms/cpp/depcomp
95-
/modules/platforms/cpp/ignite/ignite
96-
/modules/platforms/cpp/install-sh
97-
/modules/platforms/cpp/libtool
98-
/modules/platforms/cpp/ltmain.sh
99-
/modules/platforms/cpp/m4/
100-
/modules/platforms/cpp/missing
101-
/modules/platforms/cpp/odbc-test/ignite-odbc-tests
102-
/modules/platforms/cpp/stamp-h1
103-
/modules/platforms/cpp/thin-client-test/ignite-thin-client-tests
76+
#CMake temp files
77+
/modules/platforms/cpp/**/cmake-build**
10478

10579
#Files related to ML manual-runnable tests
10680
/modules/ml/src/test/resources/manualrun/trees/columntrees.manualrun.properties

‎DEVNOTES.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,17 @@ Apache Ignite Maven Build Instructions
1515

1616
mvn initialize -Pjavadoc
1717

18-
4) Assembly Apache Ignite:
18+
4) Build Apache Ignite assembly:
1919

2020
mvn initialize -Prelease
2121

22-
Look for apache-ignite-<version>-bin.zip in ./target/bin directory.
22+
Look for apache-ignite-<version>-bin.zip in ./target/bin directory.
23+
24+
5) Build Apache Ignite slim edition assembly:
25+
26+
mvn initialize -Prelease -Dignite.edition=apache-ignite-slim
27+
28+
Look for apache-ignite-slim-<version>-bin.zip in ./target/bin directory.
2329

2430

2531
Apache Ignite with LGPL Maven Build Instructions
@@ -39,7 +45,7 @@ Apache Ignite with LGPL Maven Build Instructions
3945

4046
mvn initialize -Pjavadoc,lgpl
4147

42-
4) Assembly Apache Ignite with LGPL dependencies:
48+
4) Build Apache Ignite assembly with LGPL dependencies:
4349

4450
mvn initialize -Prelease,lgpl -Dignite.edition=apache-ignite-lgpl
4551

‎LICENSE‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,9 @@ This eBook is for the use of anyone anywhere at no cost and with
243243
almost no restrictions whatsoever. You may copy it, give it away or
244244
re-use it under the terms of the Project Gutenberg License included
245245
with this eBook or online at www.gutenberg.org
246+
247+
==============================================================================
248+
For CMake script FindODBC.cmake in C++ module.
249+
==============================================================================
250+
This module contains modified FindODBC.cmake script from CMake distribution,
251+
which is available under a "3-clause BSD" license. For details, see https://cmake.org/licensing.

‎assembly/dependencies-apache-ignite-slim.xml‎

Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one or more
5+
contributor license agreements. See the NOTICE file distributed with
6+
this work for additional information regarding copyright ownership.
7+
The ASF licenses this file to You under the Apache License, Version 2.0
8+
(the "License"); you may not use this file except in compliance with
9+
the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
-->
19+
20+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
23+
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
24+
<id>dependencies</id>
25+
26+
<formats>
27+
<format>dir</format>
28+
</formats>
29+
30+
<includeBaseDirectory>false</includeBaseDirectory>
31+
32+
<moduleSets>
33+
<moduleSet>
34+
<includes>
35+
<include>org.apache.ignite:ignite-spring</include>
36+
<include>org.apache.ignite:ignite-indexing</include>
37+
</includes>
38+
<sources>
39+
<includeModuleDirectory>true</includeModuleDirectory>
40+
<fileSets>
41+
<fileSet>
42+
<directory>${basedir}</directory>
43+
<outputDirectory>/</outputDirectory>
44+
<includes>
45+
<include>README.txt</include>
46+
<include>licenses/**</include>
47+
</includes>
48+
</fileSet>
49+
<fileSet>
50+
<directory>${basedir}/target/licenses</directory>
51+
<outputDirectory>/licenses</outputDirectory>
52+
</fileSet>
53+
<fileSet>
54+
<directory>target/libs</directory>
55+
<outputDirectory>/</outputDirectory>
56+
</fileSet>
57+
<fileSet>
58+
<directory>target</directory>
59+
<outputDirectory>/</outputDirectory>
60+
<includes>
61+
<include>*.jar</include>
62+
</includes>
63+
<excludes>
64+
<exclude>*-tests.jar</exclude>
65+
<exclude>*-javadoc.jar</exclude>
66+
<exclude>*-sources.jar</exclude>
67+
</excludes>
68+
</fileSet>
69+
</fileSets>
70+
</sources>
71+
</moduleSet>
72+
73+
<moduleSet>
74+
<includes>
75+
<include>org.apache.ignite:ignite-core</include>
76+
</includes>
77+
<sources>
78+
<includeModuleDirectory>false</includeModuleDirectory>
79+
<fileSets>
80+
<fileSet>
81+
<directory>${basedir}</directory>
82+
<outputDirectory>/</outputDirectory>
83+
<includes>
84+
<include>README.txt</include>
85+
<include>licenses/**</include>
86+
</includes>
87+
</fileSet>
88+
<fileSet>
89+
<directory>${basedir}/target/licenses</directory>
90+
<outputDirectory>/licenses</outputDirectory>
91+
</fileSet>
92+
<fileSet>
93+
<directory>target/libs</directory>
94+
<outputDirectory>/</outputDirectory>
95+
</fileSet>
96+
<fileSet>
97+
<directory>target</directory>
98+
<outputDirectory>/</outputDirectory>
99+
<includes>
100+
<include>*.jar</include>
101+
</includes>
102+
<excludes>
103+
<exclude>*-tests.jar</exclude>
104+
<exclude>*-javadoc.jar</exclude>
105+
<exclude>*-sources.jar</exclude>
106+
</excludes>
107+
</fileSet>
108+
</fileSets>
109+
</sources>
110+
</moduleSet>
111+
112+
<moduleSet>
113+
<includeSubModules>true</includeSubModules>
114+
<excludes>
115+
<exclude>org.apache.ignite:ignite-core</exclude>
116+
<exclude>org.apache.ignite:ignite-clients</exclude>
117+
<exclude>org.apache.ignite:ignite-spring</exclude>
118+
<exclude>org.apache.ignite:ignite-tools</exclude>
119+
<exclude>org.apache.ignite:ignite-extdata-p2p</exclude>
120+
<exclude>org.apache.ignite:ignite-extdata-uri</exclude>
121+
<exclude>org.apache.ignite:ignite-extdata-uri-dep</exclude>
122+
<exclude>org.apache.ignite:ignite-examples</exclude>
123+
<exclude>org.apache.ignite:ignite-indexing</exclude>
124+
<exclude>org.apache.ignite:ignite-visor-console</exclude>
125+
<exclude>org.apache.ignite:ignite-visor-console_2.10</exclude>
126+
<exclude>org.apache.ignite:ignite-visor-plugins</exclude>
127+
<exclude>org.apache.ignite:ignite-hadoop</exclude>
128+
<exclude>org.apache.ignite:ignite-codegen</exclude>
129+
<exclude>org.apache.ignite:ignite-apache-license-gen</exclude>
130+
<exclude>org.apache.ignite:ignite-hibernate-core</exclude>
131+
<exclude>org.apache.ignite:ignite-hibernate_4.2</exclude>
132+
<exclude>org.apache.ignite:ignite-hibernate_5.1</exclude>
133+
<exclude>org.apache.ignite:ignite-hibernate_5.3</exclude>
134+
<exclude>org.apache.ignite:ignite-schedule</exclude>
135+
<exclude>org.apache.ignite:ignite-geospatial</exclude>
136+
<exclude>org.apache.ignite:ignite-appserver-test</exclude>
137+
<exclude>org.apache.ignite:ignite-websphere-test</exclude>
138+
<exclude>org.apache.ignite:ignite-cassandra</exclude>
139+
<exclude>org.apache.ignite:ignite-yardstick</exclude>
140+
<exclude>org.apache.ignite:ignite-benchmarks</exclude>
141+
<exclude>org.apache.ignite:ignite-web-agent</exclude>
142+
<exclude>org.apache.ignite:ignite-dev-utils</exclude>
143+
<exclude>org.apache.ignite:ignite-extdata-platform</exclude>
144+
<exclude>org.apache.ignite:ignite-compatibility</exclude>
145+
<exclude>org.apache.ignite:ignite-sqlline</exclude>
146+
<!-- Removed from slim packaging are: -->
147+
<exclude>org.apache.ignite:ignite-aop</exclude>
148+
<exclude>org.apache.ignite:ignite-aws</exclude>
149+
<exclude>org.apache.ignite:ignite-camel</exclude>
150+
<exclude>org.apache.ignite:ignite-cassandra-serializers</exclude>
151+
<exclude>org.apache.ignite:ignite-cassandra-store</exclude>
152+
<exclude>org.apache.ignite:ignite-cloud</exclude>
153+
<exclude>org.apache.ignite:ignite-direct-io</exclude>
154+
<exclude>org.apache.ignite:ignite-gce</exclude>
155+
<exclude>org.apache.ignite:ignite-jcl</exclude>
156+
<exclude>org.apache.ignite:ignite-jms11</exclude>
157+
<exclude>org.apache.ignite:ignite-kafka</exclude>
158+
<exclude>org.apache.ignite:ignite-mesos</exclude>
159+
<exclude>org.apache.ignite:ignite-ml</exclude>
160+
<exclude>org.apache.ignite:ignite-ml-h2o-model-parser</exclude>
161+
<exclude>org.apache.ignite:ignite-ml-spark-model-parser</exclude>
162+
<exclude>org.apache.ignite:ignite-ml-xgboost-model-parser</exclude>
163+
<exclude>org.apache.ignite:ignite-mqtt</exclude>
164+
<exclude>org.apache.ignite:ignite-osgi</exclude>
165+
<exclude>org.apache.ignite:ignite-osgi-karaf</exclude>
166+
<exclude>org.apache.ignite:ignite-osgi-paxlogging</exclude>
167+
<exclude>org.apache.ignite:ignite-scalar</exclude>
168+
<exclude>org.apache.ignite:ignite-scalar_2.10</exclude>
169+
<exclude>org.apache.ignite:ignite-spark</exclude>
170+
<exclude>org.apache.ignite:ignite-spark-2.4</exclude>
171+
<exclude>org.apache.ignite:ignite-spring-data</exclude>
172+
<exclude>org.apache.ignite:ignite-spring-data_2.0</exclude>
173+
<exclude>org.apache.ignite:ignite-ssh</exclude>
174+
<exclude>org.apache.ignite:ignite-storm</exclude>
175+
<exclude>org.apache.ignite:ignite-web</exclude>
176+
<exclude>org.apache.ignite:ignite-yarn</exclude>
177+
<exclude>org.apache.ignite:ignite-zookeeper</exclude>
178+
</excludes>
179+
<sources>
180+
<includeModuleDirectory>true</includeModuleDirectory>
181+
<outputDirectoryMapping>optional/${module.artifactId}</outputDirectoryMapping>
182+
<fileSets>
183+
<fileSet>
184+
<directory>${basedir}</directory>
185+
<outputDirectory>/</outputDirectory>
186+
<includes>
187+
<include>README.txt</include>
188+
<include>licenses/**</include>
189+
</includes>
190+
</fileSet>
191+
<fileSet>
192+
<directory>${basedir}/target/licenses</directory>
193+
<outputDirectory>/licenses</outputDirectory>
194+
</fileSet>
195+
<fileSet>
196+
<directory>target/libs</directory>
197+
<outputDirectory>/</outputDirectory>
198+
</fileSet>
199+
<fileSet>
200+
<directory>target/classes</directory>
201+
<outputDirectory>/</outputDirectory>
202+
<includes>
203+
<include>features.xml</include>
204+
</includes>
205+
</fileSet>
206+
<fileSet>
207+
<directory>target</directory>
208+
<outputDirectory>/</outputDirectory>
209+
<includes>
210+
<include>*.jar</include>
211+
</includes>
212+
<excludes>
213+
<exclude>*-tests.jar</exclude>
214+
<exclude>*-javadoc.jar</exclude>
215+
<exclude>*-sources.jar</exclude>
216+
</excludes>
217+
</fileSet>
218+
</fileSets>
219+
</sources>
220+
</moduleSet>
221+
</moduleSets>
222+
</assembly>

‎assembly/release-apache-ignite-base.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,9 @@
3636
</file>
3737

3838
<file>
39-
<source>modules/platforms/cpp/configure.acrel</source>
39+
<source>modules/platforms/cpp/CMakeLists.txt</source>
4040
<outputDirectory>/platforms/cpp</outputDirectory>
41-
<destName>configure.ac</destName>
42-
</file>
43-
44-
<file>
45-
<source>modules/platforms/cpp/Makefile.amrel</source>
46-
<outputDirectory>/platforms/cpp</outputDirectory>
47-
<destName>Makefile.am</destName>
41+
<destName>CMakeLists.txt</destName>
4842
</file>
4943

5044
<!-- Copy Node.js files. -->
@@ -152,6 +146,12 @@
152146
</includes>
153147
</fileSet>
154148

149+
<!-- Move CMake modules. -->
150+
<fileSet>
151+
<directory>modules/platforms/cpp/cmake</directory>
152+
<outputDirectory>/platforms/cpp/cmake</outputDirectory>
153+
</fileSet>
154+
155155
<!-- Move CPP "common" module. -->
156156
<fileSet>
157157
<directory>modules/platforms/cpp/common</directory>

‎assembly/release-apache-ignite-slim.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one or more
5+
contributor license agreements. See the NOTICE file distributed with
6+
this work for additional information regarding copyright ownership.
7+
The ASF licenses this file to You under the Apache License, Version 2.0
8+
(the "License"); you may not use this file except in compliance with
9+
the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
-->
19+
20+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
23+
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
24+
<id>apache-ignite</id>
25+
26+
<includeBaseDirectory>false</includeBaseDirectory>
27+
28+
<formats>
29+
<format>dir</format>
30+
</formats>
31+
32+
<componentDescriptors>
33+
<componentDescriptor>release-base.xml</componentDescriptor>
34+
<componentDescriptor>release-apache-ignite-base.xml</componentDescriptor>
35+
</componentDescriptors>
36+
37+
<files>
38+
<file>
39+
<source>examples/pom-standalone.xml</source>
40+
<outputDirectory>/examples</outputDirectory>
41+
<destName>pom.xml</destName>
42+
</file>
43+
44+
<file>
45+
<source>examples/README-slim.txt</source>
46+
<outputDirectory>/examples</outputDirectory>
47+
<destName>README.txt</destName>
48+
</file>
49+
</files>
50+
</assembly>

0 commit comments

Comments
 (0)