Commit 974f90ce authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x' into 2.0.x

parents 0cd2b926 60784e63
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<main.basedir>${basedir}/../../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
<glassfish.version>4.1.1</glassfish.version> <glassfish.version>4.1.1</glassfish.version>
<cargo.container.id>glassfish4x</cargo.container.id> <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> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment