Skip to content

Refactor dependencies in s-pipes-web and debug #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open

Refactor dependencies in s-pipes-web and debug #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e207e94
[#332] Remove unused declared dependencies in s-pipes-test
Aug 15, 2025
cd356f8
[#332] Remove unused declared dependencies in s-pipes-model
Aug 15, 2025
344c686
[#332] Add used undeclared dependencies in s-pipes-model
Aug 15, 2025
177e9e1
[#332] Remove unused declared dependencies in s-pipes-core
Aug 15, 2025
fb62492
[#332] Add used undeclared dependencies in s-pipes-core
Aug 15, 2025
817fd9c
[#332] Update org.reflections:reflection version
Aug 15, 2025
3054d47
[#332] Remove unused declared dependencies in s-pipes-forms
Aug 15, 2025
57cf71a
[#332] Add used undeclared dependencies in s-pipes-forms
Aug 15, 2025
3b11a76
[#332] Add used undeclared dependencies in s-pipes-modules-form
Aug 15, 2025
235a112
[#332] Add used undeclared dependencies in s-pipes-module-creator-mav…
Aug 15, 2025
880dbf1
[#332] Remove unused declared dependencies in s-pipes-modules-text-an…
Aug 15, 2025
caf24d2
[#332] Add used undeclared dependencies in s-pipes-modules-text-analysis
Aug 18, 2025
e42b1dd
[#332] Remove unused declared dependencies in s-pipes-modules-tabular
Aug 18, 2025
d99dc11
[#332] Add used undeclared dependencies in s-pipes-modules-tabular
Aug 18, 2025
ceb090a
[#332] Remove unused declared dependencies in s-pipes-modules-identity
Aug 18, 2025
18bad77
[#332] Add used undeclared dependencies in s-pipes-modules-identity
Aug 18, 2025
246c8b9
[#332] Remove unused declared dependencies in s-pipes-modules-rdf4j
Aug 18, 2025
a69c965
[#332] Add used undeclared dependencies in s-pipes-modules-rdf4j
Aug 18, 2025
28c264d
[#332] Add used undeclared dependencies in s-pipes-modules-sparql-end…
Aug 18, 2025
e285917
[#332] Remove unused declared dependencies in s-pipes-modules-nlp
Aug 18, 2025
ed267d7
[#332] Add used undeclared dependencies in s-pipes-modules-nlp
Aug 18, 2025
75841fb
[#332] Add used undeclared dependencies in s-pipes-modules-dataset-di…
Aug 18, 2025
2f131d3
[#332] Remove unused declared dependencies in s-pipes-modules-eccairs
Aug 18, 2025
871fdb9
[#332] Add used undeclared dependencies in s-pipes-modules-eccairs
Aug 18, 2025
336d10c
[#332] Remove unused declared dependencies in s-pipes-modules-ckan2rdf
Aug 18, 2025
5830221
[#332] Add used undeclared dependencies in s-pipes-modules-ckan2rdf
Aug 18, 2025
b27e7f9
[#332] Remove unused declared dependencies in s-pipes-modules-security
Aug 18, 2025
9a141b0
[#332] Add used undeclared dependencies in s-pipes-modules-security
Aug 18, 2025
3d869a3
[#332] Remove unused declared dependencies in s-pipes-modules-rdfstream
Aug 18, 2025
61a60ff
[#332] Add used undeclared dependencies in s-pipes-modules-rdfstream
Aug 18, 2025
798eaaa
[#332] Add s-pipes-modules-rdfstream into the module registry
Aug 18, 2025
519ff59
[#332] Remove unused declared dependencies in s-pipes-cli
Aug 20, 2025
d9749e6
[#332] Add used undeclared dependencies in s-pipes-cli
Aug 20, 2025
89f6ede
[#332] Add used undeclared and remove unused declared dependencies in…
Aug 22, 2025
9c9b447
[#332] Add used undeclared and remove unused declared dependencies in…
Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 8 additions & 32 deletions s-pipes-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@
</repositories>

<dependencies>
<!-- SPipes modules -->
<dependency>
<groupId>cz.cvut.kbss</groupId>
<artifactId>s-pipes-modules-registry</artifactId>
<version>${project.parent.version}</version>
</dependency>
<!-- Commandline parameters processing -->
<dependency>
<groupId>args4j</groupId>
Expand All @@ -47,17 +41,19 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<!-- IO utils -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>cz.cvut.kbss</groupId>
<artifactId>s-pipes-core</artifactId>
Expand Down Expand Up @@ -88,26 +84,6 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
90 changes: 79 additions & 11 deletions s-pipes-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,71 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- rdf4j -->
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-api</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-http</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common-exception</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail-nativerdf</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-sail</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-sail-api</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-manager</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-api</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model-api</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.17.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>

<!-- Test dependencies -->
Expand All @@ -64,12 +122,7 @@
<!-- TODO used only to load modules from classpath, replace it by OSGI/Jigsaw -->
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.10</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<scope>test</scope>
<version>0.10.2</version>
</dependency>

<dependency>
Expand All @@ -84,13 +137,19 @@
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-base</artifactId>
<version>${org.apache.jena}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>13.0</version>
</dependency>
<dependency>
<groupId>cz.cvut.kbss.jopa</groupId>
Expand All @@ -100,6 +159,15 @@
<groupId>cz.cvut.kbss.jopa</groupId>
<artifactId>ontodriver-rdf4j</artifactId>
</dependency>
<dependency>
<groupId>cz.cvut.kbss.jopa</groupId>
<artifactId>ontodriver-api</artifactId>
<version>${cz.cvut.kbss.jopa.version}</version>
</dependency>
<dependency>
<groupId>cz.cvut.kbss.jopa</groupId>
<artifactId>jopa-api</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down
142 changes: 103 additions & 39 deletions s-pipes-debug/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,13 @@
</repositories>

<dependencies>
<!-- Spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-hateoas</artifactId>
</dependency>

<!-- KBSS-CVUT -->
<dependency>
<groupId>cz.cvut.kbss</groupId>
<artifactId>s-pipes-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>cz.cvut.kbss.jopa</groupId>
<artifactId>ontodriver-rdf4j</artifactId>
</dependency>
<dependency>
<groupId>cz.cvut.kbss.jopa</groupId>
<artifactId>jopa-impl</artifactId>
Expand All @@ -75,41 +61,125 @@
<artifactId>jb4jsonld-jackson</artifactId>
</dependency>

<!-- Swagger -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.8.6</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<groupId>com.github.ledsoft</groupId>
<artifactId>jopa-spring-boot-loader</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>

<!-- Spring boot Actuator -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<artifactId>spring-boot</artifactId>
<version>${org.springframework.boot.version}</version>
</dependency>

<dependency>
<groupId>com.github.ledsoft</groupId>
<artifactId>jopa-spring-boot-loader</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${org.springframework.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.hateoas</groupId>
<artifactId>spring-hateoas</artifactId>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations-jakarta</artifactId>
<version>2.2.29</version>
</dependency>

<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-http</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-api</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model-api</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common-exception</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-repository-manager</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-query</artifactId>
<version>${org.eclipse.rdf4j.version}</version>
</dependency>

<dependency>
<groupId>cz.cvut.kbss</groupId>
<artifactId>s-pipes-model</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>cz.cvut.kbss.jsonld</groupId>
<artifactId>jb4jsonld</artifactId>
<version>0.14.2</version>
</dependency>
<dependency>
<groupId>cz.cvut.kbss.jopa</groupId>
<artifactId>jopa-api</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${com.fasterxml.jackson.version}</version>
</dependency>

<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
</dependencies>

Expand Down Expand Up @@ -140,12 +210,6 @@
<version>${org.mapstruct.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<parameters>true</parameters>
</configuration>
</plugin>
Expand Down
1 change: 0 additions & 1 deletion s-pipes-debug/src/main/java/cz/cvut/spipes/debug/service/ScriptService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.util.function.Predicate;
import java.util.stream.Collectors;

import org.apache.catalina.Pipeline;
import org.springframework.stereotype.Service;

import cz.cvut.spipes.debug.exception.NotFoundException;
Expand Down
Loading