buildr 1.5.7-java → 1.5.8-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4979576a237201f0c96f2b946838d12322760aef
4
- data.tar.gz: 7c479a1ff3e57cc4ddb8b60634d1e86aded682f2
3
+ metadata.gz: 454f49ebf69dc2af57ed65bf3c05905471b151ca
4
+ data.tar.gz: c3786e3650bacca15141a8d0696c3204a50900a0
5
5
  SHA512:
6
- metadata.gz: ab8f9ccaf8ffc62d25d1932f628a47fc5700bc535342495945c39762f510000701e3987b0c84dfd9359a9dffa4d8fe54be7d3d210e5674ffe7e8ac330075d3a6
7
- data.tar.gz: 6c665174fcf1f71031275d9893791c372333639f1869e3f12505b0e0bb32c60c24f5d9545d67679fe627000414578c719d61a4a0e43e7232d185c52732d236dd
6
+ metadata.gz: 49fadcd94c9a4cd5ec0a27d7b3f34fbb9dbdde92ffb6581f6b94ea41df0e14127a86855eb3848e11a9ce0c10e187faf2199c0bd864f1d1eeacb8c48a2e2de2d7
7
+ data.tar.gz: 0041e95f67e5b220089a87bcab1454ced5e9276bbe1b68ab356a497686e2c5f9841f91d68b3f65b2ba3fae8d3257c7c493a9212c095457e01ff1e186fc1c2cb3
data/CHANGELOG CHANGED
@@ -1,3 +1,19 @@
1
+ 1.5.8 (2019-07-14)
2
+ * Fixed: Changed references to `https://repo1.maven.org/maven2` to use https where possible.
3
+ * Change: Use the `zapwhite` gem to manage file whitespace within repository.
4
+ * Fixed: Replace references to long removed `http://www.ibiblio.org/maven2/` repository with
5
+ `https://repo1.maven.org/maven2`.
6
+ * Fixed: Ensure pom files used in tests use https when referring to maven repositories.
7
+ * Added: Add support for downloading external annotations and attaching them to IntelliJ IDEA module dependencies.
8
+ * Added: Detect external annotations in the local project and add them to the generated IntelliJ IDEA
9
+ module when generating. The default location is `src/main/annotations` but other locations
10
+ can be specified by modifying the `project.iml.annotation_paths` property.
11
+ * Fixed: Explicitly specify the `:sourcepath` parameter for javadoc tool. This enables additional parameters
12
+ such as `-packagenames` and `-subpackages` to be passed to the underling tool.
13
+ * Fixed: Stop generating poms with the parent POM `org.sonatype.oss:oss-parent:8`. The las update was a long time
14
+ ago (i.e. 2012) and it is no longer maintained. It was also deprecated several years ago and is not
15
+ guaranteed to work in modern Maven deployments.
16
+
1
17
  1.5.7 (2019-02-16)
2
18
  * Fixed: The fix that allowed special characters in usernames and passwords was only partially applied
3
19
  in the `1.5.6` release. The complete fix that correctly decoded usernames and passwords before
@@ -52,7 +52,7 @@ module Buildr
52
52
  "org.eclipse.jetty:jetty-security:jar:#{VERSION}",
53
53
  "org.eclipse.jetty:jetty-xml:jar:#{VERSION}",
54
54
  "org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}",
55
- "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}",
55
+ "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}",
56
56
  "org.slf4j:jcl-over-slf4j:jar:#{SLF4J_VERSION}",
57
57
  'javax.servlet:javax.servlet-api:jar:3.1.0' ]
58
58
 
@@ -19,7 +19,7 @@ require 'buildr/jetty6'
19
19
  require 'buildr/nailgun'
20
20
  require 'buildr/scala'
21
21
  require 'buildr/kotlin'
22
- repositories.remote << 'http://repo1.maven.org/maven2'
22
+ repositories.remote << 'https://repo1.maven.org/maven2'
23
23
 
24
24
  repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
25
25
 
@@ -33,7 +33,7 @@ define 'buildr' do
33
33
  define 'scala' do
34
34
  compile.using(:javac).from(FileList['lib/buildr/scala/**/*.java']).into('lib/buildr/scala')
35
35
  end
36
-
36
+
37
37
  define 'kotlin' do
38
38
  compile.using(:javac).from(FileList['lib/buildr/kotlin/**/*.java']).into('lib/buildr/kotlin').with(Buildr::Kotlin::Kotlinc.dependencies)
39
39
  end
@@ -38,7 +38,6 @@ something that's simple and intuitive to use, so we only need to tell it what
38
38
  to do, and it takes care of the rest. But also something we can easily extend
39
39
  for those one-off tasks, with a language that's a joy to use.
40
40
  TEXT
41
- spec.rubyforge_project = 'buildr'
42
41
 
43
42
  spec.platform = $platform
44
43
 
@@ -97,4 +96,6 @@ for those one-off tasks, with a language that's a joy to use.
97
96
  spec.add_development_dependency 'pygmentize', '0.0.3'
98
97
  spec.add_development_dependency 'saikuro_treemap', '0.2.0'
99
98
  spec.add_development_dependency 'atoulme-Saikuro', '1.2.1'
99
+ # Used to manage whitespace of files within repository
100
+ spec.add_development_dependency 'zapwhite', '2.14.0'
100
101
  end
@@ -99,7 +99,7 @@ Buildr can download artifacts for you, but only if you tell it where to find the
99
99
  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:
100
100
 
101
101
  {% highlight ruby %}
102
- repositories.remote << 'http://www.ibiblio.org/maven2/'
102
+ repositories.remote << 'https://repo1.maven.org/maven2'
103
103
  {% endhighlight %}
104
104
 
105
105
  If your repository requires HTTP authentication, you can write,
@@ -171,7 +171,7 @@ artifacts(OPENJPA).each(&:invoke)
171
171
 
172
172
  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@.
173
173
 
174
- 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.
174
+ 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.
175
175
 
176
176
  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.
177
177
 
@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
18
18
 
19
19
  h2(#dist). Binaries and Source Code
20
20
 
21
+ h3. buildr 1.5.7 (2019-02-16)
22
+
23
+ |_. Package |_. MD5 Checksum |_. PGP |
24
+ | "buildr-1.5.7.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7.gem | "da7aef9f2f016871162a11eed21f9821":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.gem.asc |
25
+ | "buildr-1.5.7-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7-x86-mswin32.gem | "a5ea3efca5f6e01ee56f014b1f71c002":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7-x86-mswin32.gem.asc |
26
+ | "buildr-1.5.7-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7-java.gem | "c61529d8d0afa922d93faddef1170b3c":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7-java.gem.asc |
27
+ | "buildr-1.5.7.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7.tgz | "e779df6b46e25c1692b0a3f102ed6903":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.tgz.asc |
28
+ | "buildr-1.5.7.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.7/buildr-1.5.7.zip | "2991f9e184c6ae2eb229a219ac692e4c":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.7/buildr-1.5.7.zip.asc |
29
+
30
+ p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.7/KEYS)
31
+
32
+
21
33
  h3. buildr 1.5.6 (2018-05-10)
22
34
 
23
35
  |_. Package |_. MD5 Checksum |_. PGP |
24
- | "buildr-1.5.6.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.gem | "3836a2bb86692ca353ccc9ed6c4a618d":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.asc |
25
- | "buildr-1.5.6-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6-java.gem | "68879b787705d8c3222b80cab5416e99":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.asc |
26
- | "buildr-1.5.6-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem | "c0c65b86f422e7bb8c8f3bba00af4ec2":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.asc |
27
- | "buildr-1.5.6.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.tgz | "b17855a2f439c042bd6c94c85454ddce":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.asc |
28
- | "buildr-1.5.6.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.zip | "4fcd9603070374b93f7db69fdef1ed83":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.asc |
36
+ | "buildr-1.5.6.gem":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem | "3836a2bb86692ca353ccc9ed6c4a618d":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.asc |
37
+ | "buildr-1.5.6-java.gem":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem | "68879b787705d8c3222b80cab5416e99":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.asc |
38
+ | "buildr-1.5.6-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem | "c0c65b86f422e7bb8c8f3bba00af4ec2":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.asc |
39
+ | "buildr-1.5.6.tgz":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz | "b17855a2f439c042bd6c94c85454ddce":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.asc |
40
+ | "buildr-1.5.6.zip":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip | "4fcd9603070374b93f7db69fdef1ed83":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.asc |
29
41
 
30
- p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.6/KEYS)
42
+ p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.5.6/KEYS)
31
43
 
32
44
 
33
45
  h3. buildr 1.5.5 (2017-12-06)
@@ -46,6 +46,17 @@ So let's get started. You can "read the documentation online":quick_start.html,
46
46
 
