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 37c3a2c53f GH-3201: Remove jena-fuseki-fulljar
37c3a2c53f is described below
commit 37c3a2c53fb216c1da177afe98338487382f5dd6
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat May 17 08:35:14 2025 +0100
GH-3201: Remove jena-fuseki-fulljar
---
BUILD.md | 8 +-
jena-bom/pom.xml | 22 +----
jena-fuseki2/jena-fuseki-fulljar/pom.xml | 143 -------------------------------
jena-fuseki2/pom.xml | 1 -
4 files changed, 4 insertions(+), 170 deletions(-)
diff --git a/BUILD.md b/BUILD.md
index b2fc5f4836..c3f5647188 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -87,12 +87,8 @@ This happens if the top level POM is included, as well as
`jena-db` and
### Avoid output modules
-Artifacts that provide shaded jars should not normally be imported, especially
-`jena-shaded-guava`. Other shared jars included `jena-fuseki-server` and
-`jena-fuseki-fulljar`.
-
-`jena-shaded-guava` will be obtained from a maven repository or from a local
run
-of mvn.
+Artifacts that provide shaded jars should not normally be imported,
+such as `jena-fuseki-server`.
## Build Notes
diff --git a/jena-bom/pom.xml b/jena-bom/pom.xml
index 64542d7051..395714462a 100644
--- a/jena-bom/pom.xml
+++ b/jena-bom/pom.xml
@@ -159,24 +159,6 @@
<!-- Component modules -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-fulljar</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-geosparql</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-main</artifactId>
@@ -185,13 +167,13 @@
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-war</artifactId>
+ <artifactId>jena-fuseki-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-webapp</artifactId>
+ <artifactId>jena-fuseki-geosparql</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/jena-fuseki2/jena-fuseki-fulljar/pom.xml
b/jena-fuseki2/jena-fuseki-fulljar/pom.xml
deleted file mode 100644
index a83cae8582..0000000000
--- a/jena-fuseki2/jena-fuseki-fulljar/pom.xml
+++ /dev/null
@@ -1,143 +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>
-
- <name>Apache Jena - Fuseki Server Standalone Jar</name>
- <artifactId>jena-fuseki-fulljar</artifactId>
-
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki</artifactId>
- <version>5.5.0-SNAPSHOT</version>
- </parent>
-
- <packaging>jar</packaging>
- <description>Fuseki Webapp - combined jar with built-in
webserver.</description>
-
- <properties>
-
<automatic.module.name>org.apache.jena.fuseki.fulljar</automatic.module.name>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-webapp</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Include jena-cmds in the server jar so
- "java -cp server-jar jena.cmd ..." works
- as a convenience in deployments.
- -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-cmds</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j2-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <shadedArtifactAttached>false</shadedArtifactAttached>
- <transformers>
- <!--
- https://issues.apache.org/jira/browse/LOG4J2-954 - fixed at
3.0.0
- Multiple Log4j2Plugins.dat
- jena-fuseki-fulljar picks up one Log4j2Plugins.dat from
- org.apache.logging.log4j:log4j-core and, unless excluded,
- one via jena-fuseki-webapp which has
org.apache.logging.log4j:log4j-core-web
- If it becomes necessary, see:
https://github.com/edwgiz/maven-shaded-log4j-transformer
- -->
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.jena.fuseki.cmd.FusekiWebappCmd</mainClass>
- <!-- https://issues.apache.org/jira/browse/LOG4J2-2537 -->
- <manifestEntries>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"
/>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
- </transformer>
- </transformers>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <!-- Some jars are signed but shading breaks that.
- Don't include signing files.
- -->
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/DEPENDENCIES</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>**/module-info.class</exclude>
- <exclude>META-INF/versions/9/OSGI-INF/MANIFEST.MF</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>org.omnifaces:omnifaces</artifact>
- <excludes>
- <exclude>META-INF/beans.xml</exclude>
- <exclude>META-INF/faces-config.xml</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <!--<phase /><!- - Switch off -->
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index 7c2805f90f..3dbe63b212 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -63,7 +63,6 @@
<!-- Fuseki Webapp -->
<module>jena-fuseki-webapp</module>
<module>jena-fuseki-war</module>
- <module>jena-fuseki-fulljar</module>
<!-- Fuseki Dockerfile -->
<module>jena-fuseki-docker</module>