warbler 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2801a442163c3d1ada84111848c7d9871e9939e
-  data.tar.gz: ae5fbcb30cb8086e3d730bddeed52bad02ea8c56
+  metadata.gz: 93f1dd2729d5f7ed39af116cf2bb27e273461020
+  data.tar.gz: c2dbf07c10202eea5fbf7b04ebf7f2b8c5e0b469
 SHA512:
-  metadata.gz: 676d710d120a35a2464cc2a506a6dfa5c53c2fd90e9439064ea0f19753497ae0161a4b12a986376404e10c9c63511d71d67f535846219ffdc3d92ba52327f8a7
-  data.tar.gz: c47699f10bcb5de09b4f09625f20697449f6677704852c249fbc715a2b2d11d9c7deae708e49521f1ed74432e9846bb238b4896309564254417bd716e99dce5c
+  metadata.gz: 8b71e381800c2ed1f2d69a49584fc6fe768ff628a4bd4dbcb4577742f88966496694c8f5cce455ef5bca9c41568caaae45a3649d60c177476cca0d85864b632c
+  data.tar.gz: 4b1830b358b5cbe8028a470338ae6732ea19c1f53f9fe3d433fd43b81046cb44d2705cd03bd5b0e2e3b1150e9f70bb71f8c6c78780a4da369ce6f369ef6a1ce6

data/.travis.yml

@@ -1,42 +1,15 @@
-sudo: false
-language: ruby
-script: bundle exec rake spec
 rvm:
-  - jruby-9.0.0.0.pre2
-jdk:
-  - oraclejdk8
+  - jruby-9.0.4.0
 branches:
   only:
     - master
     - 2.x-dev
-    - /^test-.*/
-before_install:
-  - ([ "$BUNDLER_VERSION" ] && gem uninstall bundler --all --force && gem install bundler -v "$BUNDLER_VERSION") || true
-  - bundle --version
-before_script:
-  - export JRUBY_OPTS="$JRUBY_OPTS --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
 env:
   - JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
 matrix:
   include:
     - rvm: jruby-head
       env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
-matrix:
-  include:
-    - rvm: jruby-head
-      env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.9.9"
-    - rvm: jruby-1.7.20
-      env: JRUBY_OPTS="" BUNDLER_VERSION="~> 1.10.2"
-    - rvm: 1.8.7
-      env: BUNDLER_VERSION="~> 1.6.9"
-    - rvm: 1.9.2
-      env: BUNDLER_VERSION="~> 1.7.9"
-    - rvm: 1.9.3
-      env: BUNDLER_VERSION="~> 1.8.9"
-    - rvm: jruby
-      env: MAVEN_OPTS="-XX:MaxPermSize=128m"
-      script: mvn clean verify
->>>>>>> master
   allow_failures:
     - rvm: jruby-head
 notifications:
@@ -47,3 +20,7 @@ notifications:
     on_failure: always
     template:
       - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"
+before_install:
+  - sudo apt-get update && sudo apt-get install git
+  - git fetch --unshallow
+  - gem install bundler --pre

data/Gemfile

@@ -6,5 +6,4 @@ group :development do
   gem "jruby-openssl", :platform => :jruby
   gem "rcov", ">= 0.9.8", :platform => :mri_18
   gem "childprocess", :platform => :mri
-  gem "maven-tools", "~> 0.34.5"
 end

data/Mavenfile

@@ -6,9 +6,7 @@ gemspec( :jar => 'warbler_jar.jar',
          :source => 'ext' )
 
 # just dump the POM as pom.xml as read-only file
-properties( 'tesla.dump.pom' => 'pom.xml',
-            'tesla.dump.readOnly' => true,
-            'jruby.plugins.version' => '1.0.10' )
+properties( 'jruby.plugins.version' => '1.1.3' )
 
 # dependencies needed for compilation
 scope :provided do

data/Rakefile

@@ -26,20 +26,26 @@ end
 task :default => :spec
 
 # use Mavenfile to define :jar task
-require 'maven/ruby/tasks'
+require 'maven/ruby/maven'
+mvn = Maven::Ruby::Maven.new
+mvn.inherit_jruby_version
+
+desc 'compile java sources and build jar'
+task :jar do
+  mvn.prepare_package
+end
 
 desc 'run some integration test'
 task :integration do
-  maven.verify
+  mvn.verify
 end
 
 desc 'generate the pom.xml from the Mavenfile'
 task :pom do
-  maven.validate
+  mvn.validate('-Dpolyglot.dump.pom=pom.xml')
 end
 
 # Make sure jar gets compiled before the gem is built
-# the jar tasks is part of maven-tasks
 task :build => :jar
 
 load_gemspec = lambda do

data/ext/WarMain.java

@@ -226,7 +226,7 @@ public class WarMain extends JarMain {
     protected URL extractEntry(final JarEntry entry, final String path) throws Exception {
         // always extract but only return class-path entry URLs :
         final URL entryURL = super.extractEntry(entry, path);
-        return path.endsWith(".jar") ? entryURL : null;
+        return path.endsWith(".jar") && path.startsWith("/lib/") ? entryURL : null;
     }
 
     @Override

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/pom.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+DO NOT MODIFIY - GENERATED CODE
+
+
+-->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
@@ -11,11 +18,25 @@
 Rails, or Rack application. Warbler provides a minimal, flexible, Ruby-like way to
 bundle up all of your application files for deployment to a Java environment.</description>
   <url>https://github.com/jruby/warbler</url>
+  <licenses>
+    <license>
+      <name>MIT</name>
+      <url>http://opensource.org/licenses/MIT</url>
+      <comments>MIT license</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Nick Sieger</name>
+      <email>nick@nicksieger.com</email>
+    </developer>
+  </developers>
+  <scm>
+    <connection>https://github.com/jruby/warbler.git</connection>
+    <url>https://github.com/jruby/warbler</url>
+  </scm>
   <properties>
-    <tesla.dump.readOnly>true</tesla.dump.readOnly>
-    <jruby.plugins.version>1.0.10</jruby.plugins.version>
-    <tesla.dump.pom>pom.xml</tesla.dump.pom>
-    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    <jruby.plugins.version>1.1.3</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -94,7 +115,7 @@ bundle up all of your application files for deployment to a Java environment.</d
     <extensions>
       <extension>
         <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-extension</artifactId>
+        <artifactId>gem-with-jar-extension</artifactId>
         <version>${jruby.plugins.version}</version>
       </extension>
     </extensions>
@@ -125,6 +146,7 @@ bundle up all of your application files for deployment to a Java environment.</d
               <directory>lib</directory>
               <includes>
                 <include>warbler_jar.jar</include>
+                <include>*/**/*.jar</include>
               </includes>
             </fileset>
           </filesets>

data/warbler.gemspec

@@ -26,8 +26,7 @@ bundle up all of your application files for deployment to a Java environment.}
   gem.add_runtime_dependency 'jruby-jars', [">= 9.0.0.0"]
   gem.add_runtime_dependency 'jruby-rack', [">= 1.1.1", '< 1.3']
   gem.add_runtime_dependency 'rubyzip', [">= 1.0", "< 1.2"]
-  gem.add_development_dependency 'jbundler', "~> 0.5.5"
-  gem.add_development_dependency 'ruby-maven', '~> 3.1.1.0'
+  gem.add_development_dependency 'jbundler', "~> 0.9"
   gem.add_development_dependency 'rspec', "~> 2.10"
   gem.add_development_dependency 'rdoc', ">= 2.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Nick Sieger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0.9'
   name: jbundler
   prerelease: false
   type: :development
@@ -91,21 +91,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0
-  name: ruby-maven
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: