fixed link to image for pdf, (#78)
updated spec build plugins,
dropped pointer to ca-parent, use common parent instead
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/spec/pom.xml b/spec/pom.xml
index 7bb0772..15ef070 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2019 Contributors to the Eclipse Foundation.
+ Copyright (c) 2019, 2020 Contributors to the Eclipse Foundation.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,11 +16,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
+
<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/maven-v4_0_0.xsd">
<parent>
- <groupId>jakarta.annotation</groupId>
- <artifactId>ca-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.ee4j</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0.6</version>
+ <relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,10 +38,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>
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0-M3</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -76,16 +76,6 @@
<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>
<version>${asciidoctorj.pdf.version}</version>
@@ -178,7 +168,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/annotations-spec.adoc b/spec/src/main/asciidoc/annotations-spec.adoc
index fea5dd1..5a46c65 100644
--- a/spec/src/main/asciidoc/annotations-spec.adoc
+++ b/spec/src/main/asciidoc/annotations-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 Annotations
@@ -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