47
47
  h2(#news). What's New
48
48
 
49
+ Highlights from Buildr 1.5.8 (2019-07-14)
50
+ * Fixed: Add support for IntelliJ IDEAs external annotations.
51
+ * Added: Detect external annotations in the local project and add them to the generated IntelliJ IDEA
52
+ module when generating. The default location is `src/main/annotations` but other locations
53
+ can be specified by modifying the `project.iml.annotation_paths` property.
54
+ * Fixed: Explicitly specify the `:sourcepath` parameter for javadoc tool. This enables additional parameters
55
+ such as `-packagenames` and `-subpackages` to be passed to the underling tool.
56
+ * Fixed: Stop generating poms with the parent POM `org.sonatype.oss:oss-parent:8`. The las update was a long time
57
+ ago (i.e. 2012) and it is no longer maintained. It was also deprecated several years ago and is not
58
+ guaranteed to work in modern Maven deployments.
59
+
49
60
  Highlights from Buildr 1.5.7 (2019-02-16)
50
61
  * Fixed: The fix that allowed special characters in usernames and passwords was only partially applied
51
62
  in the `1.5.6` release. The complete fix that correctly decoded usernames and passwords before
@@ -64,44 +75,6 @@ Highlights from Buildr 1.5.7 (2019-02-16)
64
75
  * Change: Use https protocol to access Gem metadata. Submitted by Olle Jonsson.
65
76
  * Change: Change RSpec shared_context usage to avoid warnings. Submitted by Olle Jonsson.
66
77
 
67
- Highlights from Buildr 1.5.6 (2018-05-10)
68
- * Fixed: Ensure that the username and passwords declared for repositories are correctly url encoded for
69
- the upload repositories when converted to a URL. (i.e. Ensure `Buildr.repositories.release_to`
70
- and `Buildr.repositories.snapshot_to` settings can have usernames and passwords with special
71
- characters).
72
- * Added: Add support for allowing some dependencies to include transitive dependencies via the
73
- `pom.include_transitive_dependencies` configuration setting.
74
- * Added: Add support for adding dependencies to the pom via the `pom.additional_dependencies` configuration
75
- setting. These dependencies are `compile` scope and are in addition to any derived from the normal
76
- compile dependencies.
77
- * Fixed: GWT Addon: Use version `1.0.2` of the `com.google.jsinterop:jsinterop-annotations:jar` artifact
78
- when using GWT 2.8.2 to align with version shipped with GWT.
79
- * Fixed: Dependencies added as `pom.provided_dependencies` or `pom.runtime_dependencies` and not included
80
- as compile dependencies were incorrectly omitted from pom.
81
- * Fixed: Dependencies added as `pom.provided_dependencies` and `pom.runtime_dependencies` were being
82
- incorrectly duplicated within the pom dependencies section. Now provided dependency scope takes
83
- precedence over runtime scoped dependency.
84
- * Fixed: Dependencies added to POMs will specify the classifier unless it is the default value.
85
- * Added: Add the `project.pom.dependency_filter` configuration property that can be set to a proc. The proc
86
- accepts a dependency and returns a boolean that determines whether the dependency is included in
87
- the generated pom or not.
88
- * Fixed: POMs generated by Buildr use the parent pom `org.sonatype.oss:oss-parent:pom:7` but this
89
- generates a warning in the latest version of Maven. Modern versions of Maven would thus
90
- ignore transitive dependencies declared in the pom. The parent pom has now been upgraded
91
- to `org.sonatype.oss:oss-parent:pom:8` which will result in modern Maven correctly picking
92
- up transitive dependencies.
93
- * Change: JaCoCo Addon: Update JaCoCo version to 0.8.0 which in turns supports Java9.
94
- * Added: GWT Addon: Added support for `:gwtc_args` parameter to supply arbitrary parameters to
95
- the GWT compiler.
96
- * Added: Add support for sha512 digests to be generated for files during the upload. This is typically
97
- configured by adding `sha512` to the list of digests via a line such as:
98
- `repositories.release_to[:options] = {:digests => [:md5, :sha1, :sha512]}`
99
- * Fixed: The default upload tasks would often get a ReadTimeout when uploading using http to a remote
100
- server that did not have `KeepAlive` socket option enabled and the upload took more than 60
101
- seconds (the default socket read timeout). Some commercial maven repositories could trigger
102
- this scenario during upload of even modest size artifacts. Default the read_timeout to 10 minutes
103
- when during upload to work address this issue.
104
-
105
78
  This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
106
79
 
107
80
  h2(#notices). Credits & Notices
@@ -26,7 +26,7 @@ AXIS_OF_WS = [AXIOM, AXIS2]
26
26
  OPENJPA = ['org.apache.openjpa:openjpa:jar:1.2.0',
27
27
  'net.sourceforge.serp:serp:jar:1.12.0']
28
28
 
29
- repositories.remote << 'http://www.ibiblio.org/maven2/'
29
+ repositories.remote << 'https://repo1.maven.org/maven2'
30
30
 
31
31
  desc 'Code. Build. ??? Profit!'
32
32
  define 'killer-app' do
@@ -67,7 +67,7 @@ h2(#dependencies). Dependencies
67
67
  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:
68
68
 
69
69
  {% highlight ruby %}
70
- repositories.remote << 'http://www.ibiblio.org/maven2'
70
+ repositories.remote << 'https://repo1.maven.org/maven2'
71
71
 
72
72
  define 'killer-app' do
73
73
  project.version = '0.1.0'
@@ -83,7 +83,7 @@ p(tip). You can search the global repository of artifacts at sites like "MvnBrow
83
83
  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):
84
84
 
85
85
  {% highlight ruby %}
86
- repositories.remote << 'http://www.ibiblio.org/maven2'
86
+ repositories.remote << 'https://repo1.maven.org/maven2'
87
87
 
88
88
  define 'killer-app' do
89
89
  project.version = '0.1.0'
@@ -95,7 +95,7 @@ end
95
95
  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:
96
96
 
97
97
  {% highlight ruby %}
98
- repositories.remote << 'http://www.ibiblio.org/maven2'
98
+ repositories.remote << 'https://repo1.maven.org/maven2'
99
99
 
100
100
  WICKET = transitive('org.apache.wicket:wicket:jar:1.4-rc6')
101
101
  SLF4J = 'org.slf4j:slf4j-jdk14:jar:1.5.8'
@@ -81,7 +81,7 @@ GROUP = "#{name}"
81
81
  COPYRIGHT = ""
82
82
 
83
83
  # Specify Maven 2.0 remote repositories here, like this:
84
- repositories.remote << "http://repo1.maven.org/maven2"
84
+ repositories.remote << "https://repo1.maven.org/maven2"
85
85
 
86
86
  desc "The #{name.capitalize} project"
87
87
  define "#{name}" do
@@ -267,7 +267,7 @@ EOF
267
267
  legacy = repository["layout"].to_s =~ /legacy/
268
268
  !legacy
269
269
  } rescue nil
270
- repositories = [{"name" => "Standard maven2 repository", "url" => "http://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
270
+ repositories = [{"name" => "Standard maven2 repository", "url" => "https://repo1.maven.org/maven2"}] if repositories.nil? || repositories.empty?
271
271
  repositories.each do |repository|
272
272
  name, url = repository["name"], repository["url"]
273
273
  script << "# #{name}"
@@ -212,6 +212,10 @@ module Buildr #:nodoc:
212
212
  'iml'
213
213
  end
214
214
 
215
+ def annotation_paths
216
+ @annotation_paths ||= [buildr_project._(:source, :main, :annotations)].select {|p| File.exist?(p)}
217
+ end
218
+
215
219
  def main_source_directories
216
220
  @main_source_directories ||= [buildr_project.compile.sources].flatten.compact
217
221
  end
@@ -342,10 +346,7 @@ module Buildr #:nodoc:
342
346
  buildr_project.assets.paths.each {|p| default_webroots[p] = '/' }
343
347
  webroots = options[:webroots] || default_webroots
344
348
  default_deployment_descriptors = []
345
- ['web.xml', 'sun-web.xml', 'glassfish-web.xml', 'jetty-web.xml', 'geronimo-web.xml',
346
- 'context.xml', 'weblogic.xml',
347
- 'jboss-deployment-structure.xml', 'jboss-web.xml',
348
- 'ibm-web-bnd.xml', 'ibm-web-ext.xml', 'ibm-web-ext-pme.xml'].
349
+ %w(web.xml sun-web.xml glassfish-web.xml jetty-web.xml geronimo-web.xml context.xml weblogic.xml jboss-deployment-structure.xml jboss-web.xml ibm-web-bnd.xml ibm-web-ext.xml ibm-web-ext-pme.xml).
349
350
  each do |descriptor|
350
351
  webroots.each_pair do |path, relative_url|
351
352
  next unless relative_url == '/'
@@ -446,9 +447,7 @@ module Buildr #:nodoc:
446
447
  ejb_roots = options[:ejb_roots] || default_ejb_roots
447
448
 
448
449
  default_deployment_descriptors = []
449
- ['ejb-jar.xml', 'glassfish-ejb-jar.xml', 'ibm-ejb-jar-bnd.xml', 'ibm-ejb-jar-ext-pme.xml', 'ibm-ejb-jar-ext.xml',
450
- 'jboss.xml', 'jbosscmp-jdbc.xml', 'openejb-jar.xml', 'sun-cmp-mapping.xml', 'sun-ejb-jar.xml',
451
- 'weblogic-cmp-rdbms-jar.xml', 'weblogic-ejb-jar.xml'].
450
+ %w(ejb-jar.xml glassfish-ejb-jar.xml ibm-ejb-jar-bnd.xml ibm-ejb-jar-ext-pme.xml ibm-ejb-jar-ext.xml jboss.xml jbosscmp-jdbc.xml openejb-jar.xml sun-cmp-mapping.xml sun-ejb-jar.xml weblogic-cmp-rdbms-jar.xml weblogic-ejb-jar.xml).
452
451
  each do |descriptor|
453
452
  ejb_roots.each do |path|
454
453
  d = "#{path}/WEB-INF/#{descriptor}"
@@ -483,12 +482,18 @@ module Buildr #:nodoc:
483
482
  dependency_path = d.to_s
484
483
  export = true
485
484
  source_path = nil
485
+ annotations_path = nil
486
486
  if d.respond_to?(:to_spec_hash)
487
487
  source_spec = d.to_spec_hash.merge(:classifier => 'sources')
488
488
  source_path = Buildr.artifact(source_spec).to_s
489
489
  source_path = nil unless File.exist?(source_path)
490
490
  end
491
- [dependency_path, export, source_path]
491
+ if d.respond_to?(:to_spec_hash)
492
+ annotations_spec = d.to_spec_hash.merge(:classifier => 'annotations')
493
+ annotations_path = Buildr.artifact(annotations_spec).to_s
494
+ annotations_path = nil unless File.exist?(annotations_path)
495
+ end
496
+ [dependency_path, export, source_path, annotations_path]
492
497
  end
493
498
  end
494
499
 
@@ -499,12 +504,18 @@ module Buildr #:nodoc:
499
504
  dependency_path = d.to_s
500
505
  export = main_dependencies_paths.include?(dependency_path)
501
506
  source_path = nil
507
+ annotations_path = nil
502
508
  if d.respond_to?(:to_spec_hash)
503
509
  source_spec = d.to_spec_hash.merge(:classifier => 'sources')
504
510
  source_path = Buildr.artifact(source_spec).to_s
505
511
  source_path = nil unless File.exist?(source_path)
506
512
  end
507
- [dependency_path, export, source_path]
513
+ if d.respond_to?(:to_spec_hash)
514
+ annotations_spec = d.to_spec_hash.merge(:classifier => 'annotations')
515
+ annotations_path = Buildr.artifact(annotations_spec).to_s
516
+ annotations_path = nil unless File.exist?(annotations_path)
517
+ end
518
+ [dependency_path, export, source_path, annotations_path]
508
519
  end
509
520
  end
510
521
 
@@ -550,22 +561,22 @@ module Buildr #:nodoc:
550
561
  end
551
562
 
552
563
  main_project_dependencies = project_dependencies.dup
553
- self.test_dependency_details.each do |dependency_path, export, source_path|
564
+ self.test_dependency_details.each do |dependency_path, export, source_path, annotations_path|
554
565
  next if export
555
- generate_lib(xml, dependency_path, export, source_path, project_dependencies)
566
+ generate_lib(xml, dependency_path, export, source_path, annotations_path, project_dependencies)
556
567
  end
557
568
 
558
569
  test_project_dependencies = project_dependencies - main_project_dependencies
559
- self.main_dependency_details.each do |dependency_path, export, source_path|
570
+ self.main_dependency_details.each do |dependency_path, export, source_path, annotations_path|
560
571
  next unless export
561
- generate_lib(xml, dependency_path, export, source_path, test_project_dependencies)
572
+ generate_lib(xml, dependency_path, export, source_path, annotations_path, test_project_dependencies)
562
573
  end
563
574
 
564
575
  xml.orderEntryProperties
565
576
  end
566
577
  end
567
578
 
568
- def generate_lib(xml, dependency_path, export, source_path, project_dependencies)
579
+ def generate_lib(xml, dependency_path, export, source_path, annotations_path, project_dependencies)
569
580
  project_for_dependency = Buildr.projects.detect do |project|
570
581
  [project.packages, project.compile.target, project.resources.target, project.test.compile.target, project.test.resources.target].flatten.
571
582
  detect { |artifact| artifact.to_s == dependency_path }
@@ -578,7 +589,7 @@ module Buildr #:nodoc:
578
589
  end
579
590
  project_dependencies << project_for_dependency
580
591
  else
581
- generate_module_lib(xml, url_for_path(dependency_path), export, (source_path ? url_for_path(source_path) : nil), !export)
592
+ generate_module_lib(xml, url_for_path(dependency_path), export, (source_path ? url_for_path(source_path) : nil), (annotations_path ? url_for_path(annotations_path) : nil), !export)
582
593
  end
583
594
  end
584
595
 
@@ -602,6 +613,14 @@ module Buildr #:nodoc:
602
613
  xml.output(:url => file_path(self.main_output_dir.to_s))
603
614
  xml.tag!('output-test', :url => file_path(self.test_output_dir.to_s))
604
615
  xml.tag!('exclude-output')
616
+ paths = self.annotation_paths
617
+ unless paths.empty?
618
+ xml.tag!('annotation-paths') do |xml|
619
+ paths.each do |path|
620
+ xml.root(:url=> file_path(path))
621
+ end
622
+ end
623
+ end
605
624
  end
606
625
 
607
626
  def generate_content(xml)
@@ -654,12 +673,15 @@ module Buildr #:nodoc:
654
673
  xml.orderEntry attribs
655
674
  end
656
675
 
657
- def generate_module_lib(xml, path, export, source_path, test = false)
676
+ def generate_module_lib(xml, path, export, source_path, annotations_path, test = false)
658
677
  attribs = {:type => 'module-library'}
659
678
  attribs[:exported] = '' if export
660
679
  attribs[:scope] = 'TEST' if test
661
680
  xml.orderEntry attribs do
662
681
  xml.library do
682
+ xml.ANNOTATIONS do
683
+ xml.root :url => annotations_path
684
+ end if annotations_path
663
685
  xml.CLASSES do
664
686
  xml.root :url => path
665
687
  end
@@ -170,11 +170,6 @@ module Buildr
170
170
  'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
171
171
  'xsi:schemaLocation' => 'http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd') do
172
172
  xml.modelVersion '4.0.0'
173
- xml.parent do
174
- xml.groupId 'org.sonatype.oss'
175
- xml.artifactId 'oss-parent'
176
- xml.version '8'
177
- end
178
173
  xml.groupId project.group
179
174
  xml.artifactId project.id
180
175
  xml.version project.version
@@ -24,6 +24,7 @@ module Buildr #:nodoc:
24
24
  if project.doc.engine? Javadoc
25
25
  options = project.doc.options
26
26
  options[:windowtitle] = (project.comment || project.name) unless options[:windowtitle]
27
+ project.doc.sourcepath = project.compile.sources.dup if project.doc.sourcepath.empty?
27
28
  end
28
29
  end
29
30
  end
@@ -140,15 +140,15 @@ module Buildr::Kotlin
140
140
  hash[option] = options[option]
141
141
  hash
142
142
  end
143
-
143
+
144
144
  options[:debug] = Buildr.options.debug || trace?(:kotlinc) if options[:debug].nil?
145
145
  options[:warnings] = verbose if options[:warnings].nil?
146
146
  options[:optimize] = false if options[:optimize].nil?
147
147
  options[:noStdlib] = true if options[:noStdlib].nil?
148
148
  @java = Javac.new(project, options[:javac])
149
149
  end
150
-
151
-
150
+
151
+
152
152
 
153
153
  def compile(sources, target, dependencies) #:nodoc:
154
154
  check_options(options, OPTIONS)
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation;
23
23
 
24
24
 
25
25
  public class KotlinMessageCollector implements MessageCollector {
26
-
26
+
27
27
  public void report(CompilerMessageSeverity severity, String message, CompilerMessageLocation location) {
28
28
  switch(severity) {
29
29
  case ERROR:
@@ -35,12 +35,12 @@ public class KotlinMessageCollector implements MessageCollector {
35
35
  break;
36
36
  }
37
37
  }
38
-
38
+
39
39
  public boolean hasErrors() {
40
40
  return false;
41
41
  }
42
-
42
+
43
43
  public void clear() {
44
44
  // not implemented
45
45
  }
46
- }
46
+ }
@@ -267,12 +267,12 @@ module Buildr #:nodoc:
267
267
  @expanders.each { |expander| expander.exclude(*files) }
268
268
  self
269
269
  end
270
-
270
+
271
271
  def concatenate(*files)
272
272
  @expanders.each { |expander| expander.concatenate(*files) }
273
273
  self
274
274
  end
275
-
275
+
276
276
  def transform(*files, &block)
277
277
  @expanders.each { |expander| expander.transform(*files, &block) }
278
278
  self
@@ -301,12 +301,12 @@ module Buildr #:nodoc:
301
301
  @excludes |= files
302
302
  self
303
303
  end
304
-
304
+
305
305
  def concatenate(*files)
306
306
  @concatenates |= files
307
307
  self
308
308
  end
309
-
309
+
310
310
  def transform(*files, &block)
311
311
  @transforms[[files].flatten] = block
312
312
  self
@@ -325,7 +325,7 @@ module Buildr #:nodoc:
325
325
  elsif @transforms.each_pair.detect do |transform, transform_block|\
326
326
  if transform.any? { |pattern| File.fnmatch(pattern, entry.name) }
327
327
  file_map[dest] << ZipEntryData.new(source, entry)
328
-
328
+
329
329
  transform_map[dest] = transform_block
330
330
  true
331
331
  end
@@ -21,6 +21,9 @@ module Buildr #:nodoc:
21
21
  desc "Download all artifacts' sources"
22
22
  task 'artifacts:sources'
23
23
 
24
+ desc "Download all artifacts' external annotations"
25
+ task 'artifacts:annotations'
26
+
24
27
  desc "Download all artifacts' javadoc"
25
28
  task 'artifacts:javadoc'
26
29
 
@@ -142,6 +145,18 @@ module Buildr #:nodoc:
142
145
  javadoc_task
143
146
  end
144
147
 
148
+ # :call-seq:
149
+ # annotations_artifact => Artifact
150
+ #
151
+ # Convenience method that returns an annotations artifact. The annotations artifact is used by
152
+ # Intellij IDEA as a source of external annotations.
153
+ def annotations_artifact
154
+ annotations_spec = to_spec_hash.merge(:classifier=>'annotations')
155
+ annotations_task = OptionalArtifact.define_task(Buildr.repositories.locate(annotations_spec))
156
+ annotations_task.send :apply_spec, annotations_spec
157
+ annotations_task
158
+ end
159
+
145
160
  # :call-seq:
146
161
  # pom_xml => string
147
162
  #
@@ -948,6 +963,7 @@ module Buildr #:nodoc:
948
963
  unless spec[:type] == :pom
949
964
  Rake::Task['artifacts:sources'].enhance [task.sources_artifact]
950
965
  Rake::Task['artifacts:javadoc'].enhance [task.javadoc_artifact]
966
+ Rake::Task['artifacts:annotations'].enhance [task.annotations_artifact]
951
967
  end
952
968
  end
953
969
  task.enhance &block
@@ -720,10 +720,10 @@ module Buildr #:nodoc:
720
720
  previous = get(unvers, false) || get(name, false)
721
721
  if previous # have previous on current namespace
722
722
  if previous.requirement # we must satisfy the requirement
723
- unless unvers # we only have the version
724
- satisfied = previous.requirement.satisfied_by?(artifact.version)
725
- else
723
+ if unvers
726
724
  satisfied = previous.satisfied_by?(artifact)
725
+ else # we only have the version
726
+ satisfied = previous.requirement.satisfied_by?(artifact.version)
727
727
  end
728
728
  raise "Unsatisfied dependency #{previous} " +
729
729
  "not satisfied by #{artifact}" unless satisfied
@@ -961,6 +961,7 @@ module Buildr #:nodoc:
961
961
 
962
962
  private
963
963
  def get(name, include_parents = true, include_subs = true, include_self = true) #:nodoc:
964
+ artifact = nil
964
965
  if include_subs && name.to_s[/_/] # try sub namespaces first
965
966
  sub, parts = self, name.to_s.split('_')
966
967
  sub_name = parts.shift.to_sym
@@ -980,7 +981,7 @@ module Buildr #:nodoc:
980
981
  artifact = registry.parent.get(name, true)
981
982
  end
982
983
  end
983
- artifact = artifact.call if artifact.respond_to?(:call)
984
+ artifact = artifact.call if artifact && artifact.respond_to?(:call)
984
985
  artifact
985
986
  end
986
987
 
@@ -96,7 +96,7 @@ module Buildr #:nodoc:
96
96
 
97
97
  def remote_versions(art, base, from = :metadata, fallback = true)
98
98
  path = (art[:group].split(/\./) + [art[:id]]).flatten.join('/')
99
- base ||= "http://mirrors.ibiblio.org/pub/mirrors/maven2"
99
+ base ||= "https://repo1.maven.org/maven2"
100
100
  uris = {:metadata => "#{base}/#{path}/maven-metadata.xml"}
101
101
  uris[:listing] = "#{base}/#{path}/" if base =~ /^https?:/
102
102
  xml = nil
@@ -99,7 +99,7 @@ module Buildr #:nodoc:
99
99
  tar.mkdir(path, options.merge(:mode=>stat.mode, :mtime=>stat.mtime, :uid=>stat.uid, :gid=>stat.gid))
100
100
  else
101
101
  contents = [contents].flatten
102
-
102
+
103
103
  combined_options = options
104
104
  if File.exists?(contents.first.to_s)
105
105
  stat = File.stat(contents.first.to_s)
@@ -107,8 +107,8 @@ module Buildr #:nodoc:
107
107
  elsif contents.first.respond_to?(:mode)
108
108
  combined_options = combined_options.merge(:mode => contents.first.mode)
109
109
  end
110
-
111
-
110
+
111
+
112
112
  tar.add_file path, combined_options do |os, opts|
113
113
  [contents].flatten.each do |content|
114
114
  if content.respond_to?(:call)
@@ -120,7 +120,7 @@ module Buildr #:nodoc:
120
120
  content.call os
121
121
  end
122
122
  else
123
- File.open content.to_s, 'rb' do |is|
123
+ File.open content.to_s, 'rb' do |is|
124
124
  if transform
125
125
  output = StringIO.new
126
126
  while data = is.read(4096)
@@ -140,7 +140,7 @@ module Buildr #:nodoc:
140
140
  end
141
141
  end
142
142
  end
143
-
143
+
144
144
  end
145
145
  end
146
146
  end
@@ -14,5 +14,5 @@
14
14
  # the License.
15
15
 
16
16
  module Buildr #:nodoc:
17
- VERSION = '1.5.7'.freeze
17
+ VERSION = '1.5.8'.freeze
18
18
  end
@@ -13,7 +13,7 @@
13
13
  # License for the specific language governing permissions and limitations under
14
14
  # the License.
15
15
 
16
- RC_VERSION = ENV['RC_VERSION'] || ''
16
+ RC_VERSION = ENV['RC_VERSION'] || '' unless defined?(RC_VERSION)
17
17
 
18
18
  desc 'Release the next version of buildr from existing staged repository'
19
19
  task 'release' do
@@ -132,7 +132,7 @@ DOAP
132
132
  lambda do
133
133
  changes = File.read("_release/#{spec.version}/CHANGES")[/.*?\n(.*)/m, 1]
134
134
  email = <<-EMAIL
135
- To: users@buildr.apache.org, announce@apache.org
135
+ To: users@buildr.apache.org
136
136
  Subject: [ANNOUNCE] Apache Buildr #{spec.version} released
137
137
 
138
138
  #{spec.description}
@@ -18,8 +18,8 @@ require 'digest/sha1'
18
18
 
19
19
  gpg_cmd = 'gpg2'
20
20
 
21
- STAGE_DATE = ENV['STAGE_DATE'] || Time.now.strftime('%Y-%m-%d')
22
- RC_VERSION = ENV['RC_VERSION'] || ''
21
+ STAGE_DATE = ENV['STAGE_DATE'] || Time.now.strftime('%Y-%m-%d') unless defined?(STAGE_DATE)
22
+ RC_VERSION = ENV['RC_VERSION'] || '' unless defined?(RC_VERSION)
23
23
 
24
24
  task 'prepare' do
25
25
  # Update source files to next release number.
@@ -1419,7 +1419,7 @@ describe Buildr::IntellijIdea do
1419
1419
  touch 'foo/src/main/java/foo/Foo.java' # needed so that buildr will treat as a java project
1420
1420
  artifact('group:id:jar:1.0') { |t| write t.to_s }
1421
1421
  define "root" do
1422
- repositories.remote << 'http://mirrors.ibiblio.org/pub/mirrors/maven2/'
1422
+ repositories.remote << 'https://repo1.maven.org/maven2'
1423
1423
  project.version = "2.5.2"
1424
1424
  define 'foo' do
1425
1425
  resources.from _(:source, :main, :resources)
@@ -98,13 +98,6 @@ describe Buildr::CustomPom do
98
98
  #$stderr.puts @pom_xml.to_s
99
99
  end
100
100
 
101
- it 'has correct static metadata' do
102
- @pom_xml.should match_xpath('/project/modelVersion', '4.0.0')
103
- @pom_xml.should match_xpath('/project/parent/groupId', 'org.sonatype.oss')
104
- @pom_xml.should match_xpath('/project/parent/artifactId', 'oss-parent')
105
- @pom_xml.should match_xpath('/project/parent/version', '8')
106
- end
107
-
108
101
  it 'has correct project level metadata' do
109
102
  @pom_xml.should match_xpath('/project/groupId', 'org.myproject')
110
103
  @pom_xml.should match_xpath('/project/artifactId', 'foo')
@@ -77,7 +77,7 @@ describe 'ecj compiler' do
77
77
  end
78
78
 
79
79
  it 'should include tools.jar dependency' do
80
- repositories.remote << "http://repo1.maven.org/maven2/"
80
+ repositories.remote << "https://repo1.maven.org/maven2/"
81
81
  write 'src/main/java/UseJarSigner.java', <<-JAVA
82
82
  import sun.tools.jar.Manifest;
83
83
  public class UseJarSigner { }
@@ -229,7 +229,7 @@ describe 'ecj compiler options' do
229
229
  end
230
230
 
231
231
  it 'should complain about options it doesn\'t know' do
232
- repositories.remote << "http://repo1.maven.org/maven2/"
232
+ repositories.remote << "https://repo1.maven.org/maven2/"
233
233
  write 'source/Test.java', 'class Test {}'
234
234
  compile_task.using(:unknown=>'option')
235
235
  lambda { compile_task.from('source').invoke }.should raise_error(ArgumentError, /no such option/i)
@@ -182,7 +182,7 @@ RSpec.shared_examples 'KotlincCompiler_CommonOptions' do
182
182
  compile_task.using(:optimize=>false)
183
183
  kotlinc_args.noOptimize.should be_true
184
184
  end
185
-
185
+
186
186
  it 'should set noStdlib option to true by default' do
187
187
  compile_task.options.noStdlib.should be_true
188
188
  kotlinc_args.noStdlib.should be_true
@@ -200,7 +200,7 @@ RSpec.shared_examples 'KotlincCompiler_CommonOptions' do
200
200
 
201
201
  it 'should not set other option by default' do
202
202
  compile_task.options.other.should be_nil
203
- end
203
+ end
204
204
 
205
205
  it 'should complain about options it doesn\'t know' do
206
206
  write 'source/Test.kt', 'class Test {}'
@@ -235,7 +235,7 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
235
235
  it 'requires present KOTLIN_HOME' do
236
236
  ENV['KOTLIN_HOME'].should_not be_nil
237
237
  end
238
-
238
+
239
239
  def compile_task
240
240
  @compile_task ||= define('foo').compile.using(:kotlinc)
241
241
  end
@@ -255,11 +255,11 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
255
255
  it 'requires absent KOTLIN_HOME' do
256
256
  ENV['KOTLIN_HOME'].should be_nil
257
257
  end
258
-
258
+
259
259
  def compile_task
260
260
  @compile_task ||= define('foo').compile.using(:kotlinc)
261
261
  end
262
-
262
+
263
263
  def kotlinc_args
264
264
  compile_task.instance_eval { @compiler }.send(:kotlinc_args)
265
265
  end
@@ -306,7 +306,7 @@ RSpec.shared_examples 'ArchiveTask' do
306
306
  inspect_archive.should be_empty
307
307
  end
308
308
  end
309
-
309
+
310
310
  it 'should merge archives, concatenate file contents' do
311
311
  @files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
312
312
  map do |dir|
@@ -320,7 +320,7 @@ RSpec.shared_examples 'ArchiveTask' do
320
320
  archive['test1.txt'].should eql(content_for('test1.txt') * @files.size)
321
321
  end
322
322
  end
323
-
323
+
324
324
  it 'should merge archives, transforming file contents' do
325
325
  @files = %w{foo1 foo2}.map { |folder| File.join(@dir, folder) }.
326
326
  map do |dir|
@@ -215,15 +215,15 @@ describe Repositories, 'remote_uri' do
215
215
  @local = @remote = @release_to = nil
216
216
  end
217
217
 
218
- @repos = [ 'https://oss.sonatype.org/', 'http://www.ibiblio.org/maven2', { :url => 'http://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
218
+ @repos = [ 'https://oss.sonatype.org/', { :url => 'https://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ]
219
219
  end
220
220
 
221
221
  it 'should convert remote to array of uri' do
222
- uri = URI.parse( 'http://repo1.maven.org/maven2' )
222
+ uri = URI.parse( 'https://repo1.maven.org/maven2' )
223
223
  uri.user = 'user'
224
224
  uri.password = 'password'
225
225
 
226
- uris = [ URI.parse( 'https://oss.sonatype.org/'), URI.parse( 'http://www.ibiblio.org/maven2' ), uri ]
226
+ uris = [ URI.parse( 'https://oss.sonatype.org/'), uri ]
227
227
 
228
228
  repositories.remote = @repos
229
229
  repositories.remote_uri.should eql(uris)
@@ -236,7 +236,7 @@ describe Repositories, 'mirrors' do
236
236
  @local = @remote = @release_to = @mirrors = nil
237
237
  end
238
238
 
239
- @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
239
+ @repos = %w(http://www.ibiblio.org/maven2 https://repo1.maven.org/maven2)
240
240
  end
241
241
 
242
242
  it 'should be empty initially' do
@@ -310,7 +310,7 @@ describe Repositories, 'remote' do
310
310
  @local = @remote = @release_to = nil
311
311
  end
312
312
 
313
- @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ]
313
+ @repos = %w(http://www.ibiblio.org/maven2 https://repo1.maven.org/maven2)
314
314
  end
315
315
 
316
316
  it 'should be empty initially' do
@@ -1214,13 +1214,6 @@ end
1214
1214
  describe Buildr, '#transitive' do
1215
1215
  before do
1216
1216
  repositories.remote = 'http://buildr.apache.org/repository/noexist'
1217
- write artifact('org.sonatype.oss:oss-parent:pom:8').pom.to_s, <<-XML
1218
- <project>
1219
- <artifactId>oss-parent</artifactId>
1220
- <groupId>org.sonatype.oss</groupId>
1221
- <version>8</version>
1222
- </project>
1223
- XML
1224
1217
 
1225
1218
  @simple = %w(saxon:saxon:jar:8.4 saxon:saxon-dom:jar:8.4 saxon:saxon-xpath:jar:8.4)
1226
1219
  @simple.map { |spec| artifact(spec).pom }.each { |task| write task.name, task.pom_xml.call }
@@ -363,11 +363,6 @@ describe Project, '#package' do
363
363
  <?xml version="1.0" encoding="UTF-8"?>
364
364
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
365
365
  <modelVersion>4.0.0</modelVersion>
366
- <parent>
367
- <groupId>org.sonatype.oss</groupId>
368
- <artifactId>oss-parent</artifactId>
369
- <version>8</version>
370
- </parent>
371
366
  <groupId>bar</groupId>
372
367
  <artifactId>foo</artifactId>
373
368
  <version>1.0</version>
@@ -18,7 +18,7 @@
18
18
  # that the code requires several artifacts. So we establish them first using the real local
19
19
  # repository and cache these across test cases.
20
20
  Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
21
- repositories.remote << 'http://repo1.maven.org/maven2'
21
+ repositories.remote << 'https://repo1.maven.org/maven2'
22
22
  repositories.remote << 'https://oss.sonatype.org/content/groups/scala-tools'
23
23
 
24
24
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: buildr
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.7
4
+ version: 1.5.8
5
5
  platform: java
6
6
  authors:
7
7
  - Apache Buildr
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-02-16 00:00:00.000000000 Z
11
+ date: 2019-07-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -346,6 +346,20 @@ dependencies:
346
346
  - - '='
347
347
  - !ruby/object:Gem::Version
348
348
  version: 1.2.1
349
+ - !ruby/object:Gem::Dependency
350
+ name: zapwhite
351
+ requirement: !ruby/object:Gem::Requirement
352
+ requirements:
353
+ - - '='
354
+ - !ruby/object:Gem::Version
355
+ version: 2.14.0
356
+ type: :development
357
+ prerelease: false
358
+ version_requirements: !ruby/object:Gem::Requirement
359
+ requirements:
360
+ - - '='
361
+ - !ruby/object:Gem::Version
362
+ version: 2.14.0
349
363
  description: |
350
364
  Apache Buildr is a build system for Java-based applications, including support
351
365
  for Scala, Groovy and a growing number of JVM languages and tools. We wanted
@@ -630,7 +644,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
630
644
  - !ruby/object:Gem::Version
631
645
  version: 1.8.6
632
646
  requirements: []
633
- rubyforge_project: buildr
647
+ rubyforge_project:
634
648
  rubygems_version: 2.5.1
635
649
  signing_key:
636
650
  specification_version: 4