Permalink
Browse files

new project setup - the ruby way

  • Loading branch information...
1 parent 314f471 commit 68635f0e6a04017feb1fae25db6a27e9d195769f @mkristian committed Aug 12, 2012
View
7 .gitignore
@@ -1,2 +1,9 @@
target
*~
+*.txt
+boot
+conf
+bin/mvn*
+lib/*jar
+lib/ext
+bin/m2*
View
0 src/main/resources/bin/rmvn → bin/rmvn
File renamed without changes.
View
0 ...esources/lib/ruby/maven/cucumber_steps.rb → lib/ruby/maven/cucumber_steps.rb
File renamed without changes.
View
0 src/main/resources/lib/ruby/ruby-maven.rb → lib/ruby/ruby-maven.rb
File renamed without changes.
View
0 src/main/resources/lib/ruby/ruby_maven.rb → lib/ruby/ruby_maven.rb
File renamed without changes.
View
60 pom.xml
@@ -22,7 +22,7 @@
<groupId>rubygems</groupId>
<artifactId>ruby-maven</artifactId>
- <version>${maven.version}.${jruby.plugins.version}</version>
+ <version>3.0.4.1</version>
<packaging>gem</packaging>
<name>ruby wrapper around maven and more</name>
@@ -43,7 +43,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>maven-tools</artifactId>
- <version>0.29.1</version>
+ <version>0.29.3</version>
<type>gem</type>
</dependency>
</dependencies>
@@ -52,16 +52,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- if some more gem releases are needed you can append some number
here with the gem.version -->
- <jruby.plugins.version>0.29.0</jruby.plugins.version>
- <jruby.plugins.version.postfix></jruby.plugins.version.postfix>
+ <jruby.plugins.version>0.29.1</jruby.plugins.version>
+ <!--jruby.plugins.version.postfix>-SNAPSHOT</jruby.plugins.version.postfix-->
<maven.version>3.0.4</maven.version>
<gem.basedir>${project.build.directory}/ruby-maven-${project.version}</gem.basedir>
</properties>
<build>
<resources>
<resource>
- <targetPath>${gem.basedir}/apache-maven-${maven.version}</targetPath>
- <directory>${project.basedir}/src/main/resources</directory>
+ <targetPath>${project.basedir}</targetPath>
+ <directory>${project.build.directory}/apache-maven-${maven.version}</directory>
</resource>
</resources>
<plugins>
@@ -83,7 +83,7 @@
<version>${maven.version}</version>
<classifier>bin</classifier>
<type>zip</type>
- <outputDirectory>${gem.basedir}</outputDirectory>
+ <outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -94,29 +94,43 @@
<plugin>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-maven-plugin</artifactId>
- <version>${jruby.plugins.version}${jruby.plugins.version.postfix}</version>
+ <version>0.29.0</version>
<extensions>true</extensions>
<configuration>
- <gemspec>${project.basedir}/src/main/gemspec/maven.gemspec</gemspec>
- <launchDirectory>${gem.basedir}/apache-maven-${maven.version}</launchDirectory>
+ <gemspec>${project.basedir}/ruby-maven.gemspec</gemspec>
<includeOpenSSL>true</includeOpenSSL>
</configuration>
</plugin>
- <!--plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
<configuration>
- <outputDirectory>${gem.basedir}/apache-maven-${maven.version}/lib</outputDirectory>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>*jar</include>
+ <include>ext/**</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>bin</directory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <excludes>
+ <exclude>rmvn</exclude>
+ </excludes>
+ </fileset>
+ <fileset>
+ <directory>./</directory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileset>
+ </filesets>
</configuration>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
+ </plugin>
</plugins>
</build>
View
8 src/main/gemspec/maven.gemspec → ruby-maven.gemspec
@@ -1,9 +1,8 @@
require 'fileutils'
-
Gem::Specification.new do |s|
s.name = %q{ruby-maven}
- s.version = "#{File.basename(File.expand_path('..')).sub(/-SNAPSHOT/, '').sub(/[a-zA-Z-]+-/, '').gsub(/-/, '.')}"
- s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+ s.version = "3.0.4.1"
+
s.authors = ["mkristian"]
s.description = %q{maven support for rubygems based on maven 3.0. it allows to use xyz.gemspec file as pom file or the usual pom.xml files. with a rails3 application with a Gemfile (suitable for jruby). you need java installed or jruby but it will run with MRI (without installed jruby) since the maven will take care of the jruby to use.}
s.email = ["m.kristian@web.de"]
@@ -20,9 +19,6 @@ Gem::Specification.new do |s|
Dir.glob("lib/ruby/ruby_maven.rb") +
Dir.glob("lib/ruby/ruby-maven.rb") +
Dir.glob("lib/ruby/maven/**/*")
- ext = Dir.glob("ext/*ruby*")
- ext.delete(ext.detect{ |f| f =~ /jruby-complete/ })
- s.files += ext
s.bindir = "bin"
s.executables = ['rmvn']
s.homepage = %q{http://github.com/mkristian/ruby-maven}

0 comments on commit 68635f0

Please sign in to comment.