Merge 063984a into 4c45a28

CJSCommonPlatform · Jul 12, 2019 · 20c0461 · 20c0461
2 parents 4c45a28 + 063984a
commit 20c0461
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,15 +10,15 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 - Integration test for event catchup
 - Integration test for PublishedEvent rebuild.
 - Update to framework 6.0.0 release candidates
-- Update framework-api to 4.0.0
-- Update framework to 6.0.0-RC1
-- Update event-store to 2.0.0-RC2
-- Update framework-generators to 2.0.0-RC1
-- Update file.service to 1.17.9
-- Update common-bom to 2.3.0
-- Update utilities to 1.20.0
-- Update test-utils to 1.24.2
-- Update json-schema-catalog to 1.7.2
+- Update framework-api to 4.0.1
+- Update file.service to 1.17.10
+- Update common-bom to 2.4.0
+- Update utilities to 1.20.1
+- Update test-utils to 1.24.3
+- Update json-schema-catalog to 1.7.3
+
+### Changed
+- Use a single event-source.yaml in example-event-source module
 
 ## [2.0.0-M3] - 2019-05-09
 

diff --git a/example-context/example-service/example-event-source/pom.xml b/example-context/example-service/example-event-source/pom.xml
@@ -0,0 +1,63 @@
+<?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">
+    <parent>
+        <artifactId>example-service</artifactId>
+        <groupId>uk.gov.justice.services.example</groupId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>example-event-source</artifactId>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-yaml-jar-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/yaml-jar
+                            </outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src</directory>
+                                    <includes>
+                                        <include>yaml/**</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>yaml</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <classifier>yaml</classifier>
+                            <classesDirectory>${project.basedir}/target/yaml-jar
+                            </classesDirectory>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...vent-listener/src/yaml/event-sources.yaml → ...-event-source/src/yaml/event-sources.yaml b/...vent-listener/src/yaml/event-sources.yaml → ...-event-source/src/yaml/event-sources.yaml
diff --git a/...e-context/example-service/example-event/example-event-indexer/src/yaml/event-sources.yaml b/...e-context/example-service/example-event/example-event-indexer/src/yaml/event-sources.yaml
diff --git a/...xample-service/example-event/example-event-indexer/src/yaml/subscriptions-descriptor.yaml b/...xample-service/example-event/example-event-indexer/src/yaml/subscriptions-descriptor.yaml
@@ -7,6 +7,6 @@ subscriptions_descriptor:
       events:
         - name: example.events.cake-ordered
           schema_uri: http://justice.gov.uk/example/event/listener/example.events.cake-ordered.json
-      event_source_name: indexer.event.source
+      event_source_name: event.source
 
 
diff --git a/...context/example-service/example-event/example-event-processor/src/yaml/event-sources.yaml b/...context/example-service/example-event/example-event-processor/src/yaml/event-sources.yaml
diff --git a/...mple-service/example-event/example-event-processor/src/yaml/subscriptions-descriptor.yaml b/...mple-service/example-event/example-event-processor/src/yaml/subscriptions-descriptor.yaml
@@ -10,4 +10,4 @@ subscriptions_descriptor:
 
         - name: example.events.cake-made
           schema_uri: http://justice.gov.uk/example/event/example.events.cake-made.json
-      event_source_name: private.event.source
+      event_source_name: event.source
diff --git a/example-context/example-service/example-event/pom.xml b/example-context/example-service/example-event/pom.xml
@@ -229,6 +229,12 @@
                                 <artifactId>event-subscription</artifactId>
                                 <version>${framework.version}</version>
                             </dependency>
+                            <dependency>
+                                <groupId>uk.gov.justice.services.example</groupId>
+                                <artifactId>example-event-source</artifactId>
+                                <classifier>yaml</classifier>
+                                <version>${project.version}</version>
+                            </dependency>
                         </dependencies>
                     </plugin>
                 </plugins>

diff --git a/example-context/example-service/example-single/pom.xml b/example-context/example-service/example-single/pom.xml
@@ -69,6 +69,12 @@
             <artifactId>framework-management</artifactId>
             <version>${framework.version}</version>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.services.example</groupId>
+            <artifactId>example-event-source</artifactId>
+            <classifier>yaml</classifier>
+            <version>${project.version}</version>
+        </dependency>
 
 
         <!-- Test Dependencies -->

diff --git a/example-context/example-service/pom.xml b/example-context/example-service/pom.xml
@@ -27,6 +27,7 @@
         <module>example-it</module>
         <module>example-liquibase</module>
         <module>example-single</module>
+        <module>example-event-source</module>
     </modules>
 
     <build>

diff --git a/pom.xml b/pom.xml
@@ -31,24 +31,24 @@
     <properties>
         <cpp.repo.name>cake-shop</cpp.repo.name>
 
-        <framework-api.version>4.0.0</framework-api.version>
-        <framework.version>6.0.0-RC3</framework.version>
-        <event-store.version>2.0.0-RC4</event-store.version>
-        <framework-generators.version>2.0.0-RC3</framework-generators.version>
-        <file.service.version>1.17.9</file.service.version>
+        <framework-api.version>4.0.1</framework-api.version>
+        <framework.version>6.0.0-RC4</framework.version>
+        <event-store.version>2.0.0-RC5</event-store.version>
+        <framework-generators.version>2.0.0-RC4</framework-generators.version>
+        <file.service.version>1.17.10</file.service.version>
 
-        <common-bom.version>2.3.0</common-bom.version>
-        <utilities.version>1.20.0</utilities.version>
-        <test-utils.version>1.24.2</test-utils.version>
+        <common-bom.version>2.4.0</common-bom.version>
+        <utilities.version>1.20.1</utilities.version>
+        <test-utils.version>1.24.3</test-utils.version>
 
-        <json-schema-catalog.version>1.7.2</json-schema-catalog.version>
+        <json-schema-catalog.version>1.7.3</json-schema-catalog.version>
         <embedded-artemis.version>1.2.0</embedded-artemis.version>
-        <generator-maven-plugin.version>2.7.1</generator-maven-plugin.version>
+        <generator-maven-plugin.version>2.7.2</generator-maven-plugin.version>
         <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>
         <jboss-vfs.version>3.2.12.Final</jboss-vfs.version>
-        <raml-maven-plugin.version>1.6.8</raml-maven-plugin.version>
+        <raml-maven-plugin.version>1.6.9</raml-maven-plugin.version>
         <annotation-validator-maven-plugin.version>1.0.1</annotation-validator-maven-plugin.version>
-        <json-transformer.version>1.0.4</json-transformer.version>
+        <json-transformer.version>1.0.6</json-transformer.version>
     </properties>
 
     <dependencyManagement>