msrb pushed to jruby-maven-plugins (master). "Do not build rails3 plugin (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 06:42:54 UTC 2015
From a999e37518fc10e4b0d73de7714ed88d058d75fe Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Mon, 18 May 2015 08:42:39 +0200
Subject: Do not build rails3 plugin
- Install readme file
diff --git a/.gitignore b/.gitignore
index e69de29..af967fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jruby-maven-plugins-1.0.10.tar.gz
diff --git a/0001-Update-plexus-archiver-to-3.0.patch b/0001-Update-plexus-archiver-to-3.0.patch
new file mode 100644
index 0000000..af58cfe
--- /dev/null
+++ b/0001-Update-plexus-archiver-to-3.0.patch
@@ -0,0 +1,56 @@
+From cbcbdf634f797f19a755bd09245040702b2e1f72 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb at redhat.com>
+Date: Wed, 13 May 2015 09:42:57 +0200
+Subject: [PATCH] Update plexus-archiver to 3.0
+
+---
+ ruby-tools/pom.xml | 2 +-
+ .../src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java | 8 +++-----
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/ruby-tools/pom.xml b/ruby-tools/pom.xml
+index e793af4..2ab170d 100644
+--- a/ruby-tools/pom.xml
++++ b/ruby-tools/pom.xml
+@@ -55,7 +55,7 @@
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+- <version>1.2</version>
++ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+diff --git a/ruby-tools/src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java b/ruby-tools/src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java
+index cf8fea9..8e4450f 100644
+--- a/ruby-tools/src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java
++++ b/ruby-tools/src/main/java/de/saumya/mojo/gems/gem/DefaultGemPackager.java
+@@ -88,13 +88,12 @@ public class DefaultGemPackager implements GemPackager {
+ final Throwable throwable) {
+ }
+ });
+- final TarCompressionMethod compression = new TarCompressionMethod();
++
+ File dataTarGz = null;
+ if (!gem.getGemFiles().isEmpty()) {
+ // tar.gz the content into data.tar.gz
+ dataTarGz = new File(gemWorkdir, "data.tar.gz");
+- compression.setValue("gzip");
+- tar.setCompression(compression);
++ tar.setCompression(TarCompressionMethod.gzip);
+ tar.setDestFile(dataTarGz);
+ for (final GemFileEntry entry : gem.getGemFiles()) {
+ if (entry.getSource().isFile()) {
+@@ -111,8 +110,7 @@ public class DefaultGemPackager implements GemPackager {
+ // and finally create gem by tar.gz-ing data.tar.gz and metadata.gz
+ final File gemFile = new File(target, gem.getGemFilename());
+ tar.setDestFile(gemFile);
+- compression.setValue("none");
+- tar.setCompression(compression);
++ tar.setCompression(TarCompressionMethod.none);
+ if (dataTarGz != null) {
+ tar.addFile(dataTarGz, dataTarGz.getName());
+ }
+--
+2.1.0
+
diff --git a/jruby-maven-plugins.spec b/jruby-maven-plugins.spec
new file mode 100644
index 0000000..3fae722
--- /dev/null
+++ b/jruby-maven-plugins.spec
@@ -0,0 +1,87 @@
+Name: jruby-maven-plugins
+Version: 1.0.10
+Release: 2%{?dist}
+Summary: JRuby Maven plugins
+
+License: MIT
+URL: https://github.com/torquebox/jruby-maven-plugins
+Source0: https://github.com/torquebox/%{name}/archive/%{name}-%{version}.tar.gz
+# https://github.com/torquebox/jruby-maven-plugins/pull/72
+Patch0: 0001-Update-plexus-archiver-to-3.0.patch
+
+BuildRequires: maven-local
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-model)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.codehaus.plexus:plexus-velocity)
+BuildRequires: mvn(org.jruby:jruby-core)
+BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
+BuildRequires: mvn(org.yaml:snakeyaml)
+
+BuildArch: noarch
+
+%description
+This package contains set of utilities to handle RubyGems in a Maven way.
+It also includes support for rspec, rails, cucumber, rake, etc.
+
+%package javadoc
+Summary: API documentation
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n jruby-maven-plugins-jruby-maven-plugins-%{version}
+
+find . -name "*.jar" -delete
+find . -name "*.class" -delete
+
+# do not build rails3 plugin, there are bundled gems (datamapper, activerecord)
+%pom_disable_module rails3-maven-plugin
+rm -Rf ruby-tools/src/main/resources/rails-{templates,resources}
+rm -Rf ruby-tools/src/main/java/de/saumya/mojo/ruby/rails
+
+%patch0 -p1
+
+%pom_remove_dep :maven-tools ruby-tools
+
+%pom_remove_plugin :maven-dependency-plugin ruby-tools
+%pom_remove_plugin :exec-maven-plugin ruby-tools
+
+%pom_change_dep -r :jruby-complete :jruby-core
+
+%build
+# tests fail: "loading resource from classloader failed: META-INF/jruby.home/bin/gem"
+# that's because we don't have jruby-complete uber JAR in Fedora
+%mvn_build -f
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%license license.txt
+%doc README.md
+%files javadoc -f .mfiles-javadoc
+%license license.txt
+
+%changelog
+* Fri May 15 2015 Michal Srb <msrb at redhat.com> - 1.0.10-2
+- Do not build rails3 plugin
+- Install readme file
+
+* Thu May 14 2015 Michal Srb <msrb at redhat.com> - 1.0.10-1
+- Initial packaging
+
diff --git a/sources b/sources
index e69de29..6632f65 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+072bd5110262525874daccd5a8fed685 jruby-maven-plugins-1.0.10.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/jruby-maven-plugins.git/commit/?h=master&id=a999e37518fc10e4b0d73de7714ed88d058d75fe
More information about the scm-commits
mailing list