Rakefile in jetty-6.1.14.1 vs Rakefile in jetty-6.1.16.1

- old
+ new

@@ -24,11 +24,11 @@ require 'jetty/base' JARS = %w{ jetty jetty-util jetty-rewrite-handler }.map do |n| "#{n}-#{ Jetty::JETTY_VERSION }.jar" end -JARS << "servlet-api-#{ Jetty::SERVLET_API_VERSION }-#{ Jetty::JETTY_VERSION }.jar" +JARS << "servlet-api-#{ Jetty::SERVLET_API_VERSION }-#{ Jetty::SERVLET_API_DATE }.jar" JARS << 'gravitext-testservlets-1.0.jar' JAR_FILES = JARS.map { |jar| "lib/jetty/#{jar}" } desc "Update the Manifest with actual jars" @@ -41,12 +41,12 @@ README.txt Rakefile pom.xml assembly.xml bin/jetty-service -lib/jetty.rb lib/jetty/base.rb +lib/jetty.rb lib/jetty/rewrite.rb lib/jetty/test-servlets.rb src/main/java/com/gravitext/testservlets/PerfTestServlet.java src/main/java/com/gravitext/testservlets/SnoopServlet.java test/test_jetty.rb @@ -87,25 +87,21 @@ end task :clean => :mvn_clean task :tag do tag = "jetty-#{Jetty::VERSION}" - svn_base = 'svn://localhost/subversion.repo/src/gems' - tag_url = "#{svn_base}/tags/#{tag}" - dname = File.dirname( __FILE__ ) dname = '.' if Dir.getwd == dname - stat = `svn status #{dname}` - stat.strip! if stat - if ( stat && stat.length > 0 ) - $stderr.puts( "Resolve the following before tagging (svn status):" ) - $stderr.puts( stat ) - else - sh( "svn cp -m 'tag [#{tag}]' #{dname} #{tag_url}" ) + sh( "git status --only #{dname}" ) do |ok,res| + if ok #changes present + raise "Commit these changes before tagging." + end end + sh %{git tag -s -f -m "tag [#{tag}]" "#{tag}"} end hoe = Hoe.new( "jetty", Jetty::VERSION ) do |p| - p.developer( "David Kellum", "dek-ruby@gravitext.com" ) + p.developer( "David Kellum", "dek-oss@gravitext.com" ) + p.extra_dev_deps << [ 'logback', '>= 0.9.15.1' ] p.rubyforge_name = "rjack" p.rdoc_pattern = /^(lib.*\.(rb|txt))|[^\/]*\.txt$/ end