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/13 11:08:05 UTC
[ignite-3] branch gg-13618-asm updated: Move prestodb-bytecode to
separate module.
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
The following commit(s) were added to refs/heads/gg-13618-asm by this push:
new 90f634f Move prestodb-bytecode to separate module.
90f634f is described below
commit 90f634fd4d9b95d7b47ccc86389570338ec6ecfd
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Wed Jan 13 14:07:53 2021 +0300
Move prestodb-bytecode to separate module.
---
modules/bytecode/README.md | 4 ++
modules/{commons => bytecode}/pom.xml | 39 ++---------------
.../java/com/facebook/presto/bytecode/Access.java | 0
.../bytecode/AddFakeLineNumberClassVisitor.java | 0
.../presto/bytecode/AnnotationDefinition.java | 0
.../com/facebook/presto/bytecode/ArrayOpCode.java | 0
.../presto/bytecode/ByteCodeTooLargeException.java | 0
.../facebook/presto/bytecode/BytecodeBlock.java | 0
.../com/facebook/presto/bytecode/BytecodeNode.java | 0
.../facebook/presto/bytecode/BytecodeUtils.java | 0
.../facebook/presto/bytecode/BytecodeVisitor.java | 0
.../facebook/presto/bytecode/ClassDefinition.java | 0
.../facebook/presto/bytecode/ClassGenerator.java | 0
.../com/facebook/presto/bytecode/ClassInfo.java | 0
.../facebook/presto/bytecode/ClassInfoLoader.java | 0
.../java/com/facebook/presto/bytecode/Comment.java | 0
.../presto/bytecode/CompilationException.java | 0
.../presto/bytecode/DumpBytecodeVisitor.java | 0
.../presto/bytecode/DynamicClassLoader.java | 0
.../facebook/presto/bytecode/FieldDefinition.java | 0
.../facebook/presto/bytecode/MethodDefinition.java | 0
.../presto/bytecode/MethodGenerationContext.java | 0
.../java/com/facebook/presto/bytecode/OpCode.java | 0
.../com/facebook/presto/bytecode/Parameter.java | 0
.../presto/bytecode/ParameterizedType.java | 0
.../java/com/facebook/presto/bytecode/Scope.java | 0
.../facebook/presto/bytecode/SmartClassWriter.java | 0
.../com/facebook/presto/bytecode/Variable.java | 0
.../presto/bytecode/control/CaseStatement.java | 0
.../presto/bytecode/control/DoWhileLoop.java | 0
.../presto/bytecode/control/FlowControl.java | 0
.../facebook/presto/bytecode/control/ForLoop.java | 0
.../presto/bytecode/control/IfStatement.java | 0
.../presto/bytecode/control/SwitchStatement.java | 0
.../facebook/presto/bytecode/control/TryCatch.java | 0
.../presto/bytecode/control/WhileLoop.java | 0
.../facebook/presto/bytecode/debug/DebugNode.java | 0
.../presto/bytecode/debug/LineNumberNode.java | 0
.../presto/bytecode/debug/LocalVariableNode.java | 0
.../bytecode/expression/AndBytecodeExpression.java | 0
.../expression/ArithmeticBytecodeExpression.java | 0
.../expression/ArrayLengthBytecodeExpression.java | 0
.../bytecode/expression/BytecodeExpression.java | 0
.../bytecode/expression/BytecodeExpressions.java | 0
.../expression/CastBytecodeExpression.java | 0
.../expression/ComparisonBytecodeExpression.java | 0
.../expression/ConstantBytecodeExpression.java | 0
.../expression/GetElementBytecodeExpression.java | 0
.../expression/GetFieldBytecodeExpression.java | 0
.../expression/InlineIfBytecodeExpression.java | 0
.../expression/InstanceOfBytecodeExpression.java | 0
.../expression/InvokeBytecodeExpression.java | 0
.../InvokeDynamicBytecodeExpression.java | 0
.../expression/NegateBytecodeExpression.java | 0
.../expression/NewArrayBytecodeExpression.java | 0
.../expression/NewInstanceBytecodeExpression.java | 0
.../bytecode/expression/NotBytecodeExpression.java | 0
.../bytecode/expression/OrBytecodeExpression.java | 0
.../bytecode/expression/PopBytecodeExpression.java | 0
.../expression/ReturnBytecodeExpression.java | 0
.../SetArrayElementBytecodeExpression.java | 0
.../expression/SetFieldBytecodeExpression.java | 0
.../presto/bytecode/instruction/Constant.java | 0
.../bytecode/instruction/FieldInstruction.java | 0
.../bytecode/instruction/InstructionNode.java | 0
.../bytecode/instruction/InvokeInstruction.java | 0
.../bytecode/instruction/JumpInstruction.java | 0
.../presto/bytecode/instruction/LabelNode.java | 0
.../bytecode/instruction/TypeInstruction.java | 0
.../bytecode/instruction/VariableInstruction.java | 0
.../presto/bytecode/TestBytecodeUtils.java | 0
.../presto/bytecode/TestClassGenerator.java | 0
.../expression/BytecodeExpressionAssertions.java | 0
.../TestArithmeticBytecodeExpression.java | 0
.../expression/TestArrayBytecodeExpressions.java | 0
.../expression/TestCastBytecodeExpression.java | 0
.../TestComparisonBytecodeExpression.java | 0
.../expression/TestConstantBytecodeExpression.java | 0
.../expression/TestGetFieldBytecodeExpression.java | 0
.../expression/TestInlineIfBytecodeExpression.java | 0
.../expression/TestInvokeBytecodeExpression.java | 0
.../TestInvokeDynamicBytecodeExpression.java | 0
.../expression/TestLogicalBytecodeExpression.java | 0
.../TestNewInstanceBytecodeExpression.java | 0
.../expression/TestPopBytecodeExpression.java | 0
.../expression/TestSetFieldBytecodeExpression.java | 0
.../TestSetVariableBytecodeExpression.java | 0
modules/commons/pom.xml | 51 +++++-----------------
.../org/apache/ignite/internal}/CompilerUtils.java | 2 +-
.../benchmarks/SerializerBenchmarkTest.java | 2 +-
.../schema/marshaller/JavaSerializerTest.java | 1 +
pom.xml | 13 ++++--
92 files changed, 32 insertions(+), 80 deletions(-)
diff --git a/modules/bytecode/README.md b/modules/bytecode/README.md
new file mode 100644
index 0000000..0135e01
--- /dev/null
+++ b/modules/bytecode/README.md
@@ -0,0 +1,4 @@
+# Apache Ignite Bytecode module
+Fork of PrestoDB Bytecode module (ver 0.243).
+* Removed unnecessary guava dependency.
+* Tests migrated from TestNG to JUnit 5.
diff --git a/modules/commons/pom.xml b/modules/bytecode/pom.xml
similarity index 70%
copy from modules/commons/pom.xml
copy to modules/bytecode/pom.xml
index 967420c..7883f63 100644
--- a/modules/commons/pom.xml
+++ b/modules/bytecode/pom.xml
@@ -17,9 +17,6 @@
limitations under the License.
-->
-<!--
- POM file.
--->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -32,9 +29,8 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>ignite-commons</artifactId>
+ <artifactId>ignite-bytecode</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <url>http://ignite.apache.org</url>
<dependencies>
<dependency>
@@ -43,11 +39,6 @@
<version>${jetbrains.annotations.version}</version>
</dependency>
<dependency>
- <groupId>com.squareup</groupId>
- <artifactId>javapoet</artifactId>
- <version>${javapoet.version}</version>
- </dependency>
- <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm.version}</version>
@@ -70,31 +61,6 @@
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>${junit.jupiter.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.core.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Benchmarks dependencies -->
- <dependency>
- <groupId>org.openjdk.jmh</groupId>
- <artifactId>jmh-core</artifactId>
- <version>${jmh.framework.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javax.annotation.api.version}</version>
- </dependency>
</dependencies>
<build>
@@ -104,6 +70,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>README.md</exclude>
<exclude>src/main/java/com/facebook/presto/bytecode/ClassInfo.java</exclude>
<exclude>src/main/java/com/facebook/presto/bytecode/ClassInfoLoader.java</exclude>
</excludes>
@@ -111,4 +78,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/Access.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/Access.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/Access.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/Access.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/AddFakeLineNumberClassVisitor.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/AddFakeLineNumberClassVisitor.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/AddFakeLineNumberClassVisitor.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/AddFakeLineNumberClassVisitor.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/AnnotationDefinition.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/AnnotationDefinition.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/AnnotationDefinition.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/AnnotationDefinition.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/ArrayOpCode.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/ArrayOpCode.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/ArrayOpCode.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/ArrayOpCode.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/ByteCodeTooLargeException.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/ByteCodeTooLargeException.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/ByteCodeTooLargeException.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/ByteCodeTooLargeException.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/BytecodeBlock.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeBlock.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/BytecodeBlock.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeBlock.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/BytecodeNode.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeNode.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/BytecodeNode.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeNode.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/BytecodeUtils.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeUtils.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/BytecodeUtils.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeUtils.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/BytecodeVisitor.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeVisitor.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/BytecodeVisitor.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/BytecodeVisitor.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/ClassDefinition.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/ClassDefinition.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/ClassDefinition.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/ClassDefinition.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/ClassGenerator.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/ClassGenerator.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/ClassGenerator.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/ClassGenerator.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/ClassInfo.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/ClassInfo.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/ClassInfo.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/ClassInfo.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/ClassInfoLoader.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/ClassInfoLoader.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/ClassInfoLoader.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/ClassInfoLoader.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/Comment.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/Comment.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/Comment.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/Comment.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/CompilationException.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/CompilationException.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/CompilationException.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/CompilationException.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/DumpBytecodeVisitor.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/DumpBytecodeVisitor.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/DumpBytecodeVisitor.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/DumpBytecodeVisitor.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/DynamicClassLoader.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/DynamicClassLoader.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/DynamicClassLoader.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/DynamicClassLoader.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/FieldDefinition.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/FieldDefinition.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/FieldDefinition.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/FieldDefinition.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/MethodDefinition.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/MethodDefinition.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/MethodDefinition.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/MethodDefinition.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/MethodGenerationContext.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/MethodGenerationContext.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/MethodGenerationContext.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/MethodGenerationContext.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/OpCode.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/OpCode.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/OpCode.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/OpCode.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/Parameter.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/Parameter.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/Parameter.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/Parameter.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/ParameterizedType.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/ParameterizedType.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/ParameterizedType.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/ParameterizedType.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/Scope.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/Scope.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/Scope.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/Scope.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/SmartClassWriter.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/SmartClassWriter.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/SmartClassWriter.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/SmartClassWriter.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/Variable.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/Variable.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/Variable.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/Variable.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/control/CaseStatement.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/CaseStatement.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/control/CaseStatement.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/CaseStatement.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/control/DoWhileLoop.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/DoWhileLoop.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/control/DoWhileLoop.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/DoWhileLoop.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/control/FlowControl.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/FlowControl.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/control/FlowControl.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/FlowControl.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/control/ForLoop.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/ForLoop.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/control/ForLoop.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/ForLoop.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/control/IfStatement.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/IfStatement.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/control/IfStatement.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/IfStatement.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/control/SwitchStatement.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/SwitchStatement.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/control/SwitchStatement.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/SwitchStatement.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/control/TryCatch.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/TryCatch.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/control/TryCatch.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/TryCatch.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/control/WhileLoop.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/WhileLoop.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/control/WhileLoop.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/control/WhileLoop.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/debug/DebugNode.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/debug/DebugNode.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/debug/DebugNode.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/debug/DebugNode.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/debug/LineNumberNode.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/debug/LineNumberNode.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/debug/LineNumberNode.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/debug/LineNumberNode.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/debug/LocalVariableNode.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/debug/LocalVariableNode.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/debug/LocalVariableNode.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/debug/LocalVariableNode.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/AndBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/AndBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/AndBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/AndBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ArithmeticBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ArithmeticBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ArithmeticBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ArithmeticBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ArrayLengthBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ArrayLengthBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ArrayLengthBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ArrayLengthBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpressions.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpressions.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpressions.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/BytecodeExpressions.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/CastBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/CastBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/CastBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/CastBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ComparisonBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ComparisonBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ComparisonBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ComparisonBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ConstantBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ConstantBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ConstantBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ConstantBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/GetElementBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/GetElementBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/GetElementBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/GetElementBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/GetFieldBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/GetFieldBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/GetFieldBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/GetFieldBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/InlineIfBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/InlineIfBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/InlineIfBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/InlineIfBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/InstanceOfBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/InstanceOfBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/InstanceOfBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/InstanceOfBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/InvokeBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/InvokeBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/InvokeDynamicBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeDynamicBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/InvokeDynamicBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/InvokeDynamicBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/NegateBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/NegateBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/NegateBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/NegateBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/NewArrayBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/NewArrayBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/NewArrayBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/NewArrayBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/NewInstanceBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/NewInstanceBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/NewInstanceBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/NewInstanceBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/NotBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/NotBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/NotBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/NotBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/OrBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/OrBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/OrBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/OrBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/PopBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/PopBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/PopBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/PopBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ReturnBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ReturnBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/ReturnBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/ReturnBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/SetArrayElementBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/SetArrayElementBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/SetArrayElementBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/SetArrayElementBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/expression/SetFieldBytecodeExpression.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/SetFieldBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/expression/SetFieldBytecodeExpression.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/expression/SetFieldBytecodeExpression.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/Constant.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/Constant.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/Constant.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/Constant.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/FieldInstruction.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/FieldInstruction.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/FieldInstruction.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/FieldInstruction.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/InstructionNode.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/InstructionNode.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/InstructionNode.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/InstructionNode.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/InvokeInstruction.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/InvokeInstruction.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/InvokeInstruction.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/InvokeInstruction.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/JumpInstruction.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/JumpInstruction.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/JumpInstruction.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/JumpInstruction.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/LabelNode.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/LabelNode.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/LabelNode.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/LabelNode.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/TypeInstruction.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/TypeInstruction.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/TypeInstruction.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/TypeInstruction.java
diff --git a/modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/VariableInstruction.java b/modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/VariableInstruction.java
similarity index 100%
rename from modules/commons/src/main/java/com/facebook/presto/bytecode/instruction/VariableInstruction.java
rename to modules/bytecode/src/main/java/com/facebook/presto/bytecode/instruction/VariableInstruction.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/TestBytecodeUtils.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/TestBytecodeUtils.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/TestBytecodeUtils.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/TestBytecodeUtils.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/TestClassGenerator.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/TestClassGenerator.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/TestClassGenerator.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/TestClassGenerator.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/BytecodeExpressionAssertions.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/BytecodeExpressionAssertions.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/BytecodeExpressionAssertions.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/BytecodeExpressionAssertions.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestArithmeticBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestArithmeticBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestArithmeticBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestArithmeticBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestArrayBytecodeExpressions.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestArrayBytecodeExpressions.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestArrayBytecodeExpressions.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestArrayBytecodeExpressions.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestCastBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestCastBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestCastBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestCastBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestComparisonBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestComparisonBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestComparisonBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestComparisonBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestConstantBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestConstantBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestConstantBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestConstantBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestGetFieldBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestGetFieldBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestGetFieldBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestGetFieldBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestInlineIfBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestInlineIfBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestInlineIfBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestInlineIfBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestInvokeBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestInvokeBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestInvokeBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestInvokeBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestInvokeDynamicBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestInvokeDynamicBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestInvokeDynamicBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestInvokeDynamicBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestLogicalBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestLogicalBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestLogicalBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestLogicalBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestNewInstanceBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestNewInstanceBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestNewInstanceBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestNewInstanceBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestPopBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestPopBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestPopBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestPopBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestSetFieldBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestSetFieldBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestSetFieldBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestSetFieldBytecodeExpression.java
diff --git a/modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestSetVariableBytecodeExpression.java b/modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestSetVariableBytecodeExpression.java
similarity index 100%
rename from modules/commons/src/test/java/com/facebook/presto/bytecode/expression/TestSetVariableBytecodeExpression.java
rename to modules/bytecode/src/test/java/com/facebook/presto/bytecode/expression/TestSetVariableBytecodeExpression.java
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 967420c..542238e 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -17,9 +17,6 @@
limitations under the License.
-->
-<!--
- POM file.
--->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -34,34 +31,18 @@
<artifactId>ignite-commons</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <url>http://ignite.apache.org</url>
<dependencies>
<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-bytecode</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>${jetbrains.annotations.version}</version>
</dependency>
- <dependency>
- <groupId>com.squareup</groupId>
- <artifactId>javapoet</artifactId>
- <version>${javapoet.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-tree</artifactId>
- <version>${asm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-util</artifactId>
- <version>${asm.version}</version>
- </dependency>
<!-- Test dependencies -->
<dependency>
@@ -82,6 +63,12 @@
<version>${mockito.core.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.squareup</groupId>
+ <artifactId>javapoet</artifactId>
+ <version>${javapoet.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Benchmarks dependencies -->
<dependency>
@@ -94,21 +81,7 @@
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.api.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/java/com/facebook/presto/bytecode/ClassInfo.java</exclude>
- <exclude>src/main/java/com/facebook/presto/bytecode/ClassInfoLoader.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/CompilerUtils.java b/modules/commons/src/test/java/org/apache/ignite/internal/CompilerUtils.java
similarity index 99%
rename from modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/CompilerUtils.java
rename to modules/commons/src/test/java/org/apache/ignite/internal/CompilerUtils.java
index 138c41b..21120e2 100644
--- a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/CompilerUtils.java
+++ b/modules/commons/src/test/java/org/apache/ignite/internal/CompilerUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.schema.marshaller;
+package org.apache.ignite.internal;
import com.squareup.javapoet.JavaFile;
import java.io.ByteArrayInputStream;
diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
index 033d579..bdcf3fb 100644
--- a/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
+++ b/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
@@ -27,7 +27,7 @@ import javax.lang.model.element.Modifier;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.Columns;
import org.apache.ignite.internal.schema.SchemaDescriptor;
-import org.apache.ignite.internal.schema.marshaller.CompilerUtils;
+import org.apache.ignite.internal.CompilerUtils;
import org.apache.ignite.internal.schema.marshaller.Serializer;
import org.apache.ignite.internal.schema.marshaller.SerializerFactory;
import org.apache.ignite.internal.util.Factory;
diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/schema/marshaller/JavaSerializerTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/schema/marshaller/JavaSerializerTest.java
index 082b047..8226068 100644
--- a/modules/commons/src/test/java/org/apache/ignite/internal/schema/marshaller/JavaSerializerTest.java
+++ b/modules/commons/src/test/java/org/apache/ignite/internal/schema/marshaller/JavaSerializerTest.java
@@ -28,6 +28,7 @@ import java.util.Random;
import java.util.UUID;
import java.util.stream.Stream;
import javax.lang.model.element.Modifier;
+import org.apache.ignite.internal.CompilerUtils;
import org.apache.ignite.internal.schema.Bitmask;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.Columns;
diff --git a/pom.xml b/pom.xml
index 0bc8573..23ac13d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,12 +68,13 @@
</dependencies>
<modules>
+ <module>modules/bytecode</module>
+ <module>modules/cli</module>
+ <module>modules/cli-common</module>
+ <module>modules/commons</module>
<module>modules/configuration</module>
<module>modules/configuration-annotation-processor</module>
<module>modules/ignite-runner</module>
- <module>modules/cli-common</module>
- <module>modules/cli</module>
- <module>modules/commons</module>
</modules>
<distributionManagement>
@@ -127,6 +128,12 @@
</excludes>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M4</version>
+ </plugin>
</plugins>
</build>
</project>