maven-tools 1.0.13 → 1.1.0

data/spec/gemspec_with_prereleased_dependency/pom.xml

@@ -30,7 +30,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.2</jruby.plugins.version>
+    <jruby.plugins.version>1.1.4</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>
@@ -43,8 +44,8 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <id>mavengems</id>
+      <url>mavengem:https://rubygems.org</url>
     </repository>
     <repository>
       <releases>
@@ -59,6 +60,11 @@
   </repositories>
   <build>
     <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>${mavengem.wagon.version}</version>
+      </extension>
       <extension>
         <groupId>de.saumya.mojo</groupId>
         <artifactId>gem-extension</artifactId>

data/spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml

@@ -30,7 +30,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.2</jruby.plugins.version>
+    <jruby.plugins.version>1.1.4</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>
@@ -55,6 +56,11 @@
   </repositories>
   <build>
     <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>${mavengem.wagon.version}</version>
+      </extension>
       <extension>
         <groupId>de.saumya.mojo</groupId>
         <artifactId>gem-extension</artifactId>

data/spec/gemspec_with_source/pom.xml

@@ -30,7 +30,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.2</jruby.plugins.version>
+    <jruby.plugins.version>1.1.4</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>
@@ -46,12 +47,17 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <id>mavengems</id>
+      <url>mavengem:https://rubygems.org</url>
     </repository>
   </repositories>
   <build>
     <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>${mavengem.wagon.version}</version>
+      </extension>
       <extension>
         <groupId>de.saumya.mojo</groupId>
         <artifactId>gem-with-jar-extension</artifactId>

data/spec/gemspec_with_source_and_custom_jarname/pom.xml

@@ -30,7 +30,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.2</jruby.plugins.version>
+    <jruby.plugins.version>1.1.4</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>
@@ -49,12 +50,17 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <id>mavengems</id>
+      <url>mavengem:https://rubygems.org</url>
     </repository>
   </repositories>
   <build>
     <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>${mavengem.wagon.version}</version>
+      </extension>
       <extension>
         <groupId>de.saumya.mojo</groupId>
         <artifactId>gem-with-jar-extension</artifactId>

data/spec/gemspec_with_source_and_no_jar/pom.xml

@@ -30,7 +30,8 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.1.2</jruby.plugins.version>
+    <jruby.plugins.version>1.1.4</jruby.plugins.version>
+    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
   </properties>
   <dependencies>
     <dependency>
@@ -49,12 +50,17 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <id>mavengems</id>
+      <url>mavengem:https://rubygems.org</url>
     </repository>
   </repositories>
   <build>
     <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>${mavengem.wagon.version}</version>
+      </extension>
       <extension>
         <groupId>de.saumya.mojo</groupId>
         <artifactId>gem-extension</artifactId>

data/spec/mavenfile/Mavenfile

@@ -196,15 +196,15 @@ plugin_repository do
   end
 end
 
-build do
-  source_directory 'src'
-  script_source_directory 'script'
-  test_source_directory 'test'
-  output_directory 'pkg'
-  test_output_directory 'pkg/test'
-  default_goal :install
-  extension 'org.group:gem-extension:1.2'
-end
+default_goal :deploy
+directory 'target'
+final_name 'myproject'
+extension 'org.group:gem-extension:1.2'
+source_directory 'src'
+script_source_directory 'script'
+test_source_directory 'test'
+output_directory 'pkg'
+test_output_directory 'pkg/test'
 
 resource do
   target_path 'target'

data/spec/mavenfile_jrubyJar/pom.xml

@@ -17,12 +17,12 @@
   <packaging>jrubyJar</packaging>
   <name>mavenfile_jrubyJar</name>
   <properties>
-    <jruby9.plugins.version>0.2.2</jruby9.plugins.version>
+    <jruby9.plugins.version>0.3.0</jruby9.plugins.version>
   </properties>
   <build>
     <extensions>
       <extension>
-        <groupId>de.saumya.mojo</groupId>
+        <groupId>org.torquebox.mojo</groupId>
         <artifactId>jruby9-extensions</artifactId>
         <version>${jruby9.plugins.version}</version>
       </extension>

data/spec/mavenfile_jrubyWar/pom.xml

@@ -17,12 +17,12 @@
   <packaging>jrubyWar</packaging>
   <name>mavenfile_jrubyWar</name>
   <properties>
-    <jruby9.plugins.version>0.2.2</jruby9.plugins.version>
+    <jruby9.plugins.version>0.3.0</jruby9.plugins.version>
   </properties>
   <build>
     <extensions>
       <extension>
-        <groupId>de.saumya.mojo</groupId>
+        <groupId>org.torquebox.mojo</groupId>
         <artifactId>jruby9-extensions</artifactId>
         <version>${jruby9.plugins.version}</version>
       </extension>

data/spec/pom.xml

@@ -283,7 +283,7 @@
         <version>1.2</version>
       </extension>
     </extensions>
-    <defaultGoal>install</defaultGoal>
+    <defaultGoal>deploy</defaultGoal>
     <resources>
       <resource>
         <targetPath>target</targetPath>
@@ -310,6 +310,8 @@
         </excludes>
       </testResource>
     </testResources>
+    <directory>target</directory>
+    <finalName>myproject</finalName>
     <pluginManagement>
       <plugins>
         <plugin>

data/spec/pom_from_jarfile/pom.xml

@@ -26,7 +26,7 @@
       <artifactId>myfirst</artifactId>
       <version>0</version>
       <scope>system</scope>
