JENA-1948: Include Titanium and dependencies

liudakun · Aug 19, 2021 · ffa535a · ffa535a
1 parent 48187f6
commit ffa535a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/apache-jena/dist/LICENSE b/apache-jena/dist/LICENSE
@@ -272,3 +272,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+Jakarta JSON Processing (JSON-P)
+https://eclipse-ee4j.github.io/jsonp/
+
+is licensed under the Eclipse Public License 2.0.
+http://www.eclipse.org/legal/epl-2.0
+
+org.glassfish:jakarta.json
+is licensed under the Eclipse Public License 2.0.
+http://www.eclipse.org/legal/epl-2.0
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
@@ -74,19 +74,16 @@
       <!-- Apache License -->
       <groupId>com.apicatalog</groupId>
       <artifactId>titanium-json-ld</artifactId>
-      <scope>provided</scope>
     </dependency>
     <!-- Eclipse Public License 2.0 (category-B) -->
     <dependency>
       <groupId>jakarta.json</groupId>
       <artifactId>jakarta.json-api</artifactId>
-      <scope>provided</scope>
     </dependency>
-    <!--  And an implementation : Eclipse Public License 2.0 (category-B) -->
+    <!--  Eclipse Public License 2.0 (category-B) -->
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>jakarta.json</artifactId>
-      <scope>provided</scope>
     </dependency>
     <!-- End Titanium JSON-LD 1.1 -->
 

diff --git a/jena-fuseki2/apache-jena-fuseki/dist/LICENSE b/jena-fuseki2/apache-jena-fuseki/dist/LICENSE
@@ -230,6 +230,16 @@ http://www.slf4j.org/license.html
 
 - - - - - - - - - - - - - - - - - - - - - - - 
 
+Jakarta JSON Processing (JSON-P)
+https://eclipse-ee4j.github.io/jsonp/
+
+is licensed under the Eclipse Public License 2.0.
+http://www.eclipse.org/legal/epl-2.0
+
+org.glassfish:jakarta.json
+is licensed under the Eclipse Public License 2.0.
+http://www.eclipse.org/legal/epl-2.0
+
 ==============================================================
  Jetty Web Container
  Copyright 1995-2012 Mort Bay Consulting Pty Ltd.
@@ -614,4 +624,4 @@ WHETHER IN  CONTRACT, STRICT LIABILITY, OR  TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
+---
diff --git a/pom.xml b/pom.xml
@@ -438,27 +438,24 @@
       </dependency>
 
       <!-- JSON-LD 1.1 read support -->
-      <!-- Titanium JSON-LD scope=provided -->
+      <!-- Titanium JSON-LD -->
       <dependency>
         <!-- Apache License -->
         <groupId>com.apicatalog</groupId>
         <artifactId>titanium-json-ld</artifactId>
         <version>1.1.0</version>
-        <scope>provided</scope>
       </dependency>
       <!-- Eclipse Public License 2.0 (category-B) -->
       <dependency>
         <groupId>jakarta.json</groupId>
         <artifactId>jakarta.json-api</artifactId>
         <version>2.0.1</version>
-        <scope>provided</scope>
       </dependency>
       <!-- Eclipse Public License 2.0 (category-B) -->
       <dependency>
         <groupId>org.glassfish</groupId>
         <artifactId>jakarta.json</artifactId>
         <version>2.0.1</version>
-        <scope>provided</scope>
       </dependency>
       <!-- End JSON-LD 1.1 read support -->