Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/buildr
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4c95e62
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,25 @@
+# DO NOT EDIT: File is auto-generated
+* -text
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.css text
+*.gemspec text
+*.html text
+*.java text
+*.png binary
+*.rake text
+*.rb text
+*.rdoc text
+*.sh text
+*.sh text eol=lf
+*.textile text
+*.txt text
+*.xml text
+*.xsl text
+*.yml text
+.gitignore text
+Buildfile text
+CHANGELOG text
+Gemfile text
+LICENSE text
+Rakefile text
diff --git a/.gitignore b/.gitignore
index fcb4db3..7a44280 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,4 @@
/site
.bundle
.DS_Store
-*.class
\ No newline at end of file
+*.class
diff --git a/CHANGELOG b/CHANGELOG
index a4d325c..f32fe14 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
1.5.8 (Pending)
+* Fixed: Changed references to `https://repo1.maven.org/maven2` to use https where possible.
+* Change: Use the `zapwhite` gem to manage file whitespace within repository.
+* Fixed: Replace references to long removed `http://www.ibiblio.org/maven2/` repository with
+ `https://repo1.maven.org/maven2`.
1.5.7 (2019-02-16)
* Fixed: The fix that allowed special characters in usernames and passwords was only partially applied
diff --git a/addon/buildr/jetty.rb b/addon/buildr/jetty.rb
index 9e0395b..2246dfb 100644
--- a/addon/buildr/jetty.rb
+++ b/addon/buildr/jetty.rb
@@ -52,7 +52,7 @@
"org.eclipse.jetty:jetty-security:jar:#{VERSION}",
"org.eclipse.jetty:jetty-xml:jar:#{VERSION}",
"org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}",
- "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}",
+ "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}",
"org.slf4j:jcl-over-slf4j:jar:#{SLF4J_VERSION}",
'javax.servlet:javax.servlet-api:jar:3.1.0' ]
diff --git a/all-in-one/buildr.cmd b/all-in-one/buildr.cmd
index d643b3a..afe0132 100755
--- a/all-in-one/buildr.cmd
+++ b/all-in-one/buildr.cmd
@@ -1 +1 @@
-@%~dp0\..\embedded\jruby.exe %*
\ No newline at end of file
+@%~dp0\..\embedded\jruby.exe %*
diff --git a/buildr.buildfile b/buildr.buildfile
index b91cce0..d1d03ca 100644
--- a/buildr.buildfile
+++ b/buildr.buildfile
@@ -19,7 +19,7 @@
require 'buildr/nailgun'
require 'buildr/scala'
require 'buildr/kotlin'
-repositories.remote << 'http://repo1.maven.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
@@ -33,7 +33,7 @@
define 'scala' do
compile.using(:javac).from(FileList['lib/buildr/scala/**/*.java']).into('lib/buildr/scala')
end
-
+
define 'kotlin' do
compile.using(:javac).from(FileList['lib/buildr/kotlin/**/*.java']).into('lib/buildr/kotlin').with(Buildr::Kotlin::Kotlinc.dependencies)
end
diff --git a/buildr.gemspec b/buildr.gemspec
index 3de0bc9..1b346e8 100644
--- a/buildr.gemspec
+++ b/buildr.gemspec
@@ -96,4 +96,6 @@
spec.add_development_dependency 'pygmentize', '0.0.3'
spec.add_development_dependency 'saikuro_treemap', '0.2.0'
spec.add_development_dependency 'atoulme-Saikuro', '1.2.1'
+ # Used to manage whitespace of files within repository
+ spec.add_development_dependency 'zapwhite', '2.10.0'
end
diff --git a/doc/artifacts.textile b/doc/artifacts.textile
index b07044e..6733026 100644
--- a/doc/artifacts.textile
+++ b/doc/artifacts.textile
@@ -99,7 +99,7 @@
When you call @repositories.remote@, you get an array of URLs for the various remote repositories. Initially, it's an empty array, to which you can add new repositories. For example:
{% highlight ruby %}
-repositories.remote << 'http://www.ibiblio.org/maven2/'
+repositories.remote << 'https://repo1.maven.org/maven2'
{% endhighlight %}
If your repository requires HTTP authentication, you can write,
@@ -171,7 +171,7 @@
When you let Buildr download artifacts for you, or by invoking the artifact task yourself, it scans through the remote repositories assuming each repository follows the Maven 2 structure. Starting from the root repository URL, it will look for each artifact using the path @group/id/version/id-version.type@ (or ...@/id-version-classifier.type@). The group identifier becomes a path by turning periods (@.@) into slashes (@/@). So to find @org.apache.axis2:axis2:jar:1.2@, we're going to look for @org/apache/axis2/axis2/1.2/axis2-1.2.jar@.
-You'll find a lot of open source Java libraries in public repositories that support this structure (for example, the "Ibiblio Maven":http://www.ibiblio.org/maven2/ repository). And, of course, every remote repository you setup for your projects.
+You'll find a lot of open source Java libraries in public repositories that support this structure (for example, the "Maven Central":https://repo1.maven.org/maven2 repository). And, of course, every remote repository you setup for your projects.
But there are exceptions to the rule. Say we want to download the Dojo widget library and use it in our project. It's available from the Dojo Web site, but that site doesn't follow the Maven repository conventions, so our feeble attempt to use existing remote repositories will fail.
diff --git a/doc/projects.textile b/doc/projects.textile
index 3418075..75c8f11 100644
--- a/doc/projects.textile
+++ b/doc/projects.textile
@@ -26,7 +26,7 @@
OPENJPA = ['org.apache.openjpa:openjpa:jar:1.2.0',
'net.sourceforge.serp:serp:jar:1.12.0']
-repositories.remote << 'http://www.ibiblio.org/maven2/'
+repositories.remote << 'https://repo1.maven.org/maven2'
desc 'Code. Build. ??? Profit!'
define 'killer-app' do
diff --git a/doc/quick_start.textile b/doc/quick_start.textile
index e0831ce..87b0802 100644
--- a/doc/quick_start.textile
+++ b/doc/quick_start.textile
@@ -67,7 +67,7 @@
So far, we have seen how Buildr can automatically infer what amounts to dozens of lines of @build.xml@ contents, all based on a buildfile and a directory structure. However, the best is yet to come. Buildr also provides Maven-style dependency management (but without the long loading times!). In other words, you specify each dependent library using a string descriptor and Buildr figures out how to download and configure your classpath (the library descriptors are just a Ruby array, therefore they are separated by commas (@,@)). You must specify at least one remote repository so that Buildr knows from where to download these libraries. For example, we can configure our project to reference the "Apache Commons CLI":http://commons.apache.org/cli/ library and download libraries from the Ibiblio repository:
{% highlight ruby %}
-repositories.remote << 'http://www.ibiblio.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
define 'killer-app' do
project.version = '0.1.0'
@@ -83,7 +83,7 @@
Unfortunately, not all libraries are quite as simple as Commons CLI. Many libraries (such as Apache Wicket) have dependencies of their own. While we may be able to _compile_ against Apache Wicket without these extra libraries on our classpath, we cannot actually _run_ our application without its transitive dependencies. To avoid tracking down each of these dependencies and adding them manually, we can simply use the @transitive@ directive (this is how Maven behaves by default):
{% highlight ruby %}
-repositories.remote << 'http://www.ibiblio.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
define 'killer-app' do
project.version = '0.1.0'
@@ -95,7 +95,7 @@
The @compile.with@ property accepts a full array of comma-separated artifacts, making it possible to specify any number of dependencies as necessary. Of course, such a long list of verbose string descriptors could get very tiresome and messy. For this reason, it is conventional to assign each dependency to a constant (e.g. @WICKET@) which is declared just above the project in the buildfile and passed to @compile.with@ in a clean, easy-to-read style:
{% highlight ruby %}
-repositories.remote << 'http://www.ibiblio.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
WICKET = transitive('org.apache.wicket:wicket:jar:1.4-rc6')
SLF4J = 'org.slf4j:slf4j-jdk14:jar:1.5.8'
diff --git a/lib/buildr/core/generate.rb b/lib/buildr/core/generate.rb
index 9f21fbe..ac66ccc 100644
--- a/lib/buildr/core/generate.rb
+++ b/lib/buildr/core/generate.rb
@@ -81,7 +81,7 @@
COPYRIGHT = ""
# Specify Maven 2.0 remote repositories here, like this:
-repositories.remote << "http://repo1.maven.org/maven2"
+repositories.remote << "https://repo1.maven.org/maven2"
desc "The #{name.capitalize} project"
define "#{name}" do
@@ -267,7 +267,7 @@
legacy = repository["layout"].to_s =~ /legacy/
!legacy
} rescue nil
- repositories = [{"name" => "Standard maven2 repository", "url" => "http://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
+ repositories = [{"name" => "Standard maven2 repository", "url" => "https://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
repositories.each do |repository|
name, url = repository["name"], repository["url"]
script << "# #{name}"
diff --git a/lib/buildr/kotlin/compiler.rb b/lib/buildr/kotlin/compiler.rb
index cbb504b..f27e25c 100644
--- a/lib/buildr/kotlin/compiler.rb
+++ b/lib/buildr/kotlin/compiler.rb
@@ -140,15 +140,15 @@
hash[option] = options[option]
hash
end
-
+
options[:debug] = Buildr.options.debug || trace?(:kotlinc) if options[:debug].nil?
options[:warnings] = verbose if options[:warnings].nil?
options[:optimize] = false if options[:optimize].nil?
options[:noStdlib] = true if options[:noStdlib].nil?
@java = Javac.new(project, options[:javac])
end
-
-
+
+
def compile(sources, target, dependencies) #:nodoc:
check_options(options, OPTIONS)
diff --git a/lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.java b/lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.java
index cce8bfb..6b02cd7 100644
--- a/lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.java
+++ b/lib/buildr/kotlin/org/apache/buildr/KotlinMessageCollector.java
@@ -23,7 +23,7 @@
public class KotlinMessageCollector implements MessageCollector {
-
+
public void report(CompilerMessageSeverity severity, String message, CompilerMessageLocation location) {
switch(severity) {
case ERROR:
@@ -35,12 +35,12 @@
break;
}
}
-
+
public boolean hasErrors() {
return false;
}
-
+
public void clear() {
// not implemented
}
-}
\ No newline at end of file
+}
diff --git a/lib/buildr/packaging/archive.rb b/lib/buildr/packaging/archive.rb
index 78df00e..dfe664f 100644
--- a/lib/buildr/packaging/archive.rb
+++ b/lib/buildr/packaging/archive.rb
@@ -267,12 +267,12 @@
@expanders.each { |expander| expander.exclude(*files) }
self
end
-
+
def concatenate(*files)
@expanders.each { |expander| expander.concatenate(*files) }
self
end
-
+
def transform(*files, &block)
@expanders.each { |expander| expander.transform(*files, &block) }
self
@@ -301,12 +301,12 @@
@excludes |= files
self
end
-
+
def concatenate(*files)
@concatenates |= files
self
end
-
+
def transform(*files, &block)
@transforms[[files].flatten] = block
self
@@ -325,7 +325,7 @@
elsif @transforms.each_pair.detect do |transform, transform_block|\
if transform.any? { |pattern| File.fnmatch(pattern, entry.name) }
file_map[dest] << ZipEntryData.new(source, entry)
-
+
transform_map[dest] = transform_block
true
end
diff --git a/lib/buildr/packaging/artifact_search.rb b/lib/buildr/packaging/artifact_search.rb
index fc96e18..0abef26 100644
--- a/lib/buildr/packaging/artifact_search.rb
+++ b/lib/buildr/packaging/artifact_search.rb
@@ -96,7 +96,7 @@
def remote_versions(art, base, from = :metadata, fallback = true)
path = (art[:group].split(/\./) + [art[:id]]).flatten.join('/')
- base ||= "http://mirrors.ibiblio.org/pub/mirrors/maven2"
+ base ||= "https://repo1.maven.org/maven2"
uris = {:metadata => "#{base}/#{path}/maven-metadata.xml"}
uris[:listing] = "#{base}/#{path}/" if base =~ /^https?:/
xml = nil
diff --git a/lib/buildr/packaging/tar.rb b/lib/buildr/packaging/tar.rb
index 16a3816..0c58c8d 100644
--- a/lib/buildr/packaging/tar.rb
+++ b/lib/buildr/packaging/tar.rb
@@ -99,7 +99,7 @@
tar.mkdir(path, options.merge(:mode=>stat.mode, :mtime=>stat.mtime, :uid=>stat.uid, :gid=>stat.gid))
else
contents = [contents].flatten
-
+
combined_options = options
if File.exists?(contents.first.to_s)
stat = File.stat(contents.first.to_s)
@@ -107,8 +107,8 @@
elsif contents.first.respond_to?(:mode)
combined_options = combined_options.merge(:mode => contents.first.mode)
end
-
-
+
+
tar.add_file path, combined_options do |os, opts|
[contents].flatten.each do |content|
if content.respond_to?(:call)
@@ -120,7 +120,7 @@
content.call os
end
else
- File.open content.to_s, 'rb' do |is|
+ File.open content.to_s, 'rb' do |is|
if transform
output = StringIO.new
while data = is.read(4096)
@@ -140,7 +140,7 @@
end
end
end
-
+
end
end
end
diff --git a/spec/ide/idea_spec.rb b/spec/ide/idea_spec.rb
index 35c7a12..61eb506 100644
--- a/spec/ide/idea_spec.rb
+++ b/spec/ide/idea_spec.rb
@@ -1419,7 +1419,7 @@
touch 'foo/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
artifact('group:id:jar:1.0') { |t| write t.to_s }
define "root" do
- repositories.remote << 'http://mirrors.ibiblio.org/pub/mirrors/maven2/'
+ repositories.remote << 'https://repo1.maven.org/maven2'
project.version = "2.5.2"
define 'foo' do
resources.from _(:source, :main, :resources)
diff --git a/spec/java/ecj_spec.rb b/spec/java/ecj_spec.rb
index 41150cd..fbcfaa3 100644
--- a/spec/java/ecj_spec.rb
+++ b/spec/java/ecj_spec.rb
@@ -77,7 +77,7 @@
end
it 'should include tools.jar dependency' do
- repositories.remote << "http://repo1.maven.org/maven2/"
+ repositories.remote << "https://repo1.maven.org/maven2/"
write 'src/main/java/UseJarSigner.java', <<-JAVA
import sun.tools.jar.Manifest;
public class UseJarSigner { }
@@ -229,7 +229,7 @@
end
it 'should complain about options it doesn\'t know' do
- repositories.remote << "http://repo1.maven.org/maven2/"
+ repositories.remote << "https://repo1.maven.org/maven2/"
write 'source/Test.java', 'class Test {}'
compile_task.using(:unknown=>'option')
lambda { compile_task.from('source').invoke }.should raise_error(ArgumentError, /no such option/i)
diff --git a/spec/kotlin/compiler_spec.rb b/spec/kotlin/compiler_spec.rb
index 5d27884..64dd551 100644
--- a/spec/kotlin/compiler_spec.rb
+++ b/spec/kotlin/compiler_spec.rb
@@ -182,7 +182,7 @@
compile_task.using(:optimize=>false)
kotlinc_args.noOptimize.should be_true
end
-
+
it 'should set noStdlib option to true by default' do
compile_task.options.noStdlib.should be_true
kotlinc_args.noStdlib.should be_true
@@ -200,7 +200,7 @@
it 'should not set other option by default' do
compile_task.options.other.should be_nil
- end
+ end
it 'should complain about options it doesn\'t know' do
write 'source/Test.kt', 'class Test {}'
@@ -235,7 +235,7 @@
it 'requires present KOTLIN_HOME' do
ENV['KOTLIN_HOME'].should_not be_nil
end
-
+
def compile_task
@compile_task ||= define('foo').compile.using(:kotlinc)
end
@@ -255,11 +255,11 @@
it 'requires absent KOTLIN_HOME' do
ENV['KOTLIN_HOME'].should be_nil
end
-
+
def compile_task
@compile_task ||= define('foo').compile.using(:kotlinc)
end
-
+
def kotlinc_args
compile_task.instance_eval { @compiler }.send(:kotlinc_args)
end
diff --git a/spec/packaging/archive_spec.rb b/spec/packaging/archive_spec.rb
index 827c4e8..8a097ce 100644
--- a/spec/packaging/archive_spec.rb
+++ b/spec/packaging/archive_spec.rb
@@ -306,7 +306,7 @@
inspect_archive.should be_empty
end
end
-
+
it 'should merge archives, concatenate file contents' do
@files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
map do |dir|
@@ -320,7 +320,7 @@
archive['test1.txt'].should eql(content_for('test1.txt') * @files.size)
end
end
-
+
it 'should merge archives, transforming file contents' do
@files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
map do |dir|
diff --git a/spec/packaging/artifact_spec.rb b/spec/packaging/artifact_spec.rb
index 594c83d..54abe3d 100644
--- a/spec/packaging/artifact_spec.rb
+++ b/spec/packaging/artifact_spec.rb
@@ -215,15 +215,15 @@
@local = @remote = @release_to = nil
end
- @repos = [ 'https://oss.sonatype.org/', 'http://www.ibiblio.org/maven2', { :url => 'http://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
+ @repos = [ 'https://oss.sonatype.org/', { :url => 'https://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
end
it 'should convert remote to array of uri' do
- uri = URI.parse( 'http://repo1.maven.org/maven2' )
+ uri = URI.parse( 'https://repo1.maven.org/maven2' )
uri.user = 'user'
uri.password = 'password'
- uris = [ URI.parse( 'https://oss.sonatype.org/'), URI.parse( 'http://www.ibiblio.org/maven2' ), uri ]
+ uris = [ URI.parse( 'https://oss.sonatype.org/'), uri ]
repositories.remote = @repos
repositories.remote_uri.should eql(uris)
@@ -236,7 +236,7 @@
@local = @remote = @release_to = @mirrors = nil
end
- @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
+ @repos = %w(http://www.ibiblio.org/maven2 https://repo1.maven.org/maven2)
end
it 'should be empty initially' do
@@ -310,7 +310,7 @@
@local = @remote = @release_to = nil
end
- @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
+ @repos = %w(http://www.ibiblio.org/maven2 https://repo1.maven.org/maven2)
end
it 'should be empty initially' do
diff --git a/spec/sandbox.rb b/spec/sandbox.rb
index 6c3aa94..7ba7cd5 100644
--- a/spec/sandbox.rb
+++ b/spec/sandbox.rb
@@ -18,7 +18,7 @@
# that the code requires several artifacts. So we establish them first using the real local
# repository and cache these across test cases.
Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
-repositories.remote << 'http://repo1.maven.org/maven2'
+repositories.remote << 'https://repo1.maven.org/maven2'
repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
diff --git a/tests/BUILDR-320/Buildfile b/tests/BUILDR-320/Buildfile
index 60a60e6..843570d 100644
--- a/tests/BUILDR-320/Buildfile
+++ b/tests/BUILDR-320/Buildfile
@@ -13,17 +13,17 @@
# License for the specific language governing permissions and limitations under
# the License.
-define "whole" do
- define 'sub' do
- define 'C' do
- compile.with project('sub:B')
- end
-
- define 'A' do
- end
+define "whole" do
+ define 'sub' do
+ define 'C' do
+ compile.with project('sub:B')
+ end
- define 'B' do
- compile.with project('sub:A')
- end
- end
-end
\ No newline at end of file
+ define 'A' do
+ end
+
+ define 'B' do
+ compile.with project('sub:A')
+ end
+ end
+end
diff --git a/tests/JavaSystemProperty/Buildfile b/tests/JavaSystemProperty/Buildfile
index 6fbfed5..affd850 100644
--- a/tests/JavaSystemProperty/Buildfile
+++ b/tests/JavaSystemProperty/Buildfile
@@ -15,4 +15,4 @@
define "proj" do
::Java.java.lang.System.setProperty("foo", "bar")
-end
\ No newline at end of file
+end
diff --git a/tests/compile_with_parent/Buildfile b/tests/compile_with_parent/Buildfile
index d1646d0..97dbeab 100644
--- a/tests/compile_with_parent/Buildfile
+++ b/tests/compile_with_parent/Buildfile
@@ -1,5 +1,5 @@
-repositories.remote << "http://repo1.maven.org/maven2"
+repositories.remote << "https://repo1.maven.org/maven2"
LOG4J = artifact("log4j:log4j:jar:1.2.16")
unless File.exist? File.join("lib", File.basename(LOG4J.to_s))
@@ -8,11 +8,10 @@
end
define "parent" do
-
+
define "child" do
-
+
compile.with project.parent.path_to(File.join("lib", File.basename(LOG4J.to_s)))
-
+
end
end
-
diff --git a/tests/generateFromPom/pom.xml b/tests/generateFromPom/pom.xml
index af29d4e..9e24209 100644
--- a/tests/generateFromPom/pom.xml
+++ b/tests/generateFromPom/pom.xml
@@ -276,7 +276,7 @@
<pluginRepository>
<id>maven-repo</id>
<name>maven repo</name>
- <url>http://repo1.maven.org/maven2/</url>
+ <url>https://repo1.maven.org/maven2/</url>
</pluginRepository>
<pluginRepository>
<id>atlassian-m2-repository</id>
diff --git a/tests/helloWorld/Buildfile b/tests/helloWorld/Buildfile
index 8a26a34..fadd530 100644
--- a/tests/helloWorld/Buildfile
+++ b/tests/helloWorld/Buildfile
@@ -14,7 +14,7 @@
# the License.
define "helloWorld", :version => "1.0", :group => "org.buildr" do
-
+
package(:jar)
-
-end
\ No newline at end of file
+
+end
diff --git a/tests/helloWorldEcj/Buildfile b/tests/helloWorldEcj/Buildfile
index ccce6c3..54aa7ff 100644
--- a/tests/helloWorldEcj/Buildfile
+++ b/tests/helloWorldEcj/Buildfile
@@ -14,7 +14,7 @@
# the License.
define "helloWorld", :version => "1.0", :group => "org.buildr" do
-
+
compile.using(:ecj) do
p Java.classpath
end
diff --git a/tests/include_as/Buildfile b/tests/include_as/Buildfile
index 6a43272..838621a 100644
--- a/tests/include_as/Buildfile
+++ b/tests/include_as/Buildfile
@@ -13,12 +13,12 @@
# License for the specific language governing permissions and limitations under
# the License.
-repositories.remote = ["http://repo1.maven.org/maven2"]
+repositories.remote = ["https://repo1.maven.org/maven2"]
SLF4J_API = "org.slf4j:slf4j-api:jar:1.6.1"
define "proj" do
project.version = "1.0"
- project.group = "org.example"
+ project.group = "org.example"
package(:zip).include(_("doc"), :as => "docu")
package(:zip).include(artifact(SLF4J_API), :as => "lib/logging.jar")
-end
\ No newline at end of file
+end
diff --git a/tests/include_path/Buildfile b/tests/include_path/Buildfile
index 98ebe52..da43d3e 100644
--- a/tests/include_path/Buildfile
+++ b/tests/include_path/Buildfile
@@ -13,12 +13,12 @@
# License for the specific language governing permissions and limitations under
# the License.
-repositories.remote = ["http://repo1.maven.org/maven2"]
+repositories.remote = ["https://repo1.maven.org/maven2"]
SLF4J_API = "org.slf4j:slf4j-api:jar:1.6.1"
define "proj" do
project.version = "1.0"
- project.group = "org.example"
+ project.group = "org.example"
package(:zip).include(_("doc"), :path => "distrib")
package(:zip).include(artifact(SLF4J_API), :path => "distrib/lib")
-end
\ No newline at end of file
+end
diff --git a/tests/integration_testing.rb b/tests/integration_testing.rb
index 3144c95..739d1a5 100644
--- a/tests/integration_testing.rb
+++ b/tests/integration_testing.rb
@@ -109,7 +109,7 @@
end
end
-
+
class RunJetty9 < Test::Unit::TestCase
def test_RunJetty9
diff --git a/tests/junit3/Buildfile b/tests/junit3/Buildfile
index a9a40ad..9541d39 100644
--- a/tests/junit3/Buildfile
+++ b/tests/junit3/Buildfile
@@ -1,9 +1,9 @@
-repositories.remote << "http://repo1.maven.org/maven2"
+repositories.remote << "https://repo1.maven.org/maven2"
Buildr.settings.build['junit'] = '3.8.1'
define "foo" do
compile
test
-
-end
\ No newline at end of file
+
+end
diff --git a/tests/package_war_as_jar/Buildfile b/tests/package_war_as_jar/Buildfile
index 91e024a..31cebf0 100644
--- a/tests/package_war_as_jar/Buildfile
+++ b/tests/package_war_as_jar/Buildfile
@@ -1,6 +1,6 @@
module PackageWarAsJar
-
+
def package_as_war_spec(spec)
spec.merge(:type => "jar")
end
@@ -8,8 +8,7 @@
define "webapp", :version => "1.0", :group => "org.group" do
project.extend PackageWarAsJar
-
+
package(:war)
-
+
end
-
\ No newline at end of file
diff --git a/tests/run_jetty6/Buildfile b/tests/run_jetty6/Buildfile
index e049e05..cc4ebf0 100644
--- a/tests/run_jetty6/Buildfile
+++ b/tests/run_jetty6/Buildfile
@@ -1,13 +1,13 @@
require 'buildr/jetty6'
require 'readline'
-
+
define "webapp", :group => 'com.example', :version => '1.0' do
compile.with(Buildr::Jetty6::REQUIRES, 'javax.servlet:javax.servlet-api:jar:3.1.0')
-
+
task("deploy-app"=>[package(:war), jetty.use]) do |task|
class << task ; attr_accessor :url, :path ; end
task.url = "http://localhost:8080/hello"
task.path = jetty.deploy(task.url, task.prerequisites.first)
end
-
-end
\ No newline at end of file
+
+end
diff --git a/tests/run_jetty6/src/main/java/MainServlet.java b/tests/run_jetty6/src/main/java/MainServlet.java
index f94d354..8282648 100644
--- a/tests/run_jetty6/src/main/java/MainServlet.java
+++ b/tests/run_jetty6/src/main/java/MainServlet.java
@@ -4,9 +4,9 @@
import java.io.IOException;
public class MainServlet extends HttpServlet {
-
+
public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.getWriter().println("Hello!");
response.setStatus(200);
}
-}
\ No newline at end of file
+}
diff --git a/tests/run_jetty6/src/main/webapp/WEB-INF/web.xml b/tests/run_jetty6/src/main/webapp/WEB-INF/web.xml
index 9e71b89..f40d8b6 100644
--- a/tests/run_jetty6/src/main/webapp/WEB-INF/web.xml
+++ b/tests/run_jetty6/src/main/webapp/WEB-INF/web.xml
@@ -9,9 +9,9 @@
<servlet-class>MainServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-
+
<servlet-mapping>
<servlet-name>MainServlet</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/tests/run_jetty9/Buildfile b/tests/run_jetty9/Buildfile
index 78def3d..f07e296 100644
--- a/tests/run_jetty9/Buildfile
+++ b/tests/run_jetty9/Buildfile
@@ -1,13 +1,13 @@
require 'buildr/jetty'
require 'readline'
-
+
define "webapp", :group => 'com.example', :version => '1.0' do
compile.with(Buildr::Jetty::REQUIRES)
-
+
task("deploy-app"=>[package(:war), jetty.use]) do |task|
class << task ; attr_accessor :url, :path ; end
task.url = "http://localhost:8080/hello"
task.path = jetty.deploy(task.url, task.prerequisites.first)
end
-
-end
\ No newline at end of file
+
+end
diff --git a/tests/run_jetty9/src/main/java/MainServlet.java b/tests/run_jetty9/src/main/java/MainServlet.java
index f94d354..8282648 100644
--- a/tests/run_jetty9/src/main/java/MainServlet.java
+++ b/tests/run_jetty9/src/main/java/MainServlet.java
@@ -4,9 +4,9 @@
import java.io.IOException;
public class MainServlet extends HttpServlet {
-
+
public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.getWriter().println("Hello!");
response.setStatus(200);
}
-}
\ No newline at end of file
+}
diff --git a/tests/run_jetty9/src/main/webapp/WEB-INF/web.xml b/tests/run_jetty9/src/main/webapp/WEB-INF/web.xml
index 9e71b89..f40d8b6 100644
--- a/tests/run_jetty9/src/main/webapp/WEB-INF/web.xml
+++ b/tests/run_jetty9/src/main/webapp/WEB-INF/web.xml
@@ -9,9 +9,9 @@
<servlet-class>MainServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-
+
<servlet-mapping>
<servlet-name>MainServlet</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
