diff --git a/.travis.yml b/.travis.yml
index b2cb03d9c..42a14bef6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - openjdk7
+  - openjdk8
   - openjdk9
   - openjdk10
   - openjdk11
diff --git a/modello-maven-plugin/src/it/features/pom.xml b/modello-maven-plugin/src/it/features/pom.xml
index b336a2a61..df3223590 100644
--- a/modello-maven-plugin/src/it/features/pom.xml
+++ b/modello-maven-plugin/src/it/features/pom.xml
@@ -125,10 +125,11 @@
     <plugins>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.1</version>
         <configuration>
           <show>private</show>
           <linksource>true</linksource>
+          <source>1.7</source>
         </configuration>
       </plugin>
       <plugin>
diff --git a/modello-maven-plugin/src/it/javadoc/pom.xml b/modello-maven-plugin/src/it/javadoc/pom.xml
index 0de70ed2d..f5955056d 100644
--- a/modello-maven-plugin/src/it/javadoc/pom.xml
+++ b/modello-maven-plugin/src/it/javadoc/pom.xml
@@ -7,6 +7,10 @@
   <artifactId>javadoc</artifactId>
   <version>0.1-SNAPSHOT</version>
 
+  <properties>
+    <source>1.7</source>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/modello-maven-plugin/src/it/snakeyaml/invoker.properties b/modello-maven-plugin/src/it/snakeyaml/invoker.properties
new file mode 100644
index 000000000..e3ae08259
--- /dev/null
+++ b/modello-maven-plugin/src/it/snakeyaml/invoker.properties
@@ -0,0 +1 @@
+invoker.java.version = 1.5+
diff --git a/modello-maven-plugin/src/it/snakeyaml/pom.xml b/modello-maven-plugin/src/it/snakeyaml/pom.xml
new file mode 100644
index 000000000..59c267caf
--- /dev/null
+++ b/modello-maven-plugin/src/it/snakeyaml/pom.xml
@@ -0,0 +1,58 @@
+<?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>org.codehaus.modello.its</groupId>
+  <artifactId>snakeyaml</artifactId>
+  <version>0.1-SNAPSHOT</version>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-snakeyaml</artifactId>
+      <version>@project.version@</version>
+    </dependency>
+  </dependencies>
+
+
+  <build>
+    <defaultGoal>test</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <source>@java.version@</source>
+          <target>@java.version@</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.2</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <configuration>
+          <version>1.0.0</version>
+          <useJava5>true</useJava5>
+          <models>
+            <model>src/main/mdo/model.mdo</model>
+          </models>
+        </configuration>
+        <executions>
+          <execution>
+            <id>standard</id>
+            <goals>
+              <goal>java</goal>
+              <goal>snakeyaml-writer</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/modello-maven-plugin/src/it/snakeyaml/src/main/mdo/model.mdo b/modello-maven-plugin/src/it/snakeyaml/src/main/mdo/model.mdo
new file mode 100644
index 000000000..4b01e9643
--- /dev/null
+++ b/modello-maven-plugin/src/it/snakeyaml/src/main/mdo/model.mdo
@@ -0,0 +1,37 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+  license agreements. See the NOTICE file distributed with this work for additional 
+  information regarding copyright ownership. The ASF licenses this file to 
+  you under the Apache License, Version 2.0 (the "License"); you may not use 
+  this file except in compliance with the License. You may obtain a copy of 
+  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+  by applicable law or agreed to in writing, software distributed under the 
+  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+  OF ANY KIND, either express or implied. See the License for the specific 
+  language governing permissions and limitations under the License. -->
+
+<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.8.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.8.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.8.0.xsd">
+  <id>model</id>
+  <name>Model</name>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.plexus.modello.demo.model</value>
+    </default>
+  </defaults>
+
+  <classes>
+    <class rootElement="true">
+      <name>Root</name>
+      <version>1.0.0+</version>
+      <fields>
+        <field>
+          <name>simpleField</name>
+          <type>String</type>
+          <version>1.0.0+</version>
+        </field>
+      </fields>
+    </class>
+  </classes>
+</model>
diff --git a/modello-maven-plugin/src/it/snakeyaml/src/test/java/org/plexus/modello/demo/model/RootTest.java b/modello-maven-plugin/src/it/snakeyaml/src/test/java/org/plexus/modello/demo/model/RootTest.java
new file mode 100644
index 000000000..9320a7d2d
--- /dev/null
+++ b/modello-maven-plugin/src/it/snakeyaml/src/test/java/org/plexus/modello/demo/model/RootTest.java
@@ -0,0 +1,35 @@
+package org.plexus.modello.demo.model;
+
+import org.plexus.modello.demo.model.io.snakeyaml.*;
+
+import java.io.*;
+
+public class RootTest {
+    private static Root createRoot(String fieldValue) {
+        Root r = new Root();
+        r.setSimpleField(fieldValue);
+        return r;
+    }
+
+    private static String asYamlString(Root root) throws IOException {
+        ModelSnakeYamlWriter writer = new ModelSnakeYamlWriter();
+
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
+             OutputStreamWriter osw = new OutputStreamWriter(baos)) {
+            writer.write(osw, root);
+            return baos.toString();
+        }
+    }
+
+    public void testWritingYaml() throws IOException {
+        Root root = createRoot("modello IT");
+
+        String rootAsYaml = asYamlString(root);
+
+        String expected = "%YAML 1.1" + "\n"                        // directive used to identify the version of YAML
+                        + "---" + "\n"                              // document separator
+                        + "\"simpleField\": \"modello IT\"" + "\n"; // actual Root
+        assert expected.equals(rootAsYaml): "Actual: [" + rootAsYaml + "]";
+    }
+}
+
diff --git a/modello-plugins/modello-plugin-snakeyaml/pom.xml b/modello-plugins/modello-plugin-snakeyaml/pom.xml
index d88f6bd1c..b422f47f4 100644
--- a/modello-plugins/modello-plugin-snakeyaml/pom.xml
+++ b/modello-plugins/modello-plugin-snakeyaml/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
-      <version>1.12</version>
+      <version>1.25</version>
     </dependency>
   </dependencies>
 
diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java
index 1d2833a68..ff528dbe8 100644
--- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java
+++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java
@@ -82,8 +82,11 @@ private void generateSnakeYamlWriter()
 
         jClass.addImport( "org.yaml.snakeyaml.DumperOptions" );
         jClass.addImport( "org.yaml.snakeyaml.DumperOptions.Version" );
+        jClass.addImport( "org.yaml.snakeyaml.DumperOptions.FlowStyle" );
+        jClass.addImport( "org.yaml.snakeyaml.DumperOptions.ScalarStyle" );
         jClass.addImport( "org.yaml.snakeyaml.emitter.Emitable" );
         jClass.addImport( "org.yaml.snakeyaml.emitter.Emitter" );
+        jClass.addImport( "org.yaml.snakeyaml.error.Mark" );
         jClass.addImport( "org.yaml.snakeyaml.events.DocumentEndEvent" );
         jClass.addImport( "org.yaml.snakeyaml.events.DocumentStartEvent" );
         jClass.addImport( "org.yaml.snakeyaml.events.ImplicitTuple" );
@@ -199,7 +202,7 @@ private void writeClass( ModelClass modelClass, JClass jClass )
 
         JSourceCode sc = marshall.getSourceCode();
 
-        sc.add( "generator.emit( new MappingStartEvent( null, null, true, null, null, false ) );" );
+        sc.add( "generator.emit( new MappingStartEvent( null, null, true, null, null, FlowStyle.BLOCK ) );" );
 
         ModelField contentField = null;
 
@@ -361,7 +364,7 @@ private void writeClass( ModelClass modelClass, JClass jClass )
                         }
                         else
                         {
-                            sc.add( "generator.emit( new MappingStartEvent( null, null, true, null, null, false ) );" );
+                            sc.add( "generator.emit( new MappingStartEvent( null, null, true, null, null, FlowStyle.BLOCK ) );" );
                         }
 
 
@@ -406,7 +409,7 @@ private void writeClass( ModelClass modelClass, JClass jClass )
 
                         if ( xmlAssociationMetadata.isMapExplode() )
                         {
-                            sc.add( "generator.emit( new MappingStartEvent( null, null, true, null, null, false ) );" );
+                            sc.add( "generator.emit( new MappingStartEvent( null, null, true, null, null, FlowStyle.BLOCK) );" );
                             writeScalarKey( sc, "key" );
                             writeScalar( sc, "key" );
                             writeScalarKey( sc, "value" );
@@ -463,9 +466,16 @@ private void writeScalarKey( JSourceCode sc, String key )
 
     private void writeScalar( JSourceCode sc, String value )
     {
-        sc.add( "generator.emit( new ScalarEvent( null, null, new ImplicitTuple( true, true ), "
+        sc.add( "{" );
+        sc.indent();
+        sc.add( "String anchor = null, tag = null;" );
+        sc.add( "Mark startMark = null, endMark = null;" );
+        sc.add( "ScalarStyle style = ScalarStyle.DOUBLE_QUOTED;" );
+        sc.add( "generator.emit( new ScalarEvent( anchor, tag, new ImplicitTuple( true, true ), "
                 + value
-                + ", null, null, ' ' ) );" );
+                + ", startMark, endMark, style ) );" );
+        sc.unindent();
+        sc.add( "}" );
     }
 
 }