Skip to content

Commit

Permalink
Fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcingrzejszczak
marcingrzejszczak committed Jun 5, 2018
1 parent bd67d81 commit 5d9ddf7
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 57 deletions.
10 changes: 7 additions & 3 deletions MIGRATION.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ $ git commit -m "Added maven wrapper"

```bash
$ cf login -o ... -a ...
$ cf create-space sc-pipelines-test-dddbyexamples-factory
$ cf create-space sc-pipelines-stage-dddbyexamples-factory
$ cf create-space sc-pipelines-test-app-monolith
$ cf create-space sc-pipelines-stage-app-monolith
$ cf create-space sc-pipelines-prod
```

Expand All @@ -31,6 +31,10 @@ $ cf create-space sc-pipelines-prod
- Configured rollback tests via `sc-contract` plugin under `apicompatibility` profile (for `shortages-prediction-adapters`)
- Added `smoke` tests (just pining health initially) (initially only for `shortages-prediction-adapters` but could be added for more)
- Added `e2e` tests (just pining health initially) (initially only for `shortages-prediction-adapters` but could be added for more)
- Added `ServiceConfiguration` for `cloud` profile
- Added `ServiceConfiguration` for `cloud` profile (TODO: Verify why that's needed)
- Created the `app-monolith-db` database service for production
- The repo name is `app-monolith`
- it matches the name of the artifact id of module that produces the fat jar



40 changes: 20 additions & 20 deletions app-monolith/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,26 +193,6 @@
</includes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>stub</id>
<phase>prepare-package</phase>
<goals>
<goal>single</goal>
</goals>
<inherited>false</inherited>
<configuration>
<attach>true</attach>
<descriptors>
${basedir}/src/assembly/stub.xml
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -224,6 +204,26 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>stub</id>
<phase>prepare-package</phase>
<goals>
<goal>single</goal>
</goals>
<inherited>false</inherited>
<configuration>
<attach>true</attach>
<descriptors>
${basedir}/src/assembly/stub.xml
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
70 changes: 36 additions & 34 deletions shortages-prediction-adapters/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,28 +161,24 @@
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.6</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-test-source</id>
<phase>generate-test-sources</phase>
<goals>
<goal>compileTests</goal>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-test-sources/contracts</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
<configuration>
<useFile>false</useFile>
<includes>
<include>**/*Spec.java</include>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -220,6 +216,30 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<goals>
<goal>addTestSources</goal>
<goal>compileTests</goal>
</goals>
</execution>
</executions>
<!-- THIS IS CRITICAL CAUSE BY DEFAULT GMAVEN IGNORES WHATEVER SETUP YOU HAVE -->
<configuration>
<testSources>
<testSource>
<directory>${project.build.directory}/generated-test-sources/contracts/</directory>
<includes>
<include>**/*.groovy</include>
</includes>
</testSource>
</testSources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -229,6 +249,7 @@
<include>contracttests/**/*Test*.*</include>
<include>contracttests/**/*Spec*.*</include>
</includes>
<failIfNoTests>true</failIfNoTests>
</configuration>
</plugin>
<plugin>
Expand All @@ -255,25 +276,6 @@
<contractsPath>META-INF/${project.groupId}/app-monolith/${latest.production.version}/shortages-prediction-adapters/contracts</contractsPath>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-test-source</id>
<phase>generate-test-sources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-test-sources/contracts</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down

0 comments on commit 5d9ddf7

Please sign in to comment.