Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

new versions

  • Loading branch information...
commit 9c43e320333d7bffb9e15c12405b952a006416f4 1 parent 97ada8d
@mkristian authored
View
2  MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Kristian Meier
+Copyright (c) 2013 Christian Meier
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
View
79 Mavenfile
@@ -1,44 +1,29 @@
#-*- mode: ruby -*-
-aether_version = '1.13'
-maven_version = '3.0.4'
-wagon_version = '2.2'
-
-jar 'org.sonatype.aether:aether-api', aether_version
-jar 'org.sonatype.aether:aether-util', aether_version
-jar 'org.sonatype.aether:aether-impl', aether_version
-jar 'org.sonatype.aether:aether-connector-file', aether_version
-jar 'org.sonatype.aether:aether-connector-asynchttpclient', aether_version
-jar 'org.sonatype.aether:aether-connector-wagon', aether_version
-jar 'org.apache.maven:maven-aether-provider', maven_version
-jar 'org.apache.maven.wagon:wagon-file', wagon_version
-jar 'org.apache.maven.wagon:wagon-http', wagon_version
-#jar 'org.apache.maven.wagon:wagon-http-lightweight', wagon_version
-jar 'org.apache.maven:maven-settings', maven_version
-jar 'org.apache.maven:maven-settings-builder', maven_version
-
-test_jar 'org.mockito:mockito-core', '1.9.5'
-test_jar 'org.testng:testng', '6.8'
-
-# overwrite via cli -Djruby.versions=1.6.7
-# putting 1.5.6 at the end works around the problem of installing gems
-# with "bad" timestamps
-properties['jruby.versions'] = ['1.6.8','1.7.2','1.5.6'].join(',')
-# overwrite via cli -Djruby.use18and19=false
-properties['jruby.18and19'] = true
-
-properties['jruby.plugins.version'] = '0.29.2'
+# aether_version = '1.13'
+# maven_version = '3.0.4'
+# wagon_version = '2.2'
+
+# jar 'org.sonatype.aether:aether-api', aether_version
+# jar 'org.sonatype.aether:aether-util', aether_version
+# jar 'org.sonatype.aether:aether-impl', aether_version
+# jar 'org.sonatype.aether:aether-connector-file', aether_version
+# jar 'org.sonatype.aether:aether-connector-asynchttpclient', aether_version
+# jar 'org.sonatype.aether:aether-connector-wagon', aether_version
+# jar 'org.apache.maven:maven-aether-provider', maven_version
+# jar 'org.apache.maven.wagon:wagon-file', wagon_version
+# jar 'org.apache.maven.wagon:wagon-http', wagon_version
+# #jar 'org.apache.maven.wagon:wagon-http-lightweight', wagon_version
+# jar 'org.apache.maven:maven-settings', maven_version
+# jar 'org.apache.maven:maven-settings-builder', maven_version
+
+# test_jar 'org.mockito:mockito-core', '1.9.5'
+# test_jar 'org.testng:testng', '6.8'
plugin(:minitest) do |m|
m.execute_goal(:spec)
end
-profile 'run-its' do |r|
- r.plugin( :cucumber, '${jruby.plugins.version}' ) do |m|
- m.execute_goal(:test)
- end
-end
-
plugin( :jar, '2.4' ).in_phase( 'prepare-package' ).execute_goal( :jar ).with :finalName => "${project.artifactId}", :outputDirectory => "${project.basedir}/lib"
plugin(:clean, '2.5' ).with :filesets => [ { :directory => './',
@@ -47,13 +32,25 @@ plugin(:clean, '2.5' ).with :filesets => [ { :directory => './',
plugin( :compiler, '3.0' ).with( :target => '1.6', :source => '1.6' )
-execute_in_phase( :initialize ) do
- pom = File.read( 'pom.xml' )
- if File.exists? '.pom.xml'
- dot_pom = File.read( '.pom.xml' )
- if pom != dot_pom
- File.open( 'pom.xml', 'w' ) { |f| f.puts dot_pom }
- end
+plugin( :gem ).in_phase( :validate ).execute_goal( :pom ).with( :tmpPom => '.pom.xml', :skipGeneration => true )
+
+# canbe overwritten via cli -Djruby.versions=1.6.7
+# putting 1.5.6 at the end works around the problem of installing gems
+# with "bad" timestamps
+properties['jruby.versions'] = ['1.6.8','1.7.2','1.5.6'].join(',')
+# overwrite via cli -Djruby.use18and19=false
+properties['jruby.18and19'] = true
+
+# just lock the versions
+properties['jruby.plugins.version'] = '0.29.3'
+properties['jruby.version'] = '1.7.2'
+
+# TODO get them working again ;)
+plugin( :cucumber ).with( :skip => true )
+profile 'run-its' do |r|
+ r.plugin( :cucumber, '${jruby.plugins.version}' ) do |m|
+ m.execute_goal(:test)
+ m.with( :skip => false )
end
end
View
31 Rakefile
@@ -2,47 +2,48 @@
require 'ruby-maven'
require 'fileutils'
+require 'maven/ruby/pom_magic'
task :default => [ :test ]
task :common do
- FileUtils.rm_f( '.pom.xml' )
raise "you need jruby to run this" unless defined? JRUBY_VERSION
+ @rmvn = Maven::Ruby::Maven.new
+ @rmvn.options['-f'] = Maven::Ruby::PomMagic.new.generate_pom#( '.', 'pom.xml' )
end
task :build => [ :common ] do
- rmvn = Maven::Ruby::Maven.new
- rmvn.options['-Dmaven.test.skip'] = true
- if rmvn.exec('package')
- puts 'you find the gem inside "target"'
+ @rmvn.options['-Dmaven.test.skip'] = true
+ if @rmvn.exec('package')
+ puts ''
+ puts 'you find the gem inside the "target" directory'
+ puts ''
else
raise 'failed'
end
end
task :compile => [ :common ] do
- rmvn = Maven::Ruby::Maven.new
- rmvn.options['-Dmaven.test.skip'] = true
+ @rmvn.options['-Dmaven.test.skip'] = true
# jruby related debug log
- rmvn.options['-Djruby.verbose'] = true
+ @rmvn.options['-Djruby.verbose'] = true
# compiles java sources and build the jar
- unless rmvn.exec('prepare-package')
+ unless @rmvn.exec('prepare-package')
raise 'failed'
end
end
task :features => [ :compile ] do
- rmvn = Maven::Ruby::Maven.new
rversion = RUBY_VERSION =~ /^1.8./ ? '--1.8': '--1.9'
- rmvn.options['-Djruby.versions'] = '1.7.2'#JRUBY_VERSION
- rmvn.options['-Djruby.switches'] = rversion
- rmvn.options['-Djruby.18and19'] = false
+ @rmvn.options['-Djruby.versions'] = '1.7.2'#JRUBY_VERSION
+ @rmvn.options['-Djruby.switches'] = rversion
+ @rmvn.options['-Djruby.18and19'] = false
# jruby related debug log
#rmvn.options['-Djruby.verbose'] = true
# lots of maven debug log
#rmvn.options['-X'] = nil
- unless rmvn.exec('cucumber')
+ unless @rmvn.exec('cucumber')
raise 'failed'
end
end
@@ -70,7 +71,7 @@ task :minispec => [ :compile ] do
end
task :clean do
- Maven::Ruby::Maven.new.exec 'clean'
+ @rmvn.exec 'clean'
end
task :headers do
View
5 jbundler.gemspec
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'jbundler'
- s.version = '0.3.2'
+ s.version = '0.4.0'
s.summary = 'managing jar dependencies'
s.description = <<-END
@@ -23,9 +23,10 @@ END
s.test_files += Dir['spec/**/*_spec.rb']
s.add_runtime_dependency "ruby-maven", "~> 3.0.4"
+ s.add_runtime_dependency "maven-tools", "~> 0.29.1"
s.add_development_dependency "rake", "~> 10.0.3"
s.add_development_dependency "thor", "< 0.16.0", "> 0.14.0"
s.add_development_dependency "cucumber", "~> 1.1.9"
s.add_development_dependency "minitest", "~> 4.3"
-
+ s.add_development_dependency "copyright-header", "~> 1.0.7"
end
View
BIN  lib/jbundler.jar
Binary file not shown
View
200 pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>rubygems</groupId>
<artifactId>jbundler</artifactId>
- <version>0.3.2</version>
+ <version>0.4.0</version>
<name><![CDATA[managing jar dependencies]]></name>
<packaging>gem</packaging>
<description><![CDATA[managing jar dependencies with or without bundler. adding bundler like handling of version ranges for jar dependencies.
@@ -17,6 +17,11 @@
</developers>
<licenses>
<license>
+ <name>MIT</name>
+ <url>./MIT</url>
+ <distribution>repo</distribution>
+ </license>
+ <license>
<name>MIT-LICENSE</name>
<url>./MIT-LICENSE</url>
<distribution>repo</distribution>
@@ -32,42 +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>rake</artifactId>
- <version>[10.0.3,10.0.99999]</version>
+ <artifactId>maven-tools</artifactId>
<type>gem</type>
- <scope>test</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>thor</artifactId>
- <version>(0.14.0,0.16.0)</version>
+ <type>gem</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <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>
<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>
@@ -137,31 +183,108 @@
<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>
<type>gem</type>
+ <scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>rubygems</groupId>
+ <artifactId>jbundler</artifactId>
+ <version>0.4.0</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>ruby-maven</artifactId>
+ <version>3.0.4.1.2</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>maven-tools</artifactId>
+ <version>0.32.0</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>
- <version>1.1.4</version>
+ <version>1.2.3</version>
<type>gem</type>
</dependency>
</dependencies>
@@ -170,7 +293,8 @@
<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.2</jruby.plugins.version>
+ <jruby.plugins.version>0.29.3</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>
</properties>
@@ -225,13 +349,9 @@
<groupId>de.saumya.mojo</groupId>
<artifactId>cucumber-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
@@ -241,20 +361,20 @@
<configuration>
<defaultExecutable>jbundle</defaultExecutable>
<executables>jbundle</executables>
- <files>bin/jbundle,lib/commands,lib/commands/install_with_jars.rb~,lib/commands/abstract_command.rb~,lib/commands/push.rb~,lib/commands/nexus.rb~,lib/rubygems_plugin.rb~,lib/jbundler.rb,lib/jars.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/rubygems_plugin.rb~,lib/jbundler.rb,lib/jars.rb~,lib/jbundler,lib/jbundler.jar,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,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>
<executions>
<execution>
- <id>in_phase_initialize</id>
- <phase>initialize</phase>
+ <id>in_phase_validate</id>
+ <phase>validate</phase>
<goals>
- <goal>execute_in_phase</goal>
+ <goal>pom</goal>
</goals>
<configuration>
- <file>Mavenfile</file>
- <phase>initialize</phase>
+ <skipGeneration>true</skipGeneration>
+ <tmpPom>.pom.xml</tmpPom>
</configuration>
</execution>
</executions>
@@ -302,7 +422,6 @@
<artifactId>gem-maven-plugin</artifactId>
<goals>
<goal>initialize</goal>
- <goal>execute_in_phase</goal>
</goals>
<groupId>de.saumya.mojo</groupId>
<versionRange>[0,)</versionRange>
@@ -371,6 +490,9 @@
<groupId>de.saumya.mojo</groupId>
<artifactId>cucumber-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
<goals>
Please sign in to comment.
Something went wrong with that request. Please try again.