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
commit b4bf7a683c456c8f22e015bcd57c72931adebc02 Author: Andy Seaborne <[email protected]> AuthorDate: Sun Jul 21 20:37:30 2024 +0100 GH-2600: Check and align building of shaded jars --- jena-benchmarks/jena-benchmarks-shadedJena480/pom.xml | 10 ++++++++++ jena-extras/jena-serviceenhancer/pom.xml | 13 ++++++++++--- jena-fuseki2/jena-fuseki-fulljar/pom.xml | 5 ++++- jena-fuseki2/jena-fuseki-geosparql/pom.xml | 4 +++- jena-fuseki2/jena-fuseki-server/pom.xml | 3 +++ 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/jena-benchmarks/jena-benchmarks-shadedJena480/pom.xml b/jena-benchmarks/jena-benchmarks-shadedJena480/pom.xml index abf8fc8fa4..6d287800c8 100644 --- a/jena-benchmarks/jena-benchmarks-shadedJena480/pom.xml +++ b/jena-benchmarks/jena-benchmarks-shadedJena480/pom.xml @@ -86,6 +86,13 @@ </goals> <configuration> <createDependencyReducedPom>false</createDependencyReducedPom> + <transformers> + <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> <artifactSet> <includes> <include>*:*</include> @@ -104,6 +111,9 @@ <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> </excludes> </filter> </filters> diff --git a/jena-extras/jena-serviceenhancer/pom.xml b/jena-extras/jena-serviceenhancer/pom.xml index f889175ad6..5524a82741 100644 --- a/jena-extras/jena-serviceenhancer/pom.xml +++ b/jena-extras/jena-serviceenhancer/pom.xml @@ -107,6 +107,13 @@ <goal>shade</goal> </goals> <configuration> + <transformers> + <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> @@ -114,12 +121,12 @@ <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> </excludes> </filter> </filters> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - </transformers> </configuration> </execution> </executions> diff --git a/jena-fuseki2/jena-fuseki-fulljar/pom.xml b/jena-fuseki2/jena-fuseki-fulljar/pom.xml index 2f9d53cbc6..bf04f05c14 100644 --- a/jena-fuseki2/jena-fuseki-fulljar/pom.xml +++ b/jena-fuseki2/jena-fuseki-fulljar/pom.xml @@ -112,7 +112,10 @@ --> <exclude>META-INF/*.SF</exclude> <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> + <exclude>META-INF/*.RSA</exclude> + <exclude>META-INF/DEPENDENCIES</exclude> + <exclude>META-INF/MANIFEST.MF</exclude> + <exclude>**/module-info.class</exclude> </excludes> </filter> </filters> diff --git a/jena-fuseki2/jena-fuseki-geosparql/pom.xml b/jena-fuseki2/jena-fuseki-geosparql/pom.xml index 05a5cee0d7..9c5909631a 100644 --- a/jena-fuseki2/jena-fuseki-geosparql/pom.xml +++ b/jena-fuseki2/jena-fuseki-geosparql/pom.xml @@ -136,7 +136,6 @@ <configuration> <shadedArtifactAttached>false</shadedArtifactAttached> <transformers> - <!-- @@@ TODO @@ --> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <mainClass>org.apache.jena.fuseki.geosparql.Main</mainClass> </transformer> @@ -156,6 +155,9 @@ <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> </excludes> </filter> </filters> diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml b/jena-fuseki2/jena-fuseki-server/pom.xml index b3b969a576..03fd413be5 100644 --- a/jena-fuseki2/jena-fuseki-server/pom.xml +++ b/jena-fuseki2/jena-fuseki-server/pom.xml @@ -121,6 +121,9 @@ <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> </excludes> </filter> </filters>
