Fix README and shade ANTLR

Blazebit · Apr 11, 2024 · 28d54f7 · 28d54f7
1 parent 94ab575
commit 28d54f7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -167,7 +167,7 @@ interface CatModel {
 Assuming the domain model was already built, we could formulate a predicate:
 
 ```java
-ExpressionServiceFactory expressionService = Expressions.forModel(domain);
+ExpressionService expressionService = Expressions.forModel(domain);
 ExpressionCompiler compiler = expressionService.createCompiler();
 ExpressionCompiler.Context context = compiler.createContext(
     Collections.singletonMap("c", domain.getType("CatModel"))
@@ -190,7 +190,7 @@ This would yield `true` as the age of the cat in the example is 19. This could a
 ```java
 CriteriaBuilder<Cat> criteriaBuilder = criteriaBuilderFactory.create(entityManager, Cat.class, "cat");
 ExpressionSerializer<WhereBuilder> serializer = expressionService.createSerializer(WhereBuilder.class);
-ExpressionSerializer.Context context = serializer.createContext(
+ExpressionSerializer.Context context = new PersistenceExpressionSerializerContext(
     Collections.singletonMap("c", "cat")
 );
 serializer.serializeTo(context, predicate, criteriaBuilder);

diff --git a/core/impl/pom.xml b/core/impl/pom.xml
@@ -19,6 +19,12 @@
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
             <version>4.9.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>org.abego.treelayout.core</artifactId>
+                    <groupId>org.abego.treelayout</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -49,6 +55,32 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.antlr.v4.runtime</pattern>
+                                    <shadedPattern>com.blazebit.expression.impl.antlr</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.antlr:antlr4-runtime</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>