Merge branch '3.0.0' into oneOfProperties-issue

Author: frantuma

modules/swagger-generator/pom.xml

@@ -38,31 +38,6 @@
                     </execution>
                 </executions>
             </plugin>
-<!--            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>properties-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <executions>
-                    <execution>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>set-system-properties</goal>
-                        </goals>
-                        <configuration>
-                            <properties>
-                                <property>
-                                    <name>org.eclipse.jetty.util.log.class</name>
-                                    <value>org.eclipse.jetty.util.log.StdErrLog</value>
-                                </property>
-                                <property>
-                                    <name>org.eclipse.jetty.annotations.AnnotationParser.LEVEL</name>
-                                    <value>OFF</value>
-                                </property>
-                            </properties>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>