Skip to content
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.

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

Refactoring/fairspc 82 #1566

Merged
merged 89 commits into from
Nov 28, 2024
Merged

Refactoring/fairspc 82 #1566

merged 89 commits into from
Nov 28, 2024

Conversation

tgreenwood
Copy link
Contributor

No description provided.

…actoring/FAIRSPC-82

# Conflicts:
#	projects/saturn/build.gradle
#	projects/saturn/src/main/java/io/fairspace/saturn/FusekiConfig.java
#	projects/saturn/src/main/java/io/fairspace/saturn/auth/RequestContext.java
#	projects/saturn/src/main/java/io/fairspace/saturn/config/SparkFilterConfig.java
#	projects/saturn/src/main/java/io/fairspace/saturn/rdf/transactions/TxnLogDatasetGraph.java
#	projects/saturn/src/main/java/io/fairspace/saturn/webdav/WebDAVServlet.java
#	projects/saturn/src/main/resources/application.yaml
- moved search config to properties
- moved web DAV config to properties
# Conflicts:
#	projects/saturn/application.yaml
#	projects/saturn/src/main/java/io/fairspace/saturn/config/Config.java
#	projects/saturn/src/main/java/io/fairspace/saturn/config/Services.java
#	projects/saturn/src/main/java/io/fairspace/saturn/rdf/transactions/TxnLogDatasetGraph.java
#	projects/saturn/src/main/java/io/fairspace/saturn/services/maintenance/MaintenanceApp.java
#	projects/saturn/src/main/java/io/fairspace/saturn/services/metadata/MetadataApp.java
#	projects/saturn/src/main/java/io/fairspace/saturn/services/views/JdbcQueryService.java
#	projects/saturn/src/main/java/io/fairspace/saturn/services/views/SparqlQueryService.java
#	projects/saturn/src/main/java/io/fairspace/saturn/services/views/ViewService.java
#	projects/saturn/src/main/java/io/fairspace/saturn/services/views/ViewStoreClientFactory.java
#	projects/saturn/src/main/java/io/fairspace/saturn/services/views/ViewStoreReader.java
#	projects/saturn/src/test/java/io/fairspace/saturn/services/views/JdbcQueryServiceTest.java
#	projects/saturn/src/test/java/io/fairspace/saturn/services/views/SparqlQueryServiceTest.java
tgreenwood and others added 18 commits October 14, 2024 18:22
# Conflicts:
#	projects/saturn/src/main/java/io/fairspace/saturn/controller/WorkspaceController.java
#	projects/saturn/src/main/java/io/fairspace/saturn/services/workspaces/WorkspaceService.java
# Conflicts:
#	projects/saturn/src/main/java/io/fairspace/saturn/webdav/WebDAVConfig.java
@tgreenwood tgreenwood assigned ewelinagr and unassigned tgreenwood Oct 24, 2024
@ewelinagr ewelinagr merged commit 86f041f into dev Nov 28, 2024
6 checks passed
@ewelinagr ewelinagr deleted the refactoring/FAIRSPC-82 branch November 28, 2024 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants