Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
maven tools
===========

* [![Build Status](https://github.com/torquebox/maven-tools/actions/workflows/ci.yml/badge.svg)](https://github.com/torquebox/maven-tools/actions/workflows/ci.yml)
* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/torquebox/maven-tools)
* [![Build Status](https://github.com/jruby/maven-tools/actions/workflows/ci.yml/badge.svg)](https://github.com/jruby/maven-tools/actions/workflows/ci.yml)

Note on Ruby-1.8
----------------
Expand Down
12 changes: 0 additions & 12 deletions lib/maven/tools/dsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@ def tesla( &block )
@model.version = '0.0.0'
@context = :project
nested_block( :project, @model, block ) if block
if @needs_torquebox
if ! @model.repositories.detect { |r| r.id == 'rubygems-prereleases' } && @model.dependencies.detect { |d| d.group_id == 'rubygems' && d.version.match( /-SNAPSHOT/ ) }

@current = @model
snapshot_repository( 'rubygems-prereleases',
'http://rubygems-proxy.torquebox.org/prereleases' )
@current = nil
end
@needs_torquebox = nil
end
result = @model
@context = nil
@model = nil
Expand Down Expand Up @@ -55,7 +45,6 @@ def model

# TODO remove me
def needs_torquebox= t
@needs_torquebox = t
end
# TODO remove me
def current
Expand Down Expand Up @@ -280,7 +269,6 @@ def setup_gem_support( options, spec = nil, config = {} )

repository( 'mavengems', 'mavengem:https://rubygems.org' )
end
@needs_torquebox = true

setup_jruby_plugins_version
end
Expand Down
1 change: 0 additions & 1 deletion lib/maven/tools/dsl/gem_support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ def setup_gem_support( project, options, spec = nil )
@parent.repository( 'mavengems',
'mavengem:https://rubygems.org' )
end
@parent.needs_torquebox = true

setup_jruby_plugins_version( project )

Expand Down
2 changes: 1 addition & 1 deletion lib/maven/tools/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
#
module Maven
module Tools
VERSION = '1.2.2'.freeze
VERSION = '1.2.3'.freeze
end
end
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<version>1.2.2</version>
<packaging>gem</packaging>
<name>helpers for maven related tasks</name>
<url>http://github.com/torquebox/maven-tools</url>
<url>http://github.com/jruby/maven-tools</url>
<description>adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc</description>
<developers>
<developer>
Expand All @@ -14,8 +14,8 @@
</developer>
</developers>
<scm>
<connection>https://github.com/torquebox/maven-tools.git</connection>
<url>http://github.com/torquebox/maven-tools</url>
<connection>https://github.com/jruby/maven-tools.git</connection>
<url>http://github.com/jruby/maven-tools</url>
</scm>
<pluginRepositories>
<pluginRepository>
Expand Down