You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2021/10/01 09:21:39 UTC

[jena] branch main updated: JENA-2165: Retire OSGi artifacts

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new 79a477c  JENA-2165: Retire OSGi artifacts
     new c7b14e7  Merge pull request #1077 from afs/retire-osgi
79a477c is described below

commit 79a477c00e6a62dd46d8d459d0a8adf714124984
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Wed Sep 22 19:41:27 2021 +0100

    JENA-2165: Retire OSGi artifacts
---
 apache-jena-osgi/README.md                         |  13 +
 apache-jena-osgi/jena-osgi-features/pom.xml        | 101 -------
 .../src/main/resources/features.xml                |  43 ---
 apache-jena-osgi/jena-osgi-test/DEPENDENCIES       |  40 ---
 apache-jena-osgi/jena-osgi-test/pom.xml            |  97 -------
 .../org/apache/jena/osgi/test/JenaOSGITest.java    | 204 --------------
 apache-jena-osgi/jena-osgi/pom.xml                 | 302 ---------------------
 .../main/java/org/apache/jena/osgi/Activator.java  |  37 ---
 .../jena-osgi/src/main/resources/META-INF/NOTICE   |  45 ---
 .../org.apache.jena.sys.JenaSubsystemLifecycle     |   5 -
 apache-jena-osgi/pom.xml                           |  45 ---
 pom.xml                                            |   6 -
 12 files changed, 13 insertions(+), 925 deletions(-)

