From 961aefcaeb211894885f7ac8d18497baaa3b6b3d Mon Sep 17 00:00:00 2001 From: Christian Meier Date: Sun, 9 Feb 2025 12:39:22 +0100 Subject: [PATCH] Remove all references to torquebox --- README.md | 3 +-- lib/maven/tools/dsl.rb | 12 ------------ lib/maven/tools/dsl/gem_support.rb | 1 - lib/maven/tools/version.rb | 2 +- pom.xml | 6 +++--- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index e55ecd2..f1182e0 100644 --- a/README.md +++ b/README.md @@ -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 ---------------- diff --git a/lib/maven/tools/dsl.rb b/lib/maven/tools/dsl.rb index 85bfb95..7dadbed 100644 --- a/lib/maven/tools/dsl.rb +++ b/lib/maven/tools/dsl.rb @@ -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 @@ -55,7 +45,6 @@ def model # TODO remove me def needs_torquebox= t - @needs_torquebox = t end # TODO remove me def current @@ -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 diff --git a/lib/maven/tools/dsl/gem_support.rb b/lib/maven/tools/dsl/gem_support.rb index 3f13cda..5c387f0 100644 --- a/lib/maven/tools/dsl/gem_support.rb +++ b/lib/maven/tools/dsl/gem_support.rb @@ -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 ) diff --git a/lib/maven/tools/version.rb b/lib/maven/tools/version.rb index 203fd7f..3ee83ec 100644 --- a/lib/maven/tools/version.rb +++ b/lib/maven/tools/version.rb @@ -20,6 +20,6 @@ # module Maven module Tools - VERSION = '1.2.2'.freeze + VERSION = '1.2.3'.freeze end end diff --git a/pom.xml b/pom.xml index 421e017..aa4ad76 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 1.2.2 gem helpers for maven related tasks - http://github.com/torquebox/maven-tools + http://github.com/jruby/maven-tools adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc @@ -14,8 +14,8 @@ - https://github.com/torquebox/maven-tools.git - http://github.com/torquebox/maven-tools + https://github.com/jruby/maven-tools.git + http://github.com/jruby/maven-tools