-      <systemPath>myfirst.jar</systemPath>
+      <systemPath>${basedir}/myfirst.jar</systemPath>
     </dependency>
   </dependencies>
 </project>

data/spec/pom_maven_alternative_style/pom.rb

@@ -140,12 +140,14 @@ project 'my name', 'example.com' do
   end
 
   build do
+    default_goal :deploy
+    directory 'target'
+    final_name 'myproject'
     source_directory 'src'
     script_source_directory 'script'
     test_source_directory 'test'
     output_directory 'pkg'
     test_output_directory 'pkg/test'
-    default_goal :install
     extension 'org.group', 'gem-extension', '1.2'
     resource do
       target_path 'target'

data/spec/pom_maven_hash_style/pom.rb

@@ -163,12 +163,14 @@ project :name => 'my name', :url => 'example.com' do
                :checksum_policy => 'none' )
   end
   build do
+    directory 'target'
+    final_name 'myproject'
     source_directory 'src'
     script_source_directory 'script'
     test_source_directory 'test'
     output_directory 'pkg'
     test_output_directory 'pkg/test'
-    default_goal :install
+    default_goal :deploy
     extension( :group_id => 'org.group', 
                :artifact_id => 'gem-extension',
                :version => '1.2' )

data/spec/pom_maven_style/pom.rb

@@ -224,12 +224,14 @@ project do
     end
   end
   build do
+    default_goal :deploy
+    directory 'target'
+    final_name 'myproject'
     source_directory 'src'
     script_source_directory 'script'
     test_source_directory 'test'
     output_directory 'pkg'
     test_output_directory 'pkg/test'
-    default_goal :install
     extension 'org.group:gem-extension:1.2'
     resource do
       target_path 'target'

data/spec/pom_spec.rb

@@ -18,7 +18,7 @@ describe Maven::Tools::POM do
         pom_xml.gsub!( /tesla-polyglot/, 'polyglot' )
         pom_xml.gsub!( /${tesla.version}/, Maven::Tools::VERSIONS[ :polyglot_version ] )
 
-        pom.to_s.gsub( /#{File.expand_path( dir )}\//, '' ).must_equal pom_xml
+        pom.to_s.must_equal pom_xml
       end
     end
   end

data/spec/pom_with_execute/pom.xml

@@ -20,7 +20,7 @@
       <plugin>
         <groupId>io.takari.polyglot</groupId>
         <artifactId>polyglot-maven-plugin</artifactId>
-        <version>0.1.18</version>
+        <version>0.1.15</version>
         <executions>
           <execution>
             <phase>validate</phase>
@@ -80,7 +80,7 @@
           <dependency>
             <groupId>io.takari.polyglot</groupId>
             <artifactId>polyglot-ruby</artifactId>
-            <version>0.1.18</version>
+            <version>0.1.15</version>
           </dependency>
         </dependencies>
       </plugin>

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.0
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   name: virtus
@@ -21,13 +21,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   name: rake
@@ -35,13 +35,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
   name: minitest
@@ -49,7 +49,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
 description: adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc
@@ -180,6 +180,7 @@ files:
 - spec/gemfile_with_platforms/Gemfile
 - spec/gemfile_with_platforms/Mavenfile
 - spec/gemfile_with_platforms/pom.xml
+- spec/gemfile_with_source/Gemfile
 - spec/gemfile_with_source/Mavenfile
 - spec/gemfile_with_source/bouncy-castle-java.gemspec
 - spec/gemfile_with_source/bouncy-castle-version.rb
@@ -199,6 +200,9 @@ files:
 - spec/gemfile_with_test_group/Gemfile.lock
 - spec/gemfile_with_test_group/Mavenfile
 - spec/gemfile_with_test_group/pom.xml
+- spec/gemfile_with_two_sources/Gemfile
+- spec/gemfile_with_two_sources/Mavenfile
+- spec/gemfile_with_two_sources/pom.xml
 - spec/gemfile_without_gemspec/Gemfile
 - spec/gemfile_without_gemspec/Mavenfile
 - spec/gemfile_without_gemspec/pom.xml
@@ -319,17 +323,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: helpers for maven related tasks
@@ -401,6 +405,7 @@ test_files:
 - spec/gemfile_with_source_and_custom_jarname/pom.xml
 - spec/gemfile_with_source_and_no_jar/pom.xml
 - spec/gemfile_with_test_group/pom.xml
+- spec/gemfile_with_two_sources/pom.xml
 - spec/gemfile_without_gemspec/pom.xml
 - spec/gemspec/pom.xml
 - spec/gemspec_in_profile/pom.xml
@@ -455,6 +460,7 @@ test_files:
 - spec/gemfile_with_path/Mavenfile
 - spec/gemfile_with_platforms/Gemfile
 - spec/gemfile_with_platforms/Mavenfile
+- spec/gemfile_with_source/Gemfile
 - spec/gemfile_with_source/Mavenfile
 - spec/gemfile_with_source_and_custom_jarname/Gemfile
 - spec/gemfile_with_source_and_custom_jarname/Mavenfile
@@ -462,6 +468,8 @@ test_files:
 - spec/gemfile_with_source_and_no_jar/Mavenfile
 - spec/gemfile_with_test_group/Gemfile
 - spec/gemfile_with_test_group/Mavenfile
+- spec/gemfile_with_two_sources/Gemfile
+- spec/gemfile_with_two_sources/Mavenfile
 - spec/gemfile_without_gemspec/Gemfile
 - spec/gemfile_without_gemspec/Mavenfile
 - spec/gemspec/Mavenfile