You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2019/07/16 04:26:57 UTC
[buildr] branch master updated (6b26478 -> 7cd6cef)
This is an automated email from the ASF dual-hosted git repository.
donaldp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/buildr.git.
from 6b26478 Remove some more references to rubyforge
new 7728e04 Spelling
new 7cd6cef Fix crash bug when generating IDEA modules
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG | 7 ++++++-
lib/buildr/ide/idea.rb | 8 ++++----
2 files changed, 10 insertions(+), 5 deletions(-)
[buildr] 01/02: Spelling
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
donaldp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildr.git
commit 7728e043508e0af6fda8e72fdb4b0820eed1a5ed
Author: Peter Donald <pe...@realityforge.org>
AuthorDate: Tue Jul 16 13:56:49 2019 +1000
Spelling
---
CHANGELOG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 7dea3a4..ee0b9da 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,7 +12,7 @@
can be specified by modifying the `project.iml.annotation_paths` property.
* Fixed: Explicitly specify the `:sourcepath` parameter for javadoc tool. This enables additional parameters
such as `-packagenames` and `-subpackages` to be passed to the underling tool.
-* Fixed: Stop generating poms with the parent POM `org.sonatype.oss:oss-parent:8`. The las update was a long time
+* Fixed: Stop generating poms with the parent POM `org.sonatype.oss:oss-parent:8`. The last update was a long time
ago (i.e. 2012) and it is no longer maintained. It was also deprecated several years ago and is not
guaranteed to work in modern Maven deployments.
[buildr] 02/02: Fix crash bug when generating IDEA modules
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
donaldp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildr.git
commit 7cd6cef9035834097a1c15774c67ebb5adf7f009
Author: Peter Donald <pe...@realityforge.org>
AuthorDate: Tue Jul 16 14:26:42 2019 +1000
Fix crash bug when generating IDEA modules
This was a long existing bug but was exacerbated by 1.5.8 release
---
CHANGELOG | 5 +++++
lib/buildr/ide/idea.rb | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index ee0b9da..2fe7054 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
1.5.9 (Pending)
+* Fixed: Prior to `1.5.8`, generating IntelliJ IDEA modules could generate a failure if the project included
+ a dependency defined by a `JarTask` that specified a non-nil classifier. This failure scenario is now
+ much more frequent given the changes to support external annotations that are packaged as jars. This
+ crash is now avoided by changing guard from `artifact.respond_to?(:to_spec_hash)` to
+ `artifact.is_a?(Buildr::Artifact)`.
1.5.8 (2019-07-14)
* Fixed: Changed references to `https://repo1.maven.org/maven2` to use https where possible.
diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb
index e1038ba..6aac75f 100644
--- a/lib/buildr/ide/idea.rb
+++ b/lib/buildr/ide/idea.rb
@@ -483,12 +483,12 @@ module Buildr #:nodoc:
export = true
source_path = nil
annotations_path = nil
- if d.respond_to?(:to_spec_hash)
+ if d.is_a?(Buildr::Artifact)
source_spec = d.to_spec_hash.merge(:classifier => 'sources')
source_path = Buildr.artifact(source_spec).to_s
source_path = nil unless File.exist?(source_path)
end
- if d.respond_to?(:to_spec_hash)
+ if d.is_a?(Buildr::Artifact)
annotations_spec = d.to_spec_hash.merge(:classifier => 'annotations')
annotations_path = Buildr.artifact(annotations_spec).to_s
annotations_path = nil unless File.exist?(annotations_path)
@@ -505,12 +505,12 @@ module Buildr #:nodoc:
export = main_dependencies_paths.include?(dependency_path)
source_path = nil
annotations_path = nil
- if d.respond_to?(:to_spec_hash)
+ if d.is_a?(Buildr::Artifact)
source_spec = d.to_spec_hash.merge(:classifier => 'sources')
source_path = Buildr.artifact(source_spec).to_s
source_path = nil unless File.exist?(source_path)
end
- if d.respond_to?(:to_spec_hash)
+ if d.is_a?(Buildr::Artifact)
annotations_spec = d.to_spec_hash.merge(:classifier => 'annotations')
annotations_path = Buildr.artifact(annotations_spec).to_s
annotations_path = nil unless File.exist?(annotations_path)