From 15524e275d538bf1a6f00cf775121c44f55f59de Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Thu, 16 Jul 2020 13:20:03 +0200
Subject: [PATCH] Fix broken image in pdf spec, update spec build plugins

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 spec/pom.xml                           | 22 +++++-----------------
 spec/src/main/asciidoc/jsonp-spec.adoc |  4 ++--
 spec/src/main/asciidoc/jsonp.adoc      |  4 ++++
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/spec/pom.xml b/spec/pom.xml
index 18b495db..be9a379b 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.6</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -33,10 +33,8 @@
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
-        <asciidoctor.maven.plugin.version>1.5.7.1</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>1.6.2</asciidoctorj.version>
-        <asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
-        <jruby.version>9.2.6.0</jruby.version>
+        <asciidoctor.maven.plugin.version>2.0.0</asciidoctor.maven.plugin.version>
+        <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
         <status>DRAFT</status>
         <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
@@ -85,16 +83,6 @@
                 <artifactId>asciidoctor-maven-plugin</artifactId>
                 <version>${asciidoctor.maven.plugin.version}</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.jruby</groupId>
-                        <artifactId>jruby-complete</artifactId>
-                        <version>${jruby.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>${asciidoctorj.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj-pdf</artifactId>
@@ -188,7 +176,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>
diff --git a/spec/src/main/asciidoc/jsonp-spec.adoc b/spec/src/main/asciidoc/jsonp-spec.adoc
index 446b390f..5077a929 100644
--- a/spec/src/main/asciidoc/jsonp-spec.adoc
+++ b/spec/src/main/asciidoc/jsonp-spec.adoc
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2017, 2019 Contributors to the Eclipse Foundation
+// Copyright (c) 2017, 2020 Contributors to the Eclipse Foundation
 //
 
 = Jakarta JSON Processing
@@ -16,7 +16,7 @@
 ifdef::backend-pdf[]
 :pagenums:
 :numbered:
-:title-logo-image: image:jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right]
+:title-logo-image: image:images/jakarta_ee_logo_schooner_color_stacked_default.png[pdfwidth=4.25in,align=right]
 endif::[]
 
 // == License
diff --git a/spec/src/main/asciidoc/jsonp.adoc b/spec/src/main/asciidoc/jsonp.adoc
index 294b9167..e33e8ff1 100644
--- a/spec/src/main/asciidoc/jsonp.adoc
+++ b/spec/src/main/asciidoc/jsonp.adoc
@@ -1,3 +1,7 @@
+//
+// Copyright (c) 2018, 2020 Contributors to the Eclipse Foundation
+//
+
 == Introduction
 
 Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.