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>
