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/14 10:55:23 UTC
[buildr] branch master updated (a8377d4 -> 8d560b4)
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 a8377d4 Explicitly specify the `:sourcepath` parameter for javadoc tool
new 4e8b504 Rollback addition of guard that causes several tests to fail
new e44c9f9 Avoid referencing deprecated parent POM org.sonatype.oss:oss-parent:8
new 8d560b4 Fix setting of sourcepath
The 3 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 | 3 +++
lib/buildr/java/custom_pom.rb | 5 -----
lib/buildr/java/doc.rb | 2 +-
lib/buildr/packaging/artifact.rb | 6 +++---
spec/java/custom_pom_spec.rb | 7 -------
spec/packaging/artifact_spec.rb | 7 -------
spec/packaging/packaging_spec.rb | 5 -----
7 files changed, 7 insertions(+), 28 deletions(-)
[buildr] 02/03: Avoid referencing deprecated parent POM
org.sonatype.oss:oss-parent:8
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 e44c9f959d0af63e8cce33d3ca4e5e4f9b20f5a0
Author: Peter Donald <pe...@realityforge.org>
AuthorDate: Sun Jul 14 14:49:30 2019 +1000
Avoid referencing deprecated parent POM org.sonatype.oss:oss-parent:8
---
CHANGELOG | 3 +++
lib/buildr/java/custom_pom.rb | 5 -----
spec/java/custom_pom_spec.rb | 7 -------
spec/packaging/artifact_spec.rb | 7 -------
spec/packaging/packaging_spec.rb | 5 -----
5 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 96d7796..33da200 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,9 @@
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
+ 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.
1.5.7 (2019-02-16)
* Fixed: The fix that allowed special characters in usernames and passwords was only partially applied
diff --git a/lib/buildr/java/custom_pom.rb b/lib/buildr/java/custom_pom.rb
index 9470dce..4be9eb0 100644
--- a/lib/buildr/java/custom_pom.rb
+++ b/lib/buildr/java/custom_pom.rb
@@ -170,11 +170,6 @@ module Buildr
'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') do
xml.modelVersion '4.0.0'
- xml.parent do
- xml.groupId 'org.sonatype.oss'
- xml.artifactId 'oss-parent'
- xml.version '8'
- end
xml.groupId project.group
xml.artifactId project.id
xml.version project.version
diff --git a/spec/java/custom_pom_spec.rb b/spec/java/custom_pom_spec.rb
index 1e0995e..7947293 100644
--- a/spec/java/custom_pom_spec.rb
+++ b/spec/java/custom_pom_spec.rb
@@ -98,13 +98,6 @@ describe Buildr::CustomPom do
#$stderr.puts @pom_xml.to_s
end
- it 'has correct static metadata' do
- @pom_xml.should match_xpath('/project/modelVersion', '4.0.0')
- @pom_xml.should match_xpath('/project/parent/groupId', 'org.sonatype.oss')
- @pom_xml.should match_xpath('/project/parent/artifactId', 'oss-parent')
- @pom_xml.should match_xpath('/project/parent/version', '8')
- end
-
it 'has correct project level metadata' do
@pom_xml.should match_xpath('/project/groupId', 'org.myproject')
@pom_xml.should match_xpath('/project/artifactId', 'foo')
diff --git a/spec/packaging/artifact_spec.rb b/spec/packaging/artifact_spec.rb
index 54abe3d..b3bab78 100644
--- a/spec/packaging/artifact_spec.rb
+++ b/spec/packaging/artifact_spec.rb
@@ -1214,13 +1214,6 @@ end
describe Buildr, '#transitive' do
before do
repositories.remote = 'http://buildr.apache.org/repository/noexist'
- write artifact('org.sonatype.oss:oss-parent:pom:8').pom.to_s, <<-XML
-<project>
- <artifactId>oss-parent</artifactId>
- <groupId>org.sonatype.oss</groupId>
- <version>8</version>
-</project>
-XML
@simple = %w(saxon:saxon:jar:8.4 saxon:saxon-dom:jar:8.4 saxon:saxon-xpath:jar:8.4)
@simple.map { |spec| artifact(spec).pom }.each { |task| write task.name, task.pom_xml.call }
diff --git a/spec/packaging/packaging_spec.rb b/spec/packaging/packaging_spec.rb
index a2b6029..be6a66a 100644
--- a/spec/packaging/packaging_spec.rb
+++ b/spec/packaging/packaging_spec.rb
@@ -363,11 +363,6 @@ describe Project, '#package' do
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>8</version>
- </parent>
<groupId>bar</groupId>
<artifactId>foo</artifactId>
<version>1.0</version>
[buildr] 01/03: Rollback addition of guard that causes several
tests to fail
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 4e8b504bc225a216c97ef2482cbf661226b4d234
Author: Peter Donald <pe...@realityforge.org>
AuthorDate: Sun Jul 14 14:39:59 2019 +1000
Rollback addition of guard that causes several tests to fail
---
lib/buildr/packaging/artifact.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/buildr/packaging/artifact.rb b/lib/buildr/packaging/artifact.rb
index 27f87be..4b8894c 100644
--- a/lib/buildr/packaging/artifact.rb
+++ b/lib/buildr/packaging/artifact.rb
@@ -130,7 +130,7 @@ module Buildr #:nodoc:
def sources_artifact
sources_spec = to_spec_hash.merge(:classifier=>'sources')
sources_task = OptionalArtifact.define_task(Buildr.repositories.locate(sources_spec))
- sources_task.send :apply_spec, sources_spec if sources_task.respond_to?(:apply_spec)
+ sources_task.send :apply_spec, sources_spec
sources_task
end
@@ -141,7 +141,7 @@ module Buildr #:nodoc:
def javadoc_artifact
javadoc_spec = to_spec_hash.merge(:classifier=>'javadoc')
javadoc_task = OptionalArtifact.define_task(Buildr.repositories.locate(javadoc_spec))
- javadoc_task.send :apply_spec, javadoc_spec if javadoc_task.respond_to?(:apply_spec)
+ javadoc_task.send :apply_spec, javadoc_spec
javadoc_task
end
@@ -153,7 +153,7 @@ module Buildr #:nodoc:
def annotations_artifact
annotations_spec = to_spec_hash.merge(:classifier=>'annotations')
annotations_task = OptionalArtifact.define_task(Buildr.repositories.locate(annotations_spec))
- annotations_task.send :apply_spec, annotations_spec if annotations_task.respond_to?(:apply_spec)
+ annotations_task.send :apply_spec, annotations_spec
annotations_task
end
[buildr] 03/03: Fix setting of sourcepath
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 8d560b48b9c25ef056732f8260ecefc7c16ad6e9
Author: Peter Donald <pe...@realityforge.org>
AuthorDate: Sun Jul 14 20:55:15 2019 +1000
Fix setting of sourcepath
This updates change applied in a8377d49dfa2c50e72a9159bc6d1c854c6a83e8d
to work in more scenarios.
---
lib/buildr/java/doc.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/buildr/java/doc.rb b/lib/buildr/java/doc.rb
index 3dfca28..d684cc1 100644
--- a/lib/buildr/java/doc.rb
+++ b/lib/buildr/java/doc.rb
@@ -24,7 +24,7 @@ module Buildr #:nodoc:
if project.doc.engine? Javadoc
options = project.doc.options
options[:windowtitle] = (project.comment || project.name) unless options[:windowtitle]
- options[:sourcepath] = project.compile.sources.join(File::PATH_SEPARATOR) unless options[:sourcepath]
+ project.doc.sourcepath = project.compile.sources.dup if project.doc.sourcepath.empty?
end
end
end