maven-tools 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23227a0f6772b29501ffa0890a0f9f6ef65e8deb
-  data.tar.gz: bf4f71491ab13af9739905120715e93ae3da10a8
+  metadata.gz: fbf78be52e455a8af44a9d4e16c3b23f2c6edf9b
+  data.tar.gz: e171856084989ae3b92520fcbe208c9517ddf20d
 SHA512:
-  metadata.gz: 5d91a6c49dd653da85ff7d6f3fdee43937c7021e27b557ac81f2125ab7a91b49d1d9697e0f27671e511b59ebf0b4d1700b0ecb578bb7418225a4316046b0b9fd
-  data.tar.gz: a54fa8f7ed5d0b40b577b56ba67bbe7127cf4ede4ac4ce244c558ad482cbd1b524690373a3ff11325690f440a41bf1e2f2914f71f9cb294a681f4c657af590d0
+  metadata.gz: cd1bac1d3e1407f26fbd3acb4340e9a4569d6c2effb1d3a11ae0d3bdf697c87774d87e76a8cea8f5938f435401e710b93deb115ed48ebfa908d6fc9dbce03162
+  data.tar.gz: fb0eef80a2741896901ece8bb566aa8abc5558b8d291b2be8fca0e7d1d927945708a937389ae86782b29114ff5269341a7e8b57c02562a8a80d22891109fe575

data/lib/maven/tools/dsl.rb

@@ -335,6 +335,7 @@ module Maven
           warn "DEPRECATED use filename instead"
           file = jfile.file
         end
+        file = ::File.join( basedir, file ) unless ::File.exists?( file )
         dsl = Maven::Tools::DSL::Jarfile.new( @current, file, options[ :skip_lock ] )
 
         # TODO this setup should be part of DSL::Jarfile

data/lib/maven/tools/dsl/jarfile_lock.rb

@@ -29,11 +29,14 @@ module Maven
           @file = File.expand_path( jarfile + ".lock" ) if jarfile
           if @file && File.exists?( @file )
             lock = YAML.load( File.read( @file ) )
-            if lock.is_a? Hash
+            case lock
+            when Hash
               @data = lock
-            else
+            when String
               # fallback on old format and treat them all as "runtime"
               data[ :runtime ] = lock.split( /\ / )
+            else
+              warn "unknown format of #{@file} - skip it"
             end
           end
         end

data/lib/maven/tools/version.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '1.0.10'.freeze
+    VERSION = '1.0.11'.freeze
   end
 end

data/spec/pom_from_jarfile_and_empty_lock/Jarfile

@@ -0,0 +1,3 @@
+jar 'junit:junit', '~> 4.11'
+
+jar 'org.slf4j:simple-slf4', '~> 1.6.4'

data/spec/pom_from_jarfile_and_empty_lock/pom.rb

@@ -0,0 +1,5 @@
+project 'example from jarfile' do
+
+  jarfile
+
+end

data/spec/pom_from_jarfile_and_empty_lock/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012 to original author or authors
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>no_group_id_given</groupId>
+  <artifactId>pom_from_jarfile_and_empty_lock</artifactId>
+  <version>0.0.0</version>
+  <name>example from jarfile</name>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>[4.11,4.99999]</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>simple-slf4</artifactId>
+      <version>[1.6.4,1.6.99999]</version>
+    </dependency>
+  </dependencies>
+</project>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -261,6 +261,9 @@ files:
 - spec/pom_from_jarfile/Jarfile
 - spec/pom_from_jarfile/pom.rb
 - spec/pom_from_jarfile/pom.xml
+- spec/pom_from_jarfile_and_empty_lock/Jarfile
+- spec/pom_from_jarfile_and_empty_lock/pom.rb
+- spec/pom_from_jarfile_and_empty_lock/pom.xml
 - spec/pom_from_jarfile_and_lock/Jarfile
 - spec/pom_from_jarfile_and_lock/pom.rb
 - spec/pom_from_jarfile_and_lock/pom.xml
@@ -335,6 +338,7 @@ test_files:
 - spec/pom_from_jarfile_with_exclusions/pom.rb
 - spec/pom_from_jarfile_and_lock/pom.rb
 - spec/pom_maven_hash_style/pom.rb
+- spec/pom_from_jarfile_and_empty_lock/pom.rb
 - spec/pom_from_jarfile_with_jruby/pom.rb
 - spec/pom_from_jarfile_and_skip_lock/pom.rb
 - spec/gemspec_in_profile/bouncy-castle-version.rb
@@ -390,6 +394,7 @@ test_files:
 - spec/gemfile_with_groups_and_lockfile/pom.xml
 - spec/gemfile_with_access_to_model/pom.xml
 - spec/gemspec_with_source_and_custom_jarname/pom.xml
+- spec/pom_from_jarfile_and_empty_lock/pom.xml
 - spec/gemspec_with_custom_source/pom.xml
 - spec/pom_from_jarfile_with_jruby/pom.xml
 - spec/pom_from_jarfile_and_skip_lock/pom.xml
@@ -443,6 +448,7 @@ test_files:
 - spec/gemfile_with_access_to_model/Mavenfile
 - spec/gemfile_with_access_to_model/Gemfile
 - spec/gemspec_with_source_and_custom_jarname/Mavenfile
+- spec/pom_from_jarfile_and_empty_lock/Jarfile
 - spec/gemspec_with_custom_source/Mavenfile
 - spec/pom_from_jarfile_with_jruby/Jarfile
 - spec/pom_from_jarfile_and_skip_lock/Jarfile