Permalink
Browse files

new versions and moved test-jars from jarfile to mavenfile

  • Loading branch information...
mkristian committed Mar 1, 2013
1 parent e91f3a1 commit d833687efa80e8be7f796f040f24d6e0b086a3ca
Showing with 149 additions and 18 deletions.
  1. +0 −3 Jarfile
  2. +4 −1 Mavenfile
  3. +1 −1 jbundler.gemspec
  4. BIN lib/jbundler.jar
  5. +144 −13 pom.xml
View
@@ -15,7 +15,4 @@ jar 'org.apache.maven.wagon:wagon-http', '2.2'
jar 'org.apache.maven:maven-settings', '3.0.4'
jar 'org.apache.maven:maven-settings-builder', '3.0.4'
-test_jar 'org.mockito:mockito-core', '1.9.5'
-test_jar 'org.testng:testng', '6.8'
-
# vim: syntax=Ruby
View
@@ -22,7 +22,7 @@ properties['jruby.versions'] = ['1.6.8','1.7.2','1.5.6'].join(',')
properties['jruby.18and19'] = true
# just lock the versions
-properties['jruby.plugins.version'] = '0.29.3'
+properties['jruby.plugins.version'] = '0.29.4'
properties['jruby.version'] = '1.7.2'
# TODO get them working again ;)
@@ -34,4 +34,7 @@ profile 'run-its' do |r|
end
end
+test_jar 'org.mockito:mockito-core', '1.9.5'
+test_jar 'org.testng:testng', '6.8'
+
# vim: syntax=Ruby
View
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
managing jar dependencies with or without bundler. adding bundler like handling of version ranges for jar dependencies.
END
- s.authors = ['Kristian Meier']
+ s.authors = ['Christian Meier']
s.email = ['m.kristian@web.de']
s.homepage = 'https://github.com/mkristian/jbundler'
View
Binary file not shown.
View
157 pom.xml
@@ -11,7 +11,7 @@
<developers>
<developer>
<id>m_dot_kristian_at_web_dot_de</id>
- <name>Kristian Meier</name>
+ <name>Christian Meier</name>
<email>m.kristian@web.de</email>
</developer>
</developers>
@@ -37,56 +37,83 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>ruby-maven</artifactId>
- <version>[3.0.4,3.0.99999]</version>
<type>gem</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>maven-tools</artifactId>
- <version>[0.32.1,0.32.99999]</version>
<type>gem</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
- <artifactId>rake</artifactId>
- <version>[10.0.3,10.0.99999]</version>
+ <artifactId>thor</artifactId>
<type>gem</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
- <artifactId>thor</artifactId>
- <version>(0.14.0,0.16.0)</version>
+ <artifactId>rake</artifactId>
<type>gem</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>cucumber</artifactId>
- <version>[1.1.9,1.1.99999]</version>
+ <type>gem</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>builder</artifactId>
+ <type>gem</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>diff-lcs</artifactId>
+ <type>gem</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>gherkin</artifactId>
+ <type>gem</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>json</artifactId>
+ <type>gem</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>term-ansicolor</artifactId>
<type>gem</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>minitest</artifactId>
- <version>[4.3,4.99999]</version>
<type>gem</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>copyright-header</artifactId>
- <version>[1.0.7,1.0.99999]</version>
<type>gem</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
- <version>0.8.2</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>bouncy-castle-java</artifactId>
<type>gem</type>
</dependency>
<dependency>
@@ -155,6 +182,20 @@
<version>3.0.4</version>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>bundler</artifactId>
@@ -164,6 +205,96 @@
</dependencies>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>jbundler</artifactId>
+ <version>0.4.1</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>maven-tools</artifactId>
+ <version>0.32.1</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>ruby-maven</artifactId>
+ <version>3.0.4.1.3</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>thor</artifactId>
+ <version>0.15.4</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>bouncy-castle-java</artifactId>
+ <version>1.5.0146.1</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>builder</artifactId>
+ <version>3.1.4</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>copyright-header</artifactId>
+ <version>1.0.7</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>cucumber</artifactId>
+ <version>1.1.9</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>diff-lcs</artifactId>
+ <version>1.2.0</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>gherkin</artifactId>
+ <version>2.9.3</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>json</artifactId>
+ <version>1.7.6</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>term-ansicolor</artifactId>
+ <version>1.0.7</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>jruby-openssl</artifactId>
+ <version>0.8.2</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>minitest</artifactId>
+ <version>4.5.0</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>rake</artifactId>
+ <version>10.0.3</version>
+ <type>gem</type>
+ </dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>bundler</artifactId>
@@ -176,7 +307,7 @@
<gem.home>${project.build.directory}/rubygems</gem.home>
<gem.path>${project.build.directory}/rubygems</gem.path>
<jruby.18and19>true</jruby.18and19>
- <jruby.plugins.version>0.29.3</jruby.plugins.version>
+ <jruby.plugins.version>0.29.4</jruby.plugins.version>
<jruby.version>1.7.2</jruby.version>
<jruby.versions>1.6.8,1.7.2,1.5.6</jruby.versions>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -244,7 +375,7 @@
<configuration>
<defaultExecutable>jbundle</defaultExecutable>
<executables>jbundle</executables>
- <files>bin/jbundle,lib/jbundler.rb,lib/jbundler,lib/jbundler/pom.rb,lib/jbundler/cli.rb,lib/jbundler/config.rb,lib/jbundler/classpath_file.rb,lib/jbundler/aether.rb,lib/jbundler/gemfile_lock.rb,lib/jbundler/lazy.rb,lib/jbundler.jar,spec/classpath_file_spec.rb,spec/setup.rb,spec/pom_spec.rb,spec/aether_spec.rb,MIT-LICENSE,Readme.md,Gemfile.lock~,Gemfile</files>
+ <files>bin/jbundle,lib/jbundler.rb,lib/jbundler,lib/jbundler/pom.rb,lib/jbundler/cli.rb,lib/jbundler/config.rb,lib/jbundler/classpath_file.rb,lib/jbundler/aether.rb,lib/jbundler/gemfile_lock.rb,lib/jbundler/lazy.rb,lib/jbundler.jar,spec/classpath_file_spec.rb,spec/setup.rb,spec/pom_spec.rb,spec/aether_spec.rb,MIT-LICENSE,Readme.md,Gemfile.lock~,Gemfile,Gemfile.lock</files>
<gemspec>jbundler.gemspec</gemspec>
<testFiles>spec/classpath_file_spec.rb,spec/pom_spec.rb,spec/aether_spec.rb</testFiles>
</configuration>

0 comments on commit d833687

Please sign in to comment.