Skip to content

Commit 0694f4f

Browse files
KyleAureKyleAure
committed
fix assembly and build
1 parent e4bf322 commit 0694f4f

4 files changed

Lines changed: 34 additions & 29 deletions

File tree

‎tck-dist/pom.xml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2022, 2026 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -39,15 +39,10 @@
3939
<asciidoctorj.diagram.version>2.1.2</asciidoctorj.diagram.version>
4040
<asciidoctor.maven.plugin.version>2.1.0</asciidoctor.maven.plugin.version>
4141
<jruby.version>9.2.21.0</jruby.version>
42+
<jakarta.jsonb.tck.version>3.1.0</jakarta.jsonb.tck.version>
4243
</properties>
4344

4445
<dependencies>
45-
<dependency>
46-
<groupId>jakarta.json.bind</groupId>
47-
<artifactId>jakarta.json.bind-tck-ug</artifactId>
48-
<version>${project.version}</version>
49-
<type>zip</type>
50-
</dependency>
5146
<dependency>
5247
<groupId>jakarta.json.bind</groupId>
5348
<artifactId>jakarta.json.bind-tck</artifactId>
@@ -145,7 +140,7 @@
145140
<configuration>
146141
<backend>html5</backend>
147142
<outputFile>
148-
${project.build.directory}/generated-docs/jsonb-tck-reference-guide-${jakarta.data.tck.version}.html</outputFile>
143+
${project.build.directory}/generated-docs/jsonb-tck-reference-guide-${jakarta.jsonb.tck.version}.html</outputFile>
149144
</configuration>
150145
</execution>
151146
<execution>
@@ -157,14 +152,12 @@
157152
<configuration>
158153
<backend>pdf</backend>
159154
<outputFile>
160-
${project.build.directory}/generated-docs/jsonb-tck-reference-guide-${jakarta.data.tck.version}.pdf</outputFile>
155+
${project.build.directory}/generated-docs/jsonb-tck-reference-guide-${jakarta.jsonb.tck.version}.pdf</outputFile>
161156
</configuration>
162157
</execution>
163158
</executions>
164159
<configuration>
165-
<toc>left</toc>
166160
<sourceDocumentName>jsonb-tck-reference-guide.adoc</sourceDocumentName>
167-
<sourceHighlighter>coderay</sourceHighlighter>
168161
<skip>${maven.adoc.skip}</skip>
169162
</configuration>
170163
</plugin>

‎tck-dist/src/main/asciidoc/jsonb-tck-reference-guide.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= Jakarta JSON Binding TCK Reference Guide
2-
:author: Kyle Aure
2+
:author: JSONB Development Team
33
:email: jsonb-dev@eclipse.org
44
:revnumber: 1.0
55
:toc:

‎tck-dist/src/main/assembly/assembly.xml‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2022, 2026 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,32 +17,49 @@
1717
1818
-->
1919

20-
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
20+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
23+
2224
<id>distribution</id>
23-
<baseDirectory>jsonb-tck</baseDirectory>
2425
<formats>
2526
<format>zip</format>
2627
</formats>
2728

2829
<files>
2930
<!-- license -->
3031
<file>
31-
<source>${project.basedir}/src/main/resources/LICENSE_${license}.md</source>
32+
<source>src/main/resources/LICENSE_${license}.md</source>
3233
<destName>LICENSE.md</destName>
3334
</file>
35+
<!-- The readme included in the distribution zip -->
36+
<file>
37+
<source>src/main/readme/README.md</source>
38+
<destName>README.md</destName>
39+
</file>
3440
</files>
3541
<fileSets>
42+
<!-- The artifacts -->
3643
<fileSet>
37-
<directory>${project.build.scriptSourceDirectory}</directory>
44+
<directory>src/main/artifacts</directory>
3845
<outputDirectory>artifacts</outputDirectory>
3946
<fileMode>755</fileMode>
4047
<includes>
4148
<include>**/*.sh</include>
4249
</includes>
4350
</fileSet>
51+
<!-- The docs -->
52+
<fileSet>
53+
<directory>target/generated-docs</directory>
54+
<outputDirectory>/docs</outputDirectory>
55+
<includes>
56+
<include>**/*.html</include>
57+
<include>**/*.pdf</include>
58+
</includes>
59+
</fileSet>
60+
<!-- The starter -->
4461
<fileSet>
45-
<directory>${project.basedir}/src/main/bin</directory>
62+
<directory>src/main/bin</directory>
4663
<outputDirectory>bin</outputDirectory>
4764
<includes>
4865
<include>**/*.xml</include>
@@ -59,13 +76,5 @@
5976
<outputDirectory>artifacts</outputDirectory>
6077
<useProjectArtifact>false</useProjectArtifact>
6178
</dependencySet>
62-
<dependencySet>
63-
<includes>
64-
<include>jakarta.json.bind:jakarta.json.bind-tck-ug</include>
65-
</includes>
66-
<unpack>true</unpack>
67-
<outputDirectory>.</outputDirectory>
68-
</dependencySet>
6979
</dependencySets>
70-
71-
</assembly>
80+
</assembly>

‎tck-dist/src/main/bin/pom.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2022, 2026 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,12 +18,15 @@
1818
-->
1919
<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">
2020
<modelVersion>4.0.0</modelVersion>
21+
22+
<!-- TODO update to Jakarta JSON Binding Parent -->
2123
<parent>
2224
<groupId>org.eclipse.ee4j</groupId>
2325
<artifactId>project</artifactId>
2426
<version>1.0.7</version>
2527
<relativePath/>
2628
</parent>
29+
2730
<groupId>jakarta.json.bind</groupId>
2831
<artifactId>jakarta.json.bind-tck-tests</artifactId>
2932
<version>${project.version}</version>

0 commit comments

Comments
 (0)