Merge branch 'release/0.0.2'

holixon · Apr 6, 2022 · a71cb68 · a71cb68
2 parents 7c63cad + 5f55fa4
commit a71cb68
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 51 deletions.
diff --git a/_examples/app-using-the-plugin/pom.xml b/_examples/app-using-the-plugin/pom.xml
@@ -2,21 +2,22 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.holixon.avro.maven._examples</groupId>
+  <parent>
+    <groupId>io.holixon.avro.maven._examples</groupId>
+    <artifactId>_examples</artifactId>
+    <version>EXAMPLE</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
   <artifactId>app-using-the-plugin</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
 
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <kotlin.version>1.6.10</kotlin.version>
-    <java.version>11</java.version>
-    <generator-plugin.version>0.0.1-SNAPSHOT</generator-plugin.version>
-
-    <avro.version>1.11.0</avro.version>
+    <kotlin.version>1.6.20</kotlin.version>
 
     <!-- SCHEMA DEFINITIONS -->
-    <schema-global.version>0.0.1-SNAPSHOT</schema-global.version>
-    <schema-service.version>0.0.1-SNAPSHOT</schema-service.version>
+    <schema-global.version>${project.version}</schema-global.version>
+    <schema-service.version>${project.version}</schema-service.version>
 
 
     <!-- TEST -->
@@ -239,10 +240,9 @@
       <plugin>
         <groupId>io.holixon.avro.maven</groupId>
         <artifactId>axon-avro-generator-maven-plugin</artifactId>
-        <version>${generator-plugin.version}</version>
         <executions>
           <execution>
-            <id>dummy</id>
+            <id>generate-classes-from-avro</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>generate-classes-from-schema</goal>

diff --git a/_examples/pom.xml b/_examples/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.holixon.avro.maven._examples</groupId>
+  <artifactId>_examples</artifactId>
+  <version>EXAMPLE</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>app-using-the-plugin</module>
+    <module>schema-global</module>
+    <module>schema-service</module>
+  </modules>
+
+  <properties>
+    <java.version>11</java.version>
+    <avro.version>1.11.0</avro.version>
+    <generator-plugin.version>0.0.2-SNAPSHOT</generator-plugin.version>
+    <!--    <generator-plugin.version>0.0.2</generator-plugin.version>-->
+  </properties>
+
+  <build>
+    <defaultGoal>clean package</defaultGoal>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>io.holixon.avro.maven</groupId>
+          <artifactId>axon-avro-generator-maven-plugin</artifactId>
+          <version>${generator-plugin.version}</version>
+
+          <!-- TODO do we need this? or can we inherit avro from project that uses this plugin? -->
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.avro</groupId>
+              <artifactId>avro</artifactId>
+              <version>${avro.version}</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/_examples/schema-global/README.md b/_examples/schema-global/README.md
@@ -4,7 +4,11 @@ Global
 
 <!-- GENERATED AVSC DOCS (do not remove this marker) -->
 
-# HALLO
+| Type | Namespace | Name | Revision | Description |
+|------|-----------|------|----------|-------------|
+| **query** | _io.holixon.schema.global.query_ | [LookupCustomerQuery](./src/main/avro/io/holixon/schema/global/query/LookupCustomerQuery.avsc) | 1 | Query to look up a customer ID |
+| **N/A** | _io.holixon.schema.global.query_ | [LookupCustomerQueryResult](./src/main/avro/io/holixon/schema/global/query/LookupCustomerQueryResult.avsc) | 1 | An ID representing a customer |
+| **event** | _io.holixon.schema.global.event_ | [OrderImportedEvent](./src/main/avro/io/holixon/schema/global/event/OrderImportedEvent.avsc) | 1 | A new order has been imported. Order ID ... |
 
 <!-- /GENERATED AVSC DOCS  (do not remove this marker) -->
 
@@ -13,3 +17,4 @@ Some footer stuff
 
 
 
+
diff --git a/_examples/schema-global/pom.xml b/_examples/schema-global/pom.xml
@@ -3,15 +3,14 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.holixon.avro.maven._examples</groupId>
-  <artifactId>schema-global</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>io.holixon.avro.maven._examples</groupId>
+    <artifactId>_examples</artifactId>
+    <version>EXAMPLE</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
 
-  <properties>
-    <java.version>11</java.version>
-    <avro.version>1.11.0</avro.version>
-    <generator-plugin.version>0.0.1-SNAPSHOT</generator-plugin.version>
-  </properties>
+  <artifactId>schema-global</artifactId>
 
   <dependencies>
     <dependency>
@@ -28,24 +27,20 @@
       <plugin>
         <groupId>io.holixon.avro.maven</groupId>
         <artifactId>axon-avro-generator-maven-plugin</artifactId>
-        <version>${generator-plugin.version}</version>
         <executions>
           <execution>
             <id>deploy</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>prepare-schema-deployment</goal>
             </goals>
-
+            <configuration>
+              <markdownGeneration>
+                <enable>true</enable>
+              </markdownGeneration>
+            </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro</artifactId>
-            <version>${avro.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/_examples/schema-service/pom.xml b/_examples/schema-service/pom.xml
@@ -3,25 +3,21 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.holixon.avro.maven._examples</groupId>
+  <parent>
+    <groupId>io.holixon.avro.maven._examples</groupId>
+    <artifactId>_examples</artifactId>
+    <version>EXAMPLE</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
   <artifactId>schema-service</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
 
-  <properties>
-    <java.version>11</java.version>
-    <avro.version>1.11.0</avro.version>
-    <generator-plugin.version>0.0.2-SNAPSHOT</generator-plugin.version>
-<!--    <generator-plugin.version>0.0.2</generator-plugin.version>-->
-  </properties>
 
   <build>
-    <defaultGoal>clean package</defaultGoal>
-
     <plugins>
       <plugin>
         <groupId>io.holixon.avro.maven</groupId>
         <artifactId>axon-avro-generator-maven-plugin</artifactId>
-        <version>${generator-plugin.version}</version>
         <executions>
           <execution>
             <goals>
@@ -35,13 +31,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro</artifactId>
-            <version>${avro.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>io.holixon.avro.maven</groupId>
   <artifactId>axon-avro-generator-maven-plugin</artifactId>
-  <version>0.0.1</version>
+  <version>0.0.2</version>
   <packaging>maven-plugin</packaging>
 
   <name>${project.artifactId}</name>
@@ -571,8 +571,6 @@
             </execution>
           </executions>
         </plugin>
-
-
       </plugins>
     </pluginManagement>
 
@@ -678,7 +676,6 @@
     <developerConnection>scm:git:git@github.com:holixon/axon-avro-generator-maven-plugin.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
-
   <distributionManagement>
     <snapshotRepository>
       <id>ossrh</id>