Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #6 from example42/master

Just few cosmetic and non intrusive bits
  • Loading branch information...
commit e7370ec8477d0bb6ab52a1f95703de9f12bd54d9 2 parents abc9910 + c276900
@carlossg carlossg authored
View
3  manifests/buildr.pp
@@ -16,8 +16,7 @@
#
# A puppet recipe to install Apache Buildr
#
-
-
+#
class maven::buildr( $java_home ) {
# Can't use this as gem install buildr requires JAVA_HOME environment variable
View
4 manifests/environment.pp
@@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Define: maven::settings
+# Define: maven::environment
#
-# A puppet recipe to set the contents of the settings.xml file
+# A puppet recipe to set the contents of the .mavenrc file
#
define maven::environment( $user, $home = undef, $maven_opts = '', $maven_path_additions = '', $mavenrc_additions = '' ) {
View
2  manifests/init.pp
@@ -30,7 +30,7 @@
# class {'maven':
# version => "2.2.1",
# }
-
+#
class maven {
notice('Installing Maven module pre-requisites')
View
4 manifests/maven.pp
@@ -27,6 +27,7 @@
# class {'maven::maven':
# version => "2.2.1",
# }
+#
class maven::maven( $version = '2.2.1',
$repo = {
#url => 'http://repo1.maven.org/maven2',
@@ -36,7 +37,8 @@
$archive = "/tmp/apache-maven-${version}-bin.tar.gz"
- # we could use puppet-stdlib function !empty(repo) but avoiding adding a new dependency for now
+ # we could use puppet-stdlib function !empty(repo) but avoiding adding a new
+ # dependency for now
if "x${repo['url']}x" != 'xx' {
wget::authfetch { 'fetch-maven':
source => "${repo['url']}/org/apache/maven/apache-maven/$version/apache-maven-${version}-bin.tar.gz",
View
2  manifests/settings.pp
@@ -17,7 +17,7 @@
# A puppet recipe to set the contents of the settings.xml file
#
define maven::settings( $home = '/root', $user = 'root',
- $servers = [], $mirrors = [], $default_repo_config = {}, $properties = {}, local_repo = "" ) {
+ $servers = [], $mirrors = [], $default_repo_config = {}, $properties = {}, local_repo = '' ) {
file { "${home}/.m2":
ensure => directory,
View
2  spec/fixtures/modules/wget/manifests/authfetch.pp
@@ -1,2 +1,2 @@
-define wget::authfetch($source,$destination,$user,$password="",$timeout="0") {
+define wget::authfetch($source,$destination,$user,$password='',$timeout='0') {
}
View
2  spec/fixtures/modules/wget/manifests/fetch.pp
@@ -1,2 +1,2 @@
-define wget::fetch($source,$destination,$timeout="0") {
+define wget::fetch($source,$destination,$timeout='0') {
}
Please sign in to comment.
Something went wrong with that request. Please try again.