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 c66e2b80e0ed381da43ffb8f8c497de9cd5a6d8b Author: Andy Seaborne <[email protected]> AuthorDate: Sat Apr 27 13:55:51 2024 +0100 GH-2433; Localise use of dependency commons-cli --- jena-cmds/pom.xml | 6 +++++- jena-core/pom.xml | 39 ++++++++++++--------------------------- 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml index 1fd5407a35..29a7b6c766 100644 --- a/jena-cmds/pom.xml +++ b/jena-cmds/pom.xml @@ -55,7 +55,6 @@ This works ... except it breaks javadoc:javadoc building with Java11. But it does work if Java17 is used for the build - <dependency> <groupId>org.apache.jena</groupId> <artifactId>apache-jena-libs</artifactId> @@ -103,6 +102,11 @@ <version>5.1.0-SNAPSHOT</version> </dependency> + <dependency> + <artifactId>commons-cli</artifactId> + <groupId>commons-cli</groupId> + </dependency> + <!-- Pull test code into scope --> <dependency> <groupId>org.apache.jena</groupId> diff --git a/jena-core/pom.xml b/jena-core/pom.xml index 4c39bd7399..9a520e9928 100644 --- a/jena-core/pom.xml +++ b/jena-core/pom.xml @@ -59,36 +59,21 @@ </dependency> <dependency> - <artifactId>commons-cli</artifactId> - <groupId>commons-cli</groupId> + <groupId>org.roaringbitmap</groupId> + <artifactId>RoaringBitmap</artifactId> </dependency> - - <dependency> - <groupId>org.roaringbitmap</groupId> - <artifactId>RoaringBitmap</artifactId> - </dependency> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.xenei</groupId> - <artifactId>junit-contracts</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>commons-cli</artifactId> - <groupId>commons-cli</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.xenei</groupId> + <artifactId>junit-contracts</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId>
