Skip to content

Commit

Permalink
Merge fee2c77 into 6c21776
Browse files Browse the repository at this point in the history
  • Loading branch information
Allan Mckenzie committed Mar 11, 2019
2 parents 6c21776 + fee2c77 commit 455b443
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 32 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
- Update framework-domain to 1.1.2-M1
- Update event-store to 1.2.0-M3
- Update framework-generators to 1.2.0-M2
- Update plugins to use a single plugin declaration for each plugin rather that one large plugin with multiple configurations

### Changed
- Update event-store to 1.1.1
Expand Down
13 changes: 9 additions & 4 deletions example-context/example-service/example-command/example-command-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@
<build>
<plugins>
<plugin>
<artifactId>generator-plugin</artifactId>
<groupId>uk.gov.justice.maven.generator</groupId>
<version>${generator-maven-plugin.version}</version>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>messaging-client-generator-plugin</artifactId>
<version>${framework-generators.version}</version>
<executions>
<execution>
<id>external-ramls</id>
<goals>
<goal>generate</goal>
<goal>generate-messaging-client</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
Expand All @@ -127,6 +127,11 @@
<version>${project.version}</version>
<classifier>raml</classifier>
</dependency>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>messaging-client-generator</artifactId>
<version>${framework-generators.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
Expand Down
8 changes: 4 additions & 4 deletions example-context/example-service/example-query/example-query-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,14 @@
<build>
<plugins>
<plugin>
<artifactId>generator-plugin</artifactId>
<groupId>uk.gov.justice.maven.generator</groupId>
<version>${generator-maven-plugin.version}</version>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>rest-client-generator-plugin</artifactId>
<version>${framework-generators.version}</version>
<executions>
<execution>
<id>external-ramls</id>
<goals>
<goal>generate</goal>
<goal>generate-rest-client</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
Expand Down
79 changes: 56 additions & 23 deletions example-context/example-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,16 +358,37 @@
</goals>
<phase>generate-sources</phase>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>uk.gov.justice.schema</groupId>
<artifactId>catalog-generation</artifactId>
<version>${json-schema-catalog.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.maven.generator</groupId>
<artifactId>raml-parser</artifactId>
<version>${generator-maven-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>rest-adapter-generator-plugin</artifactId>
<version>${framework-generators.version}</version>
<executions>
<execution>
<id>generate-rest-adapters</id>
<goals>
<goal>generate</goal>
<goal>generate-rest-adapter</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<generatorName>
uk.gov.justice.services.adapters.rest.generator.RestAdapterGenerator
</generatorName>
<parserName>uk.gov.justice.maven.generator.io.files.parser.RamlFileParser
</parserName>
<sourceDirectory>${basedir}/src/raml</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-sources
</outputDirectory>
Expand All @@ -381,16 +402,32 @@
</excludes>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>rest-adapter-generator</artifactId>
<version>${framework-generators.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>messaging-adapter-generator-plugin</artifactId>
<version>${framework-generators.version}</version>
<executions>
<execution>
<id>generate-messaging-adapters</id>
<goals>
<goal>generate</goal>
<goal>generate-messaging-adapter</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<generatorName>
uk.gov.justice.raml.jms.core.JmsEndpointGeneratorFactory
</generatorName>
<parserName>uk.gov.justice.maven.generator.io.files.parser.RamlFileParser
</parserName>
<sourceDirectory>${basedir}/src/raml</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-sources
</outputDirectory>
Expand All @@ -407,16 +444,32 @@
</includes>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>messaging-adapter-generator</artifactId>
<version>${framework-generators.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>messaging-client-generator-plugin</artifactId>
<version>${framework-generators.version}</version>
<executions>
<execution>
<id>generate-src-raml-message-clients</id>
<goals>
<goal>generate</goal>
<goal>generate-messaging-client</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<generatorName>
uk.gov.justice.services.clients.messaging.generator.MessagingClientGenerator
</generatorName>
<parserName>uk.gov.justice.maven.generator.io.files.parser.RamlFileParser
</parserName>
<sourceDirectory>${basedir}/src/raml</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-sources
</outputDirectory>
Expand All @@ -433,31 +486,11 @@
</execution>
</executions>
<dependencies>
<dependency>
<groupId>uk.gov.justice.schema</groupId>
<artifactId>catalog-generation</artifactId>
<version>${json-schema-catalog.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.maven.generator</groupId>
<artifactId>raml-parser</artifactId>
<version>${generator-maven-plugin.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>messaging-adapter-generator</artifactId>
<version>${framework-generators.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>messaging-client-generator</artifactId>
<version>${framework-generators.version}</version>
</dependency>
<dependency>
<groupId>uk.gov.justice.framework-generators</groupId>
<artifactId>rest-adapter-generator</artifactId>
<version>${framework-generators.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<framework.version>6.0.0-M1</framework.version>
<embedded-artemis.version>1.2.0</embedded-artemis.version>
<event-store.version>2.0.0-M1</event-store.version>
<framework-generators.version>2.0.0-M1</framework-generators.version>
<framework-generators.version>2.0.0-M2</framework-generators.version>
<file.service.version>1.17.4</file.service.version>
<framework-api.version>4.0.0-M1</framework-api.version>
<generator-maven-plugin.version>2.6.2</generator-maven-plugin.version>
Expand Down

0 comments on commit 455b443

Please sign in to comment.