diff --git a/apache-jena-osgi/README.md b/apache-jena-osgi/README.md
new file mode 100644
index 0000000..bec53a8
--- /dev/null
+++ b/apache-jena-osgi/README.md
@@ -0,0 +1,13 @@
+Apache Jena OSGi
+================
+
+The last release of apache-jena-osgi source was with Jena 4.2.0 on 2021-09-16.
+The last release of the OSGi binary artifacts was with Jena 4.1.0 2021-06-04.
+
+The code for this module has been removed.
+Source is available from git with tag "jena-4.2.0".
+
+The last git commit after 4.2.0 to jena-sdb was dc82944de1.
+
+Retired modules can be incorporated back into Jena releases if there is
+sufficient activity to maintain the code over the long term.
diff --git a/apache-jena-osgi/jena-osgi-features/pom.xml b/apache-jena-osgi/jena-osgi-features/pom.xml
deleted file mode 100644
index 7b51eb0..0000000
--- a/apache-jena-osgi/jena-osgi-features/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<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">
-  
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.jena</groupId>
-    <artifactId>apache-jena-osgi</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>jena-osgi-features</artifactId>  
-  <packaging>bundle</packaging>
-  <name>Apache Jena - OSGi Karaf features</name>  
-  <description>Apache Karaf features (deplyoment configurations) for easy installation and integration testing.</description>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/resources</directory>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>filter</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>target/features.xml</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
deleted file mode 100644
index ab8c317..0000000
--- a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
-  
-	<feature name="jena" version="${project.version}">
-		<bundle>mvn:org.apache.jena/jena-osgi/${project.version}</bundle>
-		<feature version="${project.version}">jena_osgi_dependencies</feature>
-	</feature>
-
-	<feature name="jena_osgi_dependencies" version="${project.version}">
-		<bundle dependency="true">mvn:com.github.andrewoma.dexx/collection/${ver.dexxcollection}</bundle>
-		<bundle dependency="true">mvn:com.github.jsonld-java/jsonld-java/${ver.jsonldjava}</bundle>
-		<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${ver.jackson}</bundle>
-		<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${ver.jackson}</bundle>
-		<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${ver.jackson}</bundle>
-		<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${ver.httpcore-osgi}</bundle>
-		<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle>
-		<bundle dependency="true">mvn:org.apache.commons/commons-compress/${ver.commons-compress}</bundle>
-		<bundle dependency="true">mvn:org.apache.commons/commons-csv/${ver.commonscsv}</bundle>
-		<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${ver.commonslang3}</bundle>
-		<bundle dependency="true">mvn:org.apache.commons/commons-rdf-api/${ver.commonsrdf}</bundle>
-		<bundle dependency="true">mvn:commons-codec/commons-codec/${ver.commons-codec}</bundle>
-		<bundle dependency="true">mvn:commons-io/commons-io/${ver.commonsio}</bundle>
-		<bundle dependency="true">mvn:org.apache.thrift/libthrift/${ver.libthrift}</bundle>
-	</feature>
-
-</features>
diff --git a/apache-jena-osgi/jena-osgi-test/DEPENDENCIES b/apache-jena-osgi/jena-osgi-test/DEPENDENCIES
deleted file mode 100644
index a46db3d..0000000
--- a/apache-jena-osgi/jena-osgi-test/DEPENDENCIES
+++ /dev/null
@@ -1,40 +0,0 @@
-== Apache jena, module jena-osgi-test
-
-Running the test of jena-osgi uses the following dependencies:
-
-biz.aQute.bnd:bndlib:jar
-  http://www.aqute.biz/
-  https://github.com/bndtools/bnd
-  License: Apache License version 2.0
-
-com.google.collections
-  License: Apache License version 2.0
-
-org.codehaus.plexus:
-  License: Apache License version 2.0
-
-org.eclipse:osgi
-  See LICENSE in the jar file.
-  License: Apache License version 2.0
-
-org.jsoup:jsoup:jar
-  http://jsoup.org/license
-  License: MIT License
-
-org.ops4j
-org.ops4j.pax.url:pax-url-maven-commons:jar:1.6.0:test
-  http://ops4j.github.io/LICENSE
-  https://github.com/ops4j/ops4j.github.io/blob/master/LICENSE
-  License: Apache License version 2.0
-
-org.osgi:org.osgi.core:jar
-  See LICENSE in the jar file.
-  License: Apache License version 2.0
-
-org.sonatype.aether
-  https://github.com/sonatype/sonatype-aether
-  License: Eclipse Public License, v1.0
-
-org.sonatype.sisu
-  https://github.com/sonatype/sonatype-sisu
-  License: Eclipse Public License, v1.0
diff --git a/apache-jena-osgi/jena-osgi-test/pom.xml b/apache-jena-osgi/jena-osgi-test/pom.xml
deleted file mode 100644
index eb3e457..0000000
--- a/apache-jena-osgi/jena-osgi-test/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.jena</groupId>
-    <artifactId>jena</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>jena-osgi-test</artifactId>
-  <!-- Same as jena-osgi -->
-  <version>3.4.0-SNAPSHOT</version>
-  <name>Apache Jena - OSGi integration tests</name>
-  <description>Tests for jena-osgi as a bundle</description>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <pax.exam.version>4.4.0</pax.exam.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-osgi-features</artifactId>  
-      <version>3.4.0-SNAPSHOT</version>
-      <type>bundle</type>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-osgi</artifactId>
-      <version>3.4.0-SNAPSHOT</version>
-      <type>bundle</type>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-container-karaf</artifactId>
-      <version>${pax.exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-junit4</artifactId>
-      <version>${pax.exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-link-mvn</artifactId>
-      <version>${pax.exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>verify</id>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
deleted file mode 100644
index bc707a0..0000000
--- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.osgi.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
-
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
-import org.apache.jena.ontology.Individual;
-import org.apache.jena.ontology.ObjectProperty;
-import org.apache.jena.ontology.OntModel;
-import org.apache.jena.ontology.OntModelSpec;
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.DatasetFactory;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ReadWrite;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.riot.Lang;
-import org.apache.jena.riot.RDFDataMgr;
-import org.apache.jena.tdb.TDBFactory;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-/**
- * Brief tests of the Jena modules covered by jena-osgi
- * 
- */
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class JenaOSGITest {
-
-	@Configuration
-	public Option[] config() {
-	    return options(
-		// OSGi container configuration
-				karafDistributionConfiguration().frameworkUrl(
-						maven().groupId("org.apache.karaf")
-								.artifactId("apache-karaf").type("zip")
-								/*
-								 * Version 4.0.4 does not work at the moment:
-								 * Error: Could not find or load main class
-								 * org.apache.karaf.main.Main (layout of the
-								 * archive/file naming changed).
-								 */
-								.version("3.0.6")).useDeployFolder(false),
-				// Install core Jena feature
-				features(
-						maven().groupId("org.apache.jena")
-								.artifactId("jena-osgi-features").type("xml")
-								.classifier("features")
-								.version("3.1.0-SNAPSHOT"), "jena"));
-
-	}
-
-	private static final String EXAMPLE_COM_GRAPH = "http://example.com/graph";
-	private Resource alice;
-	private Property knows;
-	private Resource bob;
-
-	@Test
-	public void testJenaCore() throws Exception {
-		Model model = makeModel();
-		Writer writer = new StringWriter();
-		model.write(writer, "N-Triples");
-
-		assertEquals(
-				"<http://example.com/alice> <http://xmlns.com/foaf/0.1/knows> <http://example.com/bob> .",
-				writer.toString().trim());
-
-		OntModel ontModel = ModelFactory
-				.createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF);
-		ObjectProperty knowsObjProp = ontModel.createObjectProperty(knows
-				.getURI());
-		ObjectProperty hasFriend = ontModel
-				.createObjectProperty("http://example.com/has_friend");
-		hasFriend.addSuperProperty(knowsObjProp);
-
-		Individual aliceIndividual = ontModel.createIndividual(alice);
-		Individual bobIndividiual = ontModel.createIndividual(bob);
-		ontModel.add(aliceIndividual, hasFriend, bobIndividiual);
-		assertTrue(aliceIndividual.hasProperty(knowsObjProp, bobIndividiual));
-	}
-
-	@Test
-	public void testJenaArq1() throws Exception {
-	    Dataset dataset = DatasetFactory.create();
-	    testJenaARQ(dataset) ;
-	}
-	
-	@Test
-	public void testJenaArq2() throws Exception {
-	    Dataset dataset = DatasetFactory.createTxnMem();
-	}
-	
-	public void testJenaARQ(Dataset dataset) throws Exception {
-		dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
-
-		// We test JSON-LD as it involves multiple other bundles
-		Path path = Files.createTempFile("example", ".jsonld");
-		path.toFile().deleteOnExit();
-
-		try (OutputStream output = Files.newOutputStream(path)) {
-			RDFDataMgr.write(output, dataset, Lang.JSONLD);
-		}
-		Dataset dataset2 = RDFDataMgr.loadDataset(path.toUri().toString());
-		assertTrue(dataset2.containsNamedModel(EXAMPLE_COM_GRAPH));
-
-		runQuery(dataset2);
-
-	}
-
-	private void runQuery(Dataset dataset) {
-		Query query = QueryFactory.create(""
-				+ "PREFIX foaf: <http://xmlns.com/foaf/0.1/>"
-				+ "SELECT ?bob WHERE { "
-				+ "  GRAPH <http://example.com/graph> { "
-				+ "      ?alice foaf:knows ?bob . " + "  }" + "}");
-		try (QueryExecution qexec = QueryExecutionFactory
-				.create(query, dataset)) {
-			ResultSet results = qexec.execSelect();
-			assertTrue(results.hasNext());
-			QuerySolution r = results.next();
-			assertEquals(bob, r.get("bob").asResource());
-		}
-	}
-
-	@Test
-	public void testJenaIRI() throws Exception {
-		IRIFactory iriFactory = IRIFactory.iriImplementation() ;
-		IRI iri = iriFactory.create("http://example.com/");
-		assertEquals("http://example.com/", iri.toASCIIString());
-	}
-
-	@Test
-	public void testJenaTdb() throws Exception {
-		Path tdbDir = Files.createTempDirectory("jena-tdb-test");
-		Dataset dataset = TDBFactory.createDataset(tdbDir.toString());
-
-		dataset.begin(ReadWrite.WRITE);
-		dataset.addNamedModel(EXAMPLE_COM_GRAPH, makeModel());
-		dataset.commit();
-		dataset.end();
-
-		dataset.begin(ReadWrite.READ);
-		runQuery(dataset);
-		dataset.end();
-	}
-
-	@Test
-	public void testMaking() {
-		DatasetFactory.createTxnMem() ;
-		DatasetFactory.create() ;
-		ModelFactory.createDefaultModel();
-	}
-	
-	private Model makeModel() {
-		Model model = ModelFactory.createDefaultModel();
-		alice = model.createResource("http://example.com/alice");
-		knows = model.createProperty("http://xmlns.com/foaf/0.1/knows");
-		bob = model.createResource("http://example.com/bob");
-		model.add(model.createStatement(alice, knows, bob));
-		return model;
-	}
-}
diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
deleted file mode 100644
index cb53779..0000000
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<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">
-  
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.jena</groupId>
-    <artifactId>apache-jena-osgi</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>jena-osgi</artifactId>  
-  <packaging>bundle</packaging>
-  <name>Apache Jena - OSGi bundle</name>
-  <description>
-    Embedding the main Jena modules (iri/core/arq/tdb) in a single OSGi bundle.
-  </description>
-  
-  <!--
-       Most of the job is done by maven-bundle-plugin (see below).
-       It inspects the embedded/shadowed class files from jena-* to
-       generate the correct Import/Export-Package statements.
-
-
-       SCOPES:
-
-       <scope>provided</scope> are explicitly picked up 
-       by maven-bundle-plugin below to be shadowed within the bundle.  These
-       are the non-OSGi bundles we want to package, e.g. Jena 
-       and any dependencies that are not easily available as
-       bundles..
-
-       Those without <scope> (e.g. compile) below are already
-       OSGi bundles and will become runtime dependencies of
-       the jena-osgi bundle when used through Maven. Their
-       transitive dependencies (e.g. jsonld-java depends on 
-       jackson-core) are not explicitly listed here.
-
-       Note that many OSGi users don't use Maven
-       and would have to find those dependencies
-       themselves. See ../jena-osgi-test/ for
-       example.
-
-
-       To avoid duplicates of non-bundle and bundle dependencies,
-       e.g. httpcore vs. httpcore-osgi, there are several
-       <excludes> below - as not everyone 
-       follows the <scope>provided</scope> pattern.
-
-       Use mvn dependency:tree to inspect what dependencies are
-       exposed in the end, and unzip -t target/*.jar to inspect
-       what becomes bundled in the bundle.
-
-       Explore META-INF/MANFEST.MF in the jar to see what
-       Import and Export the maven-bundle-plugin has figured out,
-       usually the details figured out through code 
-       introspections are correct - if verbose.
-
-       -->
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-arq</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
-      <scope>provided</scope>
-      <exclusions>
-        <!-- These are all embedded within httpclient-osgi -->
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpmime</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient-cache</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>fluent-hc</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-core</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-rdfconnection</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-shaded-guava</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-commonsrdf</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-tdb</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-tdb2</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <!--
-    NOTE: Also update 
-    src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle
-    to the concatenation of the different Jena modules' JenaSubsystemLifecycle
-    (order does not matter). See JENA-1139 for details.
-    -->
-
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-iri</artifactId>
-      <version>4.3.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- OSGi versions of Jena dependencies -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient-osgi</artifactId>
-      <version>${ver.httpclient-osgi}</version>
-      <exclusions>
-        <exclusion>
-          <!-- Ignore scope=provided dependency -->
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-        <!-- These are all embedded within httpclient-osgi -->
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpmime</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient-cache</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>fluent-hc</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore-osgi</artifactId>
-      <version>${ver.httpcore-osgi}</version> 
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpcore</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpcore-nio</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.jsonld-java</groupId>
-      <artifactId>jsonld-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-csv</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <exclusions>
-        <!-- Use httpclient-osgi instead -->
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpcore</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${ver.slf4j}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-rdf-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>6.0.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <!-- re-enable extensions here for older Mavens -->
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.apache.jena.*,!org.apache.jena.ext.*</Export-Package>            
-            <Embed-Dependency>artifactId=jena*;inline=true</Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive>
-            <Import-Package>
-              org.osgi.framework.*,
-              !sun.io,
-              !org.apache.avalon.framework.logger,
-              !com.ibm.uvm.tools,
-              !com.sun.jdmk.comm,
-              !org.apache.log,
-              !org.apache.jena.ext.*,
-              !org.checkerframework.checker.*,
-              !com.google.errorprone.annotations.*,
-              !com.google.appengine.api,
-              !com.google.apphosting.api,
-              com.apicatalog.jsonld.*;resolution:=optional,
-              com.apicatalog.rdf.*;resolution:=optional,
-              jakarta.json;resolution:=optional,
-              org.apache.logging.*;resolution:=optional,
-              sun.misc;resolution:=optional,
-              *
-            </Import-Package>
-            <!--
-            <Import-Package>org.osgi.framework.*,!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.xml.*,!org.apache.jena.ext.*,sun.misc;resolution:=optional,*</Import-Package>
-            -->
-            <Private-Package>org.apache.jena.ext.*</Private-Package>
-            <Bundle-Activator>org.apache.jena.osgi.Activator</Bundle-Activator>
-            <Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.apache.commons.rdf.api.RDF</Provide-Capability>
-            <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/apache-jena-osgi/jena-osgi/src/main/java/org/apache/jena/osgi/Activator.java b/apache-jena-osgi/jena-osgi/src/main/java/org/apache/jena/osgi/Activator.java
deleted file mode 100644
index 310ba57..0000000
--- a/apache-jena-osgi/jena-osgi/src/main/java/org/apache/jena/osgi/Activator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.osgi;
-
-import org.apache.jena.sys.JenaSystem;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-// Sample bundle activator explicitly calling the static Jena initialization.
-public class Activator implements BundleActivator {
-
-	@Override
-    public void start(BundleContext context) throws Exception {
-		JenaSystem.init();
-	}
-
-	@Override
-    public void stop(BundleContext context) throws Exception {
-
-	}
-}
diff --git a/apache-jena-osgi/jena-osgi/src/main/resources/META-INF/NOTICE b/apache-jena-osgi/jena-osgi/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 4e0468e..0000000
--- a/apache-jena-osgi/jena-osgi/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,45 +0,0 @@
-Apache Jena - jena-osgi
-Copyright 2015-2021 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed by
-PluggedIn Software and under a BSD license.
-
-Portions of this software were originally based on the following:
-  - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
-  - Copyright 2010, 2011 Epimorphics Ltd.
-  - Copyright 2010, 2011 Talis Systems Ltd.
-These have been licensed to the Apache Software Foundation under a software grant.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-From Apache HttpComponents Client:
-
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-  Apache Xerces Java
-   Copyright 1999-2013 The Apache Software Foundation
-
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Portions of this software were originally based on the following:
-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-     - voluntary contributions made by Paul Eng on behalf of the 
-       Apache Software Foundation that were originally developed at iClick, Inc.,
-       software copyright (c) 1999.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-Simple Logging Facade for Java (SLF4J)
-http://slf4j.org/
-
-Copyright (c) 2004-2008 QOS.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/apache-jena-osgi/jena-osgi/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle b/apache-jena-osgi/jena-osgi/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle
deleted file mode 100644
index 45bf115..0000000
--- a/apache-jena-osgi/jena-osgi/src/main/resources/META-INF/services/org.apache.jena.sys.JenaSubsystemLifecycle
+++ /dev/null
@@ -1,5 +0,0 @@
-org.apache.jena.sys.InitJenaCore
-org.apache.jena.riot.system.InitRIOT
-org.apache.jena.sparql.system.InitARQ
-org.apache.jena.tdb.sys.InitTDB
-org.apache.jena.tdb2.sys.InitTDB2
diff --git a/apache-jena-osgi/pom.xml b/apache-jena-osgi/pom.xml
deleted file mode 100644
index d1094d8..0000000
--- a/apache-jena-osgi/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.jena</groupId>
-    <artifactId>jena</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
-    <relativePath>..</relativePath>
-  </parent> 
-
-  <name>Apache Jena - OSGi</name>
-  <artifactId>apache-jena-osgi</artifactId>
-  <version>4.3.0-SNAPSHOT</version>
-
-  <description>Apache Jena OSGi distribution and test</description>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>jena-osgi</module>
-    <module>jena-osgi-features</module>
-    <!--
-        See JENA-913 - tests do not work with "mvn clean verify"
-        only with an "install"
-        <module>jena-osgi-test</module>
-    -->
-  </modules>
-  
-</project>
diff --git a/pom.xml b/pom.xml
index c154f15..14487ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,11 +87,6 @@
 
     <ver.httpclient>4.5.13</ver.httpclient>
     <ver.httpcore>4.4.14</ver.httpcore>
-    <!-- Normally, these are the same as the above
-         In the case of 4.2.6, there isn't a httpcore-osgi.
-    -->
-    <ver.httpcore-osgi>${ver.httpcore}</ver.httpcore-osgi>
-    <ver.httpclient-osgi>${ver.httpclient}</ver.httpclient-osgi>
     
     <ver.lucene>8.8.0</ver.lucene>
     <ver.graalvm>21.2.0</ver.graalvm>
@@ -259,7 +254,6 @@
         <!-- Slow building modules -->
 
         <module>jena-jdbc</module>
-        <module>apache-jena-osgi</module>
       </modules>
     </profile>
   </profiles>