-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into ELTER-25_SITESlogo
- Loading branch information
Showing
16 changed files
with
1,078 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,3 +36,4 @@ org.eclipse.* | |
DevStartupController.java | ||
docker-compose.override.yml | ||
*.private.env.json | ||
/sparql.http |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,4 +9,4 @@ | |
<option name="Make" enabled="true" /> | ||
</method> | ||
</configuration> | ||
</component> | ||
</component> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ RUN npm install -g grunt-cli | |
RUN node_modules/.bin/grunt | ||
|
||
# Build Java | ||
FROM gradle:7.2-jdk16 AS build-java | ||
FROM gradle:8.2-jdk17-alpine AS build-java | ||
WORKDIR /app | ||
COPY --chown=gradle:gradle java/src src/ | ||
COPY --chown=gradle:gradle java/build.gradle . | ||
|
@@ -18,7 +18,7 @@ WORKDIR build/libs | |
RUN java -Djarmode=layertools -jar app.jar extract | ||
|
||
# Create production image | ||
FROM openjdk:16-alpine AS prod | ||
FROM eclipse-temurin:17-alpine AS prod | ||
LABEL maintainer="[email protected]" | ||
RUN apk --no-cache add curl | ||
RUN addgroup -g 1001 -S spring && adduser -u 1001 -S spring -G spring | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -189,6 +189,16 @@ public CatalogueUser sitesMetadataImport() throws UsernameAlreadyTakenException | |
return user; | ||
} | ||
|
||
@Bean | ||
public CatalogueUser b2shareMetadataImport() throws UsernameAlreadyTakenException { | ||
val user = new CatalogueUser() | ||
.setUsername("B2SHARE metadata import") | ||
.setEmail("[email protected]"); | ||
addUserToGroup(user, ELTER_EDITOR, ELTER_PUBLISHER); | ||
userStore().addUser(user, "password"); | ||
return user; | ||
} | ||
|
||
@Bean | ||
public CatalogueUser erammpEditor() throws UsernameAlreadyTakenException { | ||
val user = new CatalogueUser() | ||
|
Oops, something went wrong.