Skip to content
This repository was archived by the owner on Nov 7, 2024. It is now read-only.

Commit 89a08a9

Browse files
lukasjm0mus
lukasj
authored and
m0mus
committed
fix packaging/CTS failures (#83)
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
1 parent 72f6b3a commit 89a08a9

File tree

19 files changed

+431
-151
lines changed

19 files changed

+431
-151
lines changed

‎api/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2011-2017 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2011-2018 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -81,7 +81,7 @@
8181
</group>
8282
</groups>
8383
<bottom>
84-
<![CDATA[Copyright &#169; 2012-2017,
84+
<![CDATA[Copyright &#169; 2012-2018,
8585
<a href="http://www.oracle.com">Oracle</a>
8686
and/or its affiliates. All Rights Reserved.
8787
Use is subject to

‎api/src/main/java/javax/json/JsonArrayBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2013-2018 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
@@ -94,7 +94,7 @@
9494
* </code>
9595
* </pre>
9696
*
97-
* <p>This class does <em>not</em> allow <tt>null</tt> to be used as a
97+
* <p>This class does <em>not</em> allow <code>null</code> to be used as a
9898
* value while building the JSON array
9999
*
100100
* @see JsonObjectBuilder

‎api/src/main/java/javax/json/JsonException.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2011-2017 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2011-2018 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
@@ -67,7 +67,7 @@ public JsonException(String message) {
6767
* @param message the detail message (which is saved for later retrieval
6868
* by the {@link #getMessage()} method).
6969
* @param cause the cause (which is saved for later retrieval by the
70-
* {@link #getCause()} method). (A <tt>null</tt> value is
70+
* {@link #getCause()} method). (A <code>null</code> value is
7171
* permitted, and indicates that the cause is nonexistent or
7272
* unknown.)
7373
*/

‎api/src/main/java/javax/json/JsonObjectBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2013-2018 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
@@ -110,7 +110,7 @@
110110
* </code>
111111
* </pre>
112112
*
113-
* <p>This class does <em>not</em> allow <tt>null</tt> to be used as a name or
113+
* <p>This class does <em>not</em> allow <code>null</code> to be used as a name or
114114
* value while building the JSON object
115115
*
116116
* @see JsonArrayBuilder

‎api/src/main/java/javax/json/stream/JsonGenerationException.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2012-2018 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
@@ -69,7 +69,7 @@ public JsonGenerationException(String message) {
6969
* @param message the detail message (which is saved for later retrieval
7070
* by the {@link #getMessage()} method).
7171
* @param cause the cause (which is saved for later retrieval by the
72-
* {@link #getCause()} method). (A <tt>null</tt> value is
72+
* {@link #getCause()} method). (A <code>null</code> value is
7373
* permitted, and indicates that the cause is nonexistent or
7474
* unknown.)
7575
*/

‎api/src/main/java/javax/json/stream/JsonParsingException.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2012-2018 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
@@ -73,7 +73,7 @@ public JsonParsingException(String message, JsonLocation location) {
7373
* @param message the detail message (which is saved for later retrieval
7474
* by the {@link #getMessage()} method).
7575
* @param cause the cause (which is saved for later retrieval by the
76-
* {@link #getCause()} method). (A <tt>null</tt> value is
76+
* {@link #getCause()} method). (A <code>null</code> value is
7777
* permitted, and indicates that the cause is nonexistent or
7878
* unknown.)
7979
* @param location the location of the incorrect JSON

‎bundles/ri/pom.xml

+81-46
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2012-2018 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development
@@ -50,7 +50,7 @@
5050
</parent>
5151

5252
<artifactId>json-ri-bundle</artifactId>
53-
<name>RI bundle</name>
53+
<name>RI Distribution zip bundle</name>
5454
<packaging>pom</packaging>
5555

5656
<dependencies>
@@ -62,50 +62,85 @@
6262
<groupId>org.glassfish</groupId>
6363
<artifactId>javax.json</artifactId>
6464
</dependency>
65+
<dependency>
66+
<groupId>org.glassfish</groupId>
67+
<artifactId>javax.json</artifactId>
68+
<classifier>module</classifier>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.glassfish</groupId>
72+
<artifactId>jsonp-jaxrs</artifactId>
73+
</dependency>
6574
</dependencies>
66-
<build>
67-
<plugins>
68-
<plugin>
69-
<groupId>org.apache.maven.plugins</groupId>
70-
<artifactId>maven-dependency-plugin</artifactId>
71-
<executions>
72-
<execution>
73-
<id>copy</id>
74-
<phase>generate-sources</phase>
75-
<goals>
76-
<goal>copy-dependencies</goal>
77-
</goals>
78-
<configuration>
79-
<stripVersion>false</stripVersion>
80-
<outputDirectory>${assembly.directory}</outputDirectory>
81-
</configuration>
82-
</execution>
83-
</executions>
84-
</plugin>
85-
<plugin>
86-
<artifactId>maven-assembly-plugin</artifactId>
87-
<configuration>
88-
<finalName>javax.json-ri-${impl_version}</finalName>
89-
<descriptors>
90-
<descriptor>src/main/assembly/archive.xml</descriptor>
91-
</descriptors>
92-
<appendAssemblyId>false</appendAssemblyId>
93-
</configuration>
94-
<executions>
95-
<execution>
96-
<id>make-assembly</id> <!-- this is used for inheritance merges -->
97-
<phase>package</phase> <!-- append to the packaging phase. -->
98-
<goals>
99-
<goal>single</goal> <!-- goals == mojos -->
100-
</goals>
101-
</execution>
102-
</executions>
103-
</plugin>
104-
</plugins>
105-
</build>
106-
107-
<properties>
108-
<assembly.directory>${project.build.directory}/assembly</assembly.directory>
109-
</properties>
11075

76+
<profiles>
77+
<profile>
78+
<!-- this profile is just for making build running on JDK 8 happy -->
79+
<id>default-setup</id>
80+
<activation>
81+
<jdk>(,9)</jdk>
82+
<activeByDefault>true</activeByDefault>
83+
</activation>
84+
<build>
85+
<plugins>
86+
<plugin>
87+
<artifactId>maven-assembly-plugin</artifactId>
88+
<executions>
89+
<execution>
90+
<id>make-assembly-jdk8</id>
91+
<phase>package</phase>
92+
<goals>
93+
<goal>single</goal>
94+
</goals>
95+
<configuration>
96+
<finalName>javax.json-ri-jdk8-${impl_version}</finalName>
97+
<descriptors>
98+
<descriptor>src/main/assembly/archive-jdk8.xml</descriptor>
99+
</descriptors>
100+
<appendAssemblyId>false</appendAssemblyId>
101+
</configuration>
102+
</execution>
103+
</executions>
104+
</plugin>
105+
</plugins>
106+
</build>
107+
</profile>
108+
<profile>
109+
<id>jdk9-setup</id>
110+
<activation>
111+
<jdk>[9,)</jdk>
112+
</activation>
113+
<dependencies>
114+
<dependency>
115+
<groupId>org.glassfish</groupId>
116+
<artifactId>javax.json</artifactId>
117+
<classifier>module</classifier>
118+
<version>${project.version}</version>
119+
</dependency>
120+
</dependencies>
121+
<build>
122+
<plugins>
123+
<plugin>
124+
<artifactId>maven-assembly-plugin</artifactId>
125+
<executions>
126+
<execution>
127+
<id>make-assembly</id>
128+
<phase>package</phase>
129+
<goals>
130+
<goal>single</goal>
131+
</goals>
132+
<configuration>
133+
<finalName>javax.json-ri-${impl_version}</finalName>
134+
<descriptors>
135+
<descriptor>src/main/assembly/archive.xml</descriptor>
136+
</descriptors>
137+
<appendAssemblyId>false</appendAssemblyId>
138+
</configuration>
139+
</execution>
140+
</executions>
141+
</plugin>
142+
</plugins>
143+
</build>
144+
</profile>
145+
</profiles>
111146
</project>

‎bundles/ri/src/main/assembly/archive-jdk8.xml

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<!--
2+
3+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4+
5+
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
6+
7+
The contents of this file are subject to the terms of either the GNU
8+
General Public License Version 2 only ("GPL") or the Common Development
9+
and Distribution License("CDDL") (collectively, the "License"). You
10+
may not use this file except in compliance with the License. You can
11+
obtain a copy of the License at
12+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
13+
or LICENSE.txt. See the License for the specific
14+
language governing permissions and limitations under the License.
15+
16+
When distributing the software, include this License Header Notice in each
17+
file and include the License file at LICENSE.txt.
18+
19+
GPL Classpath Exception:
20+
Oracle designates this particular file as subject to the "Classpath"
21+
exception as provided by Oracle in the GPL Version 2 section of the License
22+
file that accompanied this code.
23+
24+
Modifications:
25+
If applicable, add the following below the License Header, with the fields
26+
enclosed by brackets [] replaced by your own identifying information:
27+
"Portions Copyright [year] [name of copyright owner]"
28+
29+
Contributor(s):
30+
If you wish your version of this file to be governed by only the CDDL or
31+
only the GPL Version 2, indicate your decision by adding "[Contributor]
32+
elects to include this software in this distribution under the [CDDL or GPL
33+
Version 2] license." If you don't indicate a single choice of license, a
34+
recipient has the option to distribute your version of this file under
35+
either the CDDL, the GPL Version 2 or to extend the choice of license to
36+
its licensees as provided above. However, if you add GPL Version 2 code
37+
and therefore, elected the GPL Version 2 license, then the option applies
38+
only if the new code is made subject to such option by the copyright
39+
holder.
40+
41+
-->
42+
43+
<assembly>
44+
<id>dist</id>
45+
<formats>
46+
<format>zip</format>
47+
</formats>
48+
<files>
49+
<file>
50+
<source>src/main/resources/README.txt</source>
51+
<outputDirectory></outputDirectory>
52+
<filtered>true</filtered>
53+
</file>
54+
<file>
55+
<source>src/main/resources/LICENSE.txt</source>
56+
<outputDirectory></outputDirectory>
57+
</file>
58+
</files>
59+
<dependencySets>
60+
<dependencySet>
61+
<useProjectArtifact>false</useProjectArtifact>
62+
<outputDirectory>api</outputDirectory>
63+
<includes>
64+
<include>javax.json:javax.json-api:*</include>
65+
</includes>
66+
</dependencySet>
67+
<dependencySet>
68+
<useProjectArtifact>false</useProjectArtifact>
69+
<outputDirectory>standalone</outputDirectory>
70+
<includes>
71+
<include>org.glassfish:javax.json</include>
72+
</includes>
73+
<excludes>
74+
<exclude>org.glassfish:javax.json:jar:module:*</exclude>
75+
</excludes>
76+
</dependencySet>
77+
<dependencySet>
78+
<useProjectArtifact>false</useProjectArtifact>
79+
<outputDirectory>jaxrs</outputDirectory>
80+
<includes>
81+
<include>org.glassfish:jsonp-jaxrs*</include>
82+
</includes>
83+
</dependencySet>
84+
</dependencySets>
85+
</assembly>

0 commit comments

Comments
 (0)