Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-10-29 11:00:30 +00:00
commit eafee8be58

View File

@ -14,7 +14,7 @@
<main.basedir>${basedir}/../../..</main.basedir>
<glassfish.version>4.1.1</glassfish.version>
<cargo.container.id>glassfish4x</cargo.container.id>
<cargo.container.url>http://download.oracle.com/glassfish/${glassfish.version}/release/glassfish-${glassfish.version}.zip</cargo.container.url>
<cargo.container.url>https://download.oracle.com/glassfish/${glassfish.version}/release/glassfish-${glassfish.version}.zip</cargo.container.url>
</properties>
<dependencies>
<dependency>