Merge branch 'main' into 26-stream-support

# Conflicts: # README.md # lilo-samples/01-spring-boot-hello-world/lilo-gateway/pom.xml # lilo-samples/01-spring-boot-hello-world/pom.xml # lilo-samples/02-spring-boot-basic-stitching/lilo-gateway/pom.xml # lilo-samples/02-spring-boot-basic-stitching/pom.xml # lilo-samples/03-spring-boot-local-stitching/lilo-gateway/pom.xml # lilo-samples/03-spring-boot-local-stitching/pom.xml # lilo-samples/04-spring-boot-reactive-stitching/lilo-gateway/pom.xml # lilo-samples/04-spring-boot-reactive-stitching/pom.xml # lilo-samples/05-spring-boot-basic-authentication/lilo-gateway/pom.xml # lilo-samples/05-spring-boot-basic-authentication/pom.xml # lilo-samples/pom.xml # pom.xml
friatech · Aug 25, 2023 · 6f0f690 · 6f0f690
2 parents 32b7525 + 0485eea
commit 6f0f690
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -149,6 +149,12 @@ final ExecutionInput executionInput = ExecutionInput.newExecutionInput()
 
 The localContext object is now accessible from your `IntrospectionRetriever` and `QueryRetriever`.
 
+## Additional Resources
+
+You can watch `Tame Your Spring Microservices With GraphQL Stitching Using Lilo` presentation.
+
+[![IMAGE ALT TEXT HERE](https://img.youtube.com/vi/5GQpxqORlr0/0.jpg)](https://www.youtube.com/watch?v=5GQpxqORlr0)
+
 ## Lilo's sisters
 
 - [Atlassian Braid](https://bitbucket.org/atlassian/graphql-braid)

diff --git a/lilo-samples/01-spring-boot-hello-world/lilo-gateway/pom.xml b/lilo-samples/01-spring-boot-hello-world/lilo-gateway/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/01-spring-boot-hello-world/server1/pom.xml b/lilo-samples/01-spring-boot-hello-world/server1/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/01-spring-boot-hello-world/server2/pom.xml b/lilo-samples/01-spring-boot-hello-world/server2/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/02-spring-boot-basic-stitching/lilo-gateway/pom.xml b/lilo-samples/02-spring-boot-basic-stitching/lilo-gateway/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/02-spring-boot-basic-stitching/server1/pom.xml b/lilo-samples/02-spring-boot-basic-stitching/server1/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/02-spring-boot-basic-stitching/server2/pom.xml b/lilo-samples/02-spring-boot-basic-stitching/server2/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/03-spring-boot-local-stitching/lilo-gateway/pom.xml b/lilo-samples/03-spring-boot-local-stitching/lilo-gateway/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/03-spring-boot-local-stitching/server1/pom.xml b/lilo-samples/03-spring-boot-local-stitching/server1/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/04-spring-boot-reactive-stitching/lilo-gateway/pom.xml b/lilo-samples/04-spring-boot-reactive-stitching/lilo-gateway/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/04-spring-boot-reactive-stitching/server1/pom.xml b/lilo-samples/04-spring-boot-reactive-stitching/server1/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/04-spring-boot-reactive-stitching/server2/pom.xml b/lilo-samples/04-spring-boot-reactive-stitching/server2/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/05-spring-boot-basic-authentication/lilo-gateway/pom.xml b/lilo-samples/05-spring-boot-basic-authentication/lilo-gateway/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/05-spring-boot-basic-authentication/server1/pom.xml b/lilo-samples/05-spring-boot-basic-authentication/server1/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/05-spring-boot-basic-authentication/server2/pom.xml b/lilo-samples/05-spring-boot-basic-authentication/server2/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.0.7</version>
+    <version>3.0.8</version>
     <relativePath/>
   </parent>
 

diff --git a/lilo-samples/pom.xml b/lilo-samples/pom.xml
@@ -101,7 +101,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <version>3.2.1</version>
         <executions>

diff --git a/pom.xml b/pom.xml
@@ -132,7 +132,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <version>3.3.0</version>
         <executions>
@@ -225,7 +224,7 @@
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>4.7.3.4</version>
+        <version>4.7.3.5</version>
         <dependencies>
           <dependency>
             <groupId>com.github.spotbugs</groupId>
@@ -255,6 +254,7 @@
       <id>ossrh</id>
       <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
+
     <repository>
       <id>ossrh</id>
       <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>