Fix pom for Scala build

Fix compile error in CargoTest

pom.xml

@@ -76,11 +76,31 @@
     <maven-assembly-plugin.version>2.5.5</maven-assembly-plugin.version>
   </properties>
   <build>
-    <sourceDirectory>src/main/scala</sourceDirectory>
-    <testSourceDirectory>src/test/scala</testSourceDirectory>
     <plugins>
       <!-- Compiler -->
       <plugin>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>scala-maven-plugin</artifactId>
+        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <id>scala-compile-first</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>add-source</goal>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>scala-test-compile</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven-compiler-plugin.version}</version>
         <configuration>
@@ -88,11 +108,14 @@
           <target>${java.version}</target>
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
-      </plugin>
-      <plugin>
-        <groupId>net.alchim31.maven</groupId>
-        <artifactId>scala-maven-plugin</artifactId>
-        <version>3.2.1</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <!-- Jetty plugin -->
       <plugin>

src/test/java/se/citerus/dddsample/domain/model/cargo/CargoTest.java

@@ -48,11 +48,11 @@ public class CargoTest extends TestCase {
 
   public void testRoutingStatus() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
-    final ItineraryScala good = new ItineraryScala();
-    final ItineraryScala bad = new ItineraryScala();
+    final Itinerary good = new Itinerary();
+    final Itinerary bad = new Itinerary();
     final RouteSpecification acceptOnlyGood = new RouteSpecification(cargo.origin(), cargo.routeSpecification().destination(), new Date()) {
       @Override
-      public boolean isSatisfiedBy(ItineraryScala itinerary) {
+      public boolean isSatisfiedBy(Itinerary itinerary) {
         return itinerary == good;
       }
     };
@@ -289,7 +289,7 @@ public class CargoTest extends TestCase {
   private Cargo setUpCargoWithItinerary(Location origin, Location midpoint, Location destination) {
     Cargo cargo = new Cargo(new TrackingId("CARGO1"), new RouteSpecification(origin, destination, new Date()));
 
-    ItineraryScala itinerary = new ItineraryScala(
+    Itinerary itinerary = new Itinerary(
       Arrays.asList(
         new Leg(voyage, origin, midpoint, new Date(), new Date()),
         new Leg(voyage, midpoint, destination, new Date(), new Date())