Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile.tomcat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.hub.docker.com/entando/entando-tomcat-base:v7.5.0-ESB-985-PR-36-BB-release-2F-7.5
FROM registry.hub.docker.com/entando/entando-tomcat-base:7.5.0
ARG VERSION

### Required OpenShift Labels
Expand Down
2 changes: 1 addition & 1 deletion admin-console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<groupId>org.entando.entando</groupId>
<artifactId>entando-admin-console</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cds-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>entando-plugin-jpcds</artifactId>
<groupId>org.entando.entando.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion cms-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<groupId>org.entando.entando.plugins</groupId>
<artifactId>entando-plugin-jacms</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion contentscheduler-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>entando-plugin-jpcontentscheduler</artifactId>
<groupId>org.entando.entando.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion contentworkflow-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>entando-plugin-jpcontentworkflow</artifactId>
<groupId>org.entando.entando.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<groupId>org.entando.entando</groupId>
<artifactId>entando-engine</artifactId>
Expand Down
6 changes: 4 additions & 2 deletions keycloak-plugin/keycloak/realm-export.json
Original file line number Diff line number Diff line change
Expand Up @@ -603,10 +603,12 @@
"clientAuthenticatorType": "client-secret",
"secret": "**********",
"redirectUris": [
"http://localhost:8080/*"
"http://localhost:8080/*",
"http://localhost:3000/*"
],
"webOrigins": [
"http://localhost:8080"
"http://localhost:8080",
"http://localhost:3000"
],
"notBefore": 0,
"bearerOnly": false,
Expand Down
2 changes: 1 addition & 1 deletion keycloak-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>app-engine</artifactId>
<groupId>org.entando</groupId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<groupId>org.entando.entando</groupId>
<artifactId>entando-keycloak-auth</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mail-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>entando-plugin-jpmail</artifactId>
<groupId>org.entando.entando.plugins</groupId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>entando-maven-root</artifactId>
<version>7.4.0-ENG-5316-PR-21</version>
<version>7.5.0</version>
</parent>
<groupId>org.entando</groupId>

<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
<packaging>pom</packaging>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion portal-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<groupId>org.entando.entando</groupId>
<artifactId>entando-portal-ui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion redis-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>entando-plugin-jpredis</artifactId>
<groupId>org.entando.entando.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion seo-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>entando-plugin-jpseo</artifactId>
<groupId>org.entando.entando.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion solr-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>entando-plugin-jpsolr</artifactId>
<groupId>org.entando.entando.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion versioning-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<artifactId>entando-plugin-jpversioning</artifactId>
<groupId>org.entando.entando.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<groupId>org.entando.entando</groupId>
<artifactId>webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion webdynamicform-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.entando</groupId>
<artifactId>app-engine</artifactId>
<version>7.5.0-SNAPSHOT</version>
<version>7.5.0</version>
</parent>
<groupId>org.entando.entando.plugins</groupId>
<artifactId>entando-plugin-jpwebdynamicform</artifactId>
Expand Down
Loading