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

Commit deca68d

Browse files
lukasjm0mus
lukasj
authored and
m0mus
committed
fixes #53: org.glassfish.java.json does not include or export javax.json APIs (#66)
* #53: module org.glassfish.java.json does not include or export javax.json APIs Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com> * remove commented code Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
1 parent df8105c commit deca68d

File tree

9 files changed

+346
-105
lines changed

9 files changed

+346
-105
lines changed

‎api/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@
5858
<name>JSR 374 (JSON Processing) API</name>
5959
<description>API module of JSR 374:Java API for Processing JSON</description>
6060
<url>https://javaee.github.io/jsonp</url>
61+
62+
<properties>
63+
<packages.export>javax.json.*</packages.export>
64+
</properties>
65+
6166
<build>
6267
<plugins>
6368
<plugin>
@@ -138,7 +143,7 @@
138143
<Implementation-Version>${spec.implementation.version}</Implementation-Version>
139144
<Specification-Version>${spec.specification.version}</Specification-Version>
140145
<Export-Package>${packages.export}</Export-Package>
141-
<Bundle-Description>Java API for JSON Processing (JSON-P) ${spec.version}</Bundle-Description>
146+
<Bundle-Description>Java API for JSON Processing (JSON-P) ${spec_version}</Bundle-Description>
142147
</instructions>
143148
</configuration>
144149
</plugin>

‎bundles/bundle/pom.xml

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5+
6+
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
7+
8+
The contents of this file are subject to the terms of either the GNU
9+
General Public License Version 2 only ("GPL") or the Common Development
10+
and Distribution License("CDDL") (collectively, the "License"). You
11+
may not use this file except in compliance with the License. You can
12+
obtain a copy of the License at
13+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14+
or LICENSE.txt. See the License for the specific
15+
language governing permissions and limitations under the License.
16+
17+
When distributing the software, include this License Header Notice in each
18+
file and include the License file at LICENSE.txt.
19+
20+
GPL Classpath Exception:
21+
Oracle designates this particular file as subject to the "Classpath"
22+
exception as provided by Oracle in the GPL Version 2 section of the License
23+
file that accompanied this code.
24+
25+
Modifications:
26+
If applicable, add the following below the License Header, with the fields
27+
enclosed by brackets [] replaced by your own identifying information:
28+
"Portions Copyright [year] [name of copyright owner]"
29+
30+
Contributor(s):
31+
If you wish your version of this file to be governed by only the CDDL or
32+
only the GPL Version 2, indicate your decision by adding "[Contributor]
33+
elects to include this software in this distribution under the [CDDL or GPL
34+
Version 2] license." If you don't indicate a single choice of license, a
35+
recipient has the option to distribute your version of this file under
36+
either the CDDL, the GPL Version 2 or to extend the choice of license to
37+
its licensees as provided above. However, if you add GPL Version 2 code
38+
and therefore, elected the GPL Version 2 license, then the option applies
39+
only if the new code is made subject to such option by the copyright
40+
holder.
41+
42+
-->
43+
44+
<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">
45+
<modelVersion>4.0.0</modelVersion>
46+
47+
<parent>
48+
<groupId>org.glassfish</groupId>
49+
<artifactId>json</artifactId>
50+
<version>1.2-SNAPSHOT</version>
51+
<relativePath>../../pom.xml</relativePath>
52+
</parent>
53+
54+
<groupId>org.glassfish</groupId>
55+
<artifactId>javax.json</artifactId>
56+
<packaging>bundle</packaging>
57+
<version>1.2-SNAPSHOT</version>
58+
<name>JSR 374 (JSON Processing) API + Impl Bundle</name>
59+
<description>Default provider for JSR 374:Java API for Processing JSON</description>
60+
<url>https://javaee.github.io/jsonp</url>
61+
62+
<properties>
63+
<packages.private>org.glassfish.json</packages.private>
64+
<packages.export>javax.json.*,org.glassfish.json.api</packages.export>
65+
</properties>
66+
67+
<build>
68+
<plugins>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-dependency-plugin</artifactId>
72+
<executions>
73+
<execution>
74+
<id>unpack-dependency-src</id>
75+
<phase>generate-sources</phase>
76+
<goals>
77+
<goal>unpack-dependencies</goal>
78+
</goals>
79+
<configuration>
80+
<outputDirectory>${project.build.directory}/generated-sources/jsonp-src</outputDirectory>
81+
<classifier>sources</classifier>
82+
<excludes>module-info.java,META-INF/**,**/*.properties</excludes>
83+
</configuration>
84+
</execution>
85+
<execution>
86+
<id>unpack-dependency-resrc</id>
87+
<phase>generate-resources</phase>
88+
<goals>
89+
<goal>unpack-dependencies</goal>
90+
</goals>
91+
<configuration>
92+
<outputDirectory>${project.build.directory}/generated-sources/jsonp-resources</outputDirectory>
93+
<classifier>sources</classifier>
94+
<excludes>**/*.java,META-INF/**</excludes>
95+
</configuration>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.codehaus.mojo</groupId>
101+
<artifactId>build-helper-maven-plugin</artifactId>
102+
<executions>
103+
<execution>
104+
<id>add-source</id>
105+
<phase>generate-sources</phase>
106+
<goals>
107+
<goal>add-source</goal>
108+
</goals>
109+
<configuration>
110+
<sources>
111+
<source>${project.build.directory}/generated-sources/jsonp-src</source>
112+
</sources>
113+
</configuration>
114+
</execution>
115+
<execution>
116+
<id>add-resource</id>
117+
<phase>generate-resources</phase>
118+
<goals>
119+
<goal>add-resource</goal>
120+
</goals>
121+
<configuration>
122+
<resources>
123+
<resource>
124+
<directory>${project.build.directory}/generated-sources/jsonp-resources</directory>
125+
</resource>
126+
</resources>
127+
</configuration>
128+
</execution>
129+
</executions>
130+
</plugin>
131+
<plugin>
132+
<groupId>org.glassfish.build</groupId>
133+
<artifactId>spec-version-maven-plugin</artifactId>
134+
<configuration>
135+
<spec>
136+
<nonFinal>${non.final}</nonFinal>
137+
<jarType>impl</jarType>
138+
<specVersion>${spec_version}</specVersion>
139+
<newSpecVersion>${new_spec_version}</newSpecVersion>
140+
<specImplVersion>${new_spec_impl_version}</specImplVersion>
141+
<implVersion>${impl_version}</implVersion>
142+
<newImplVersion>${new_impl_version}</newImplVersion>
143+
<apiPackage>${api_package}</apiPackage>
144+
<implNamespace>${impl_namespace}</implNamespace>
145+
</spec>
146+
</configuration>
147+
<executions>
148+
<execution>
149+
<goals>
150+
<goal>set-spec-properties</goal>
151+
<goal>check-module</goal>
152+
</goals>
153+
</execution>
154+
</executions>
155+
</plugin>
156+
<plugin>
157+
<groupId>org.apache.maven.plugins</groupId>
158+
<artifactId>maven-javadoc-plugin</artifactId>
159+
<executions>
160+
<execution>
161+
<id>attach-javadocs</id>
162+
<goals>
163+
<goal>jar</goal>
164+
</goals>
165+
</execution>
166+
</executions>
167+
</plugin>
168+
<!--
169+
This plugin is reponsible for packaging artifacts
170+
as OSGi bundles. Please refer to
171+
http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
172+
for more information about how to use this plugin.
173+
-->
174+
<plugin>
175+
<groupId>org.apache.felix</groupId>
176+
<artifactId>maven-bundle-plugin</artifactId>
177+
<extensions>true</extensions>
178+
<configuration>
179+
<excludeDependencies>true</excludeDependencies>
180+
<instructions>
181+
<Bundle-Version>${spec.bundle.version}</Bundle-Version>
182+
<Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
183+
<Extension-Name>${spec.extension.name}</Extension-Name>
184+
<Implementation-Version>${spec.implementation.version}</Implementation-Version>
185+
<Specification-Version>${spec.specification.version}</Specification-Version>
186+
<Export-Package>${packages.export}</Export-Package>
187+
<Private-Package>${packages.private}</Private-Package>
188+
</instructions>
189+
</configuration>
190+
</plugin>
191+
</plugins>
192+
</build>
193+
<dependencies>
194+
<dependency>
195+
<groupId>javax.json</groupId>
196+
<artifactId>javax.json-api</artifactId>
197+
<scope>provided</scope>
198+
</dependency>
199+
<dependency>
200+
<groupId>org.glassfish</groupId>
201+
<artifactId>java.json</artifactId>
202+
<scope>provided</scope>
203+
</dependency>
204+
</dependencies>
205+
206+
<profiles>
207+
<profile>
208+
<id>jdk9-setup</id>
209+
<activation>
210+
<jdk>9</jdk>
211+
</activation>
212+
<build>
213+
<plugins>
214+
<plugin>
215+
<groupId>org.apache.felix</groupId>
216+
<artifactId>maven-bundle-plugin</artifactId>
217+
<configuration>
218+
<instructions>
219+
<Include-Resource>target/classes/module-info.class</Include-Resource>
220+
</instructions>
221+
</configuration>
222+
</plugin>
223+
</plugins>
224+
</build>
225+
</profile>
226+
</profiles>
227+
</project>

‎bundles/bundle/src/main/jdk9/module-info.java

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3+
*
4+
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
5+
*
6+
* The contents of this file are subject to the terms of either the GNU
7+
* General Public License Version 2 only ("GPL") or the Common Development
8+
* and Distribution License("CDDL") (collectively, the "License"). You
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12+
* or LICENSE.txt. See the License for the specific
13+
* language governing permissions and limitations under the License.
14+
*
15+
* When distributing the software, include this License Header Notice in each
16+
* file and include the License file at LICENSE.txt.
17+
*
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
27+
*
28+
* Contributor(s):
29+
* If you wish your version of this file to be governed by only the CDDL or
30+
* only the GPL Version 2, indicate your decision by adding "[Contributor]
31+
* elects to include this software in this distribution under the [CDDL or GPL
32+
* Version 2] license." If you don't indicate a single choice of license, a
33+
* recipient has the option to distribute your version of this file under
34+
* either the CDDL, the GPL Version 2 or to extend the choice of license to
35+
* its licensees as provided above. However, if you add GPL Version 2 code
36+
* and therefore, elected the GPL Version 2 license, then the option applies
37+
* only if the new code is made subject to such option by the copyright
38+
* holder.
39+
*/
40+
41+
module org.glassfish.java.json {
42+
exports javax.json;
43+
exports javax.json.spi;
44+
exports javax.json.stream;
45+
exports org.glassfish.json.api;
46+
uses javax.json.spi.JsonProvider;
47+
}

‎bundles/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<url>https://javaee.github.io/jsonp</url>
6060

6161
<modules>
62+
<module>bundle</module>
6263
<module>ri</module>
6364
</modules>
6465
<profiles>

‎demos/customprovider-jdk9/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
</build>
107107
<dependencies>
108108
<dependency>
109-
<groupId>org.glassfish</groupId>
110-
<artifactId>javax.json</artifactId>
109+
<groupId>javax.json</groupId>
110+
<artifactId>javax.json-api</artifactId>
111111
</dependency>
112112
<dependency>
113113
<groupId>junit</groupId>

‎demos/customprovider-jdk9/src/main/jdk9/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*/
4040

4141
module org.glassfish.java.json.demos.customprovider {
42-
requires org.glassfish.java.json;
42+
requires transitive java.json;
4343
exports org.glassfish.json.customprovider;
4444
provides javax.json.spi.JsonProvider with org.glassfish.json.customprovider.TestProvider;
4545
}

0 commit comments

Comments
 (0)