You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2021/01/12 11:22:55 UTC

[ignite-3] 01/01: Merge branch 'ignite-13618' into gg-13618-asm

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch gg-13618-asm
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit 30119523577d083ab4a26d5edce2f5033291ce12
Merge: 6c0804d 9319404
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Tue Jan 12 14:22:35 2021 +0300

    Merge branch 'ignite-13618' into gg-13618-asm
    
    # Conflicts:
    #	modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/MarshallerCodeGenerator.java
    #	modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/TupleColumnAccessCodeGenerator.java
    #	pom.xml

 .asf.yaml                                          |   2 -
 DEVNOTES.md                                        |  48 +++
 docs/.gitignore                                    |   5 +
 .../resources/version.properties => docs/Gemfile   |  23 +-
 docs/README.adoc                                   | 252 ++++++++++++++
 docs/_config.yml                                   |  46 +++
 .../version.properties => docs/_data/toc.yaml      |  16 +-
 docs/_docs/ignite-cli-tool.adoc                    |  39 +++
 .../includes/ignite-cli-download-windows.adoc      |  18 +
 docs/_docs/includes/prereqs.adoc                   |  20 ++
 docs/_docs/index.adoc                              |  41 +++
 docs/_docs/installation/installing-using-exe.adoc  |  37 ++
 docs/_docs/quick-start/getting-started-guide.adoc  | 235 +++++++++++++
 .../pom.xml => docs/_includes/copyright.html       |  26 +-
 .../_includes/footer.html                          |  17 +-
 .../_includes/header.html                          |  31 +-
 docs/_includes/left-nav.html                       |  88 +++++
 .../_includes/right-nav.html                       |  16 +-
 .../_includes/section-toc.html                     |  26 +-
 docs/_includes/toc.html                            |  63 ++++
 docs/_layouts/default.html                         |  72 ++++
 .../default-config.xml => docs/_layouts/doc.html   |  30 +-
 .../default-config.xml => docs/_layouts/toc.html   |  29 +-
 docs/_plugins/asciidoctor-extensions.rb            | 180 ++++++++++
 docs/_sass/callouts.scss                           |  75 +++++
 docs/_sass/code.scss                               | 115 +++++++
 docs/_sass/docs.scss                               | 238 +++++++++++++
 docs/_sass/footer.scss                             |  48 +++
 docs/_sass/github.scss                             | 223 ++++++++++++
 docs/_sass/header.scss                             | 374 +++++++++++++++++++++
 docs/_sass/layout.scss                             |  45 +++
 docs/_sass/left-nav.scss                           | 109 ++++++
 docs/_sass/right-nav.scss                          |  73 ++++
 docs/_sass/rouge-base16-solarized.scss             |  99 ++++++
 docs/_sass/text.scss                               |  62 ++++
 docs/_sass/variables.scss                          |  33 ++
 docs/assets/css/asciidoc-pygments.css              |  59 ++++
 .../assets/css/docs.scss                           |  12 +-
 .../assets/css/styles.scss                         |  17 +-
 docs/assets/images/apple-blob.svg                  |  16 +
 docs/assets/images/arrow-down-white.svg            |   3 +
 docs/assets/images/arrow-down.svg                  |   3 +
 docs/assets/images/background-lines.svg            |  54 +++
 docs/assets/images/cancel.svg                      |  11 +
 docs/assets/images/checkmark-green.svg             |   3 +
 docs/assets/images/copy-icon.svg                   |   6 +
 docs/assets/images/cpp.svg                         |   9 +
 docs/assets/images/dev-internal-bg.jpg             | Bin 0 -> 23014 bytes
 docs/assets/images/dotnet.svg                      |   9 +
 docs/assets/images/edition-ce.svg                  |  16 +
 docs/assets/images/edition-ee.svg                  |  25 ++
 docs/assets/images/edition-ue.svg                  |  28 ++
 docs/assets/images/events-nav-arrow.svg            |   3 +
 docs/assets/images/feature-easy-installation.svg   |  28 ++
 docs/assets/images/feature-fast.svg                |  16 +
 docs/assets/images/feature-reliable.svg            |  25 ++
 docs/assets/images/github-gray.svg                 |   3 +
 docs/assets/images/github-white.svg                |   3 +
 docs/assets/images/glowing-box.svg                 | 170 ++++++++++
 docs/assets/images/integrations/hibernate.svg      |   6 +
 docs/assets/images/integrations/kafka.svg          |   3 +
 docs/assets/images/integrations/more.svg           |  18 +
 docs/assets/images/integrations/oracle.svg         |   3 +
 docs/assets/images/integrations/osgi.svg           |  17 +
 docs/assets/images/integrations/spark.svg          |   7 +
 docs/assets/images/integrations/spring.svg         |   3 +
 docs/assets/images/java.svg                        |   9 +
 docs/assets/images/left-nav-arrow.svg              |   3 +
 docs/assets/images/lines-bg-1.svg                  |  54 +++
 docs/assets/images/lines-bg-2.svg                  |  54 +++
 docs/assets/images/lines-bg-3.svg                  |  54 +++
 docs/assets/images/lines-bg-4.svg                  |  54 +++
 docs/assets/images/menu-icon.svg                   |   3 +
 docs/assets/images/mousepad-blob.svg               |   9 +
 ...piece-of-paper-with-folded-top-right-corner.svg | 117 +++++++
 docs/assets/images/scala.svg                       |  31 ++
 docs/assets/images/search.svg                      |  15 +
 docs/assets/images/violent-blob.svg                |  28 ++
 docs/assets/images/watermelon-blob.svg             |   9 +
 docs/assets/js/anchor.min.js                       |   9 +
 docs/assets/js/code-copy-to-clipboard.js           |  70 ++++
 docs/assets/js/code-tabs.js                        | 155 +++++++++
 docs/assets/js/docs-menu.js                        |  64 ++++
 docs/assets/js/index.js                            |  51 +++
 docs/assets/js/page-nav.js                         |  37 ++
 docs/assets/js/top-navigation.js                   |  92 +++++
 docs/favicon.ico                                   | Bin 0 -> 9780 bytes
 .../resources/version.properties => docs/run.sh    |  13 +-
 modules/{cli-demo => }/cli-common/pom.xml          |  12 +-
 .../apache/ignite/cli/common/IgniteCommand.java    |   0
 modules/cli-demo/cli/ignite.sh                     |  11 -
 .../progressbar/IgniteProgressBarRenderer.java     |  43 ---
 .../apache/ignite/cli/spec/ModuleCommandSpec.java  | 102 ------
 .../cli/src/main/resources/builtin_modules.conf    |  13 -
 .../cli-demo/cli/src/main/resources/logback.xml    |  14 -
 .../demo-module-all/demo-module-cli/pom.xml        |  55 ---
 .../ignite/snapshot/cli/SnapshotCommand.java       |  65 ----
 .../org.apache.ignite.cli.common.IgniteCommand     |   1 -
 modules/cli-demo/demo-module-all/pom.xml           |  56 ---
 modules/cli-demo/pom.xml                           |  90 -----
 .../resources/version.properties => cli/ignite.sh} |  21 +-
 modules/{cli-demo => }/cli/pom.xml                 |  62 ++--
 .../apache/ignite/cli/CliPathsConfigLoader.java    |  25 +-
 .../java/org/apache/ignite/cli/CliVersionInfo.java |   0
 .../java/org/apache/ignite/cli/CommandFactory.java |   0
 .../java/org/apache/ignite/cli/ErrorHandler.java   |   0
 .../org/apache/ignite/cli/HelpFactoryImpl.java     |  21 +-
 .../org/apache/ignite/cli/IgniteCLIException.java  |   0
 .../java/org/apache/ignite/cli/IgniteCliApp.java   |  14 +-
 .../java/org/apache/ignite/cli/IgnitePaths.java    |  24 ++
 .../org/apache/ignite/cli/IgniteProgressBar.java   |  82 +++--
 .../org/apache/ignite/cli/InteractiveWrapper.java  |   0
 .../src/main/java/org/apache/ignite/cli/Table.java |   2 +-
 .../org/apache/ignite/cli/VersionProvider.java     |   0
 .../ignite/cli/builtins/SystemPathResolver.java    |  22 +-
 .../cli/builtins/config/ConfigurationClient.java   |  12 +-
 .../cli/builtins/config/HttpClientFactory.java     |   0
 .../cli/builtins/init/InitIgniteCommand.java       |  91 +++--
 .../cli/builtins/module/MavenArtifactResolver.java |  28 +-
 .../cli/builtins/module/MavenCoordinates.java      |   2 +-
 .../ignite/cli/builtins/module/ModuleManager.java  |  69 +++-
 .../ignite/cli/builtins/module/ModuleStorage.java  |  31 +-
 .../ignite/cli/builtins/module/ResolveResult.java  |   0
 .../builtins/module/StandardModuleDefinition.java  |   0
 .../ignite/cli/builtins/node/NodeManager.java      |  58 ++--
 .../org/apache/ignite/cli/spec/CategorySpec.java   |   0
 .../org/apache/ignite/cli/spec/CommandSpec.java    |   0
 .../apache/ignite/cli/spec/ConfigCommandSpec.java  |  43 +--
 .../org/apache/ignite/cli/spec/IgniteCliSpec.java  |  23 +-
 .../ignite/cli/spec/InitIgniteCommandSpec.java     |  12 +-
 .../apache/ignite/cli/spec/ModuleCommandSpec.java  | 192 +++++++++++
 .../apache/ignite/cli/spec/NodeCommandSpec.java    |  92 +++--
 .../org/apache/ignite/cli/spec/SpecAdapter.java    |  27 +-
 .../cli/src/main/resources/builtin_modules.conf    |   7 +
 .../cli/src/main/resources/default-config.xml      |   0
 .../src/main/resources/logback.xml}                |  26 +-
 .../cli/src/main/resources/version.properties      |   0
 .../apache/ignite/cli/IgniteCliInterfaceTest.java  | 205 +++++++----
 .../cli/builtins/init/InitIgniteCommandTest.java   | 110 ++++++
 .../ignite/cli/builtins/init/ModuleMangerTest.java | 112 ++++++
 .../cli/src/test/resources/builtin_modules.conf    |  13 +
 .../src/test/resources/logback-test.xml}           |  26 +-
 .../src/test}/resources/version.properties         |   0
 modules/commons/pom.xml                            |  15 +-
 .../benchmarks/SerializerBenchmarkTest.java        |   6 +-
 modules/configuration-annotation-processor/pom.xml |  35 +-
 .../processor/internal/AbstractProcessorTest.java  |  10 +-
 .../configuration/processor/internal/Types.java    |  17 +
 .../internal/TestConfigurationSchema.java          |  19 +-
 modules/configuration/pom.xml                      |  26 +-
 modules/ignite-runner/pom.xml                      |  28 +-
 .../java/org/apache/ignite/app/IgniteRunner.java   |  36 +-
 .../java/org/apache/ignite/rest/RestModule.java    |   4 +-
 .../src/main/resources/bootstrap-config.json       |   2 +-
 pom.xml                                            | 122 +++----
 155 files changed, 5507 insertions(+), 1088 deletions(-)

diff --cc pom.xml
index 2e32521,566560d..0bc8573
--- a/pom.xml
+++ b/pom.xml
@@@ -46,10 -43,7 +43,8 @@@
      </licenses>
  
      <properties>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- 
          <!-- Dependencies versions. -->
 +        <asm.version>7.2</asm.version>
          <javapoet.version>1.13.0</javapoet.version>
          <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
          <jetbrains.annotations.version>20.1.0</jetbrains.annotations.version>