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

[SYNCOPE-1827] Only JPA with JSON support available, PostgreSQL the default option #820

Merged
merged 43 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
422704b
Initial commit
ilgrosso Aug 5, 2024
c007a6c
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 9, 2024
eb5f2cd
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 16, 2024
5fb6bf2
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 19, 2024
7a29b63
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 20, 2024
e977eb2
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 21, 2024
ff5fb71
Bye bye core/persistence-jpa-json
ilgrosso Aug 21, 2024
6803eec
Fixing Oracle GH action
ilgrosso Aug 21, 2024
ae0bd38
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 26, 2024
f82f937
PostgreSQL without Docker
ilgrosso Aug 26, 2024
bc6ef28
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 27, 2024
cfa03cd
Restoring Neo4j unit tests via docker-maven-plugin
ilgrosso Aug 27, 2024
02c0185
Fixes
ilgrosso Aug 27, 2024
e31c856
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 28, 2024
9203bd9
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 29, 2024
d285054
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Aug 29, 2024
eecea66
Higher timeout needed by Windows
ilgrosso Aug 29, 2024
1392a6f
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Sep 7, 2024
14e195d
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Sep 7, 2024
fa145f2
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Sep 11, 2024
e2d3e33
More cargo ping timeout (needed by Windows)
ilgrosso Sep 11, 2024
b43a340
Using a real Postgres database for GH actions
ilgrosso Sep 11, 2024
66cc921
Start installed PostgreSQL instance on Windows
ilgrosso Sep 12, 2024
bee2ed5
Start installed PostgreSQL instance on Windows
ilgrosso Sep 12, 2024
69c4d18
stdout logging to understand windows
ilgrosso Sep 12, 2024
bd4cee5
default postgres user pwd
ilgrosso Sep 12, 2024
4041e48
Revert stdout settings
ilgrosso Sep 12, 2024
459d5ec
Ensuring UI tests run on fixed order
ilgrosso Sep 12, 2024
5413047
Revert "Ensuring UI tests run on fixed order"
ilgrosso Sep 12, 2024
5dc1fe6
Debug help
ilgrosso Sep 12, 2024
e7db43b
Revert "Debug help"
ilgrosso Sep 12, 2024
f6be217
Adding logout to rule them all
ilgrosso Sep 12, 2024
0bcf81a
Debug help
ilgrosso Sep 12, 2024
9abf9be
Revert "Debug help"
ilgrosso Sep 12, 2024
efdf9f4
debug
ilgrosso Sep 12, 2024
4c7da6e
debug
ilgrosso Sep 12, 2024
4d15aad
Merge remote-tracking branch 'upstream/master' into JPA_JSON_ONLY
ilgrosso Sep 13, 2024
8d13def
debug
ilgrosso Sep 13, 2024
b205478
Revert "debug"
ilgrosso Sep 13, 2024
b4d2ae8
Revert "debug"
ilgrosso Sep 13, 2024
816e945
Splitting OIDCC4UI and SAML2SP4UI
ilgrosso Sep 13, 2024
e70712d
docs
ilgrosso Sep 13, 2024
64e457c
GH workflow consistency
ilgrosso Sep 13, 2024
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 .github/workflows/fit_Elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Elasticsearch / H2 / JSON'
- name: 'Elasticsearch / PostgreSQL / JSON'
run: mvn -f fit/core-reference/pom.xml -P elasticsearch-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
2 changes: 1 addition & 1 deletion .github/workflows/fit_OpenSearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'OpenSearch / H2 / JSON'
- name: 'OpenSearch / PostgreSQL / JSON'
run: mvn -f fit/core-reference/pom.xml -P opensearch-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
2 changes: 1 addition & 1 deletion .github/workflows/fit_Payara.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Payara / H2 / JSON'
- name: 'Payara / PostgreSQL / JSON'
run: mvn -f fit/core-reference/pom.xml -P payara-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License
name: "FIT Tomcat H2 JSON"
name: "FIT Tomcat PostgreSQL JSON"

on:
push:
Expand All @@ -26,7 +26,7 @@ on:
- cron: '0 13 * * 4'

jobs:
fit_Tomcat_H2_JSON:
fit_Tomcat_PostgreSQL_JSON:
runs-on: ubuntu-latest

steps:
Expand All @@ -49,5 +49,5 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Tomcat / H2 / JSON'
- name: 'Tomcat / PostgreSQL / JSON'
run: mvn -f fit/core-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License
name: "FIT Tomcat H2 XML"
name: "FIT Tomcat PostgreSQL XML"

on:
push:
Expand All @@ -26,7 +26,7 @@ on:
- cron: '0 13 * * 4'

jobs:
fit_Tomcat_H2_XML:
fit_Tomcat_PostgreSQL_XML:
runs-on: ubuntu-latest

steps:
Expand All @@ -49,5 +49,5 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Tomcat / H2 / XML'
- name: 'Tomcat / PostgreSQL / XML'
run: mvn -f fit/core-reference/pom.xml verify -Djaxrs.content.type=application/xml -Dit.test=org.apache.syncope.fit.core.*ITCase -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License
name: "FIT Tomcat H2 YAML"
name: "FIT Tomcat PostgreSQL YAML"

on:
push:
Expand All @@ -26,7 +26,7 @@ on:
- cron: '0 13 * * 4'

jobs:
fit_Tomcat_H2_YAML:
fit_Tomcat_PostgreSQL_YAML:
runs-on: ubuntu-latest

steps:
Expand All @@ -49,5 +49,5 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Tomcat / H2 / YAML'
- name: 'Tomcat / PostgreSQL / YAML'
run: mvn -f fit/core-reference/pom.xml verify -Djaxrs.content.type=application/yaml -Dit.test=org.apache.syncope.fit.core.*ITCase -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
2 changes: 1 addition & 1 deletion .github/workflows/fit_Wildfly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Wildfly / H2 / JSON'
- name: 'Wildfly / PostgreSQL / JSON'
run: mvn -f fit/core-reference/pom.xml -P wildfly-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
2 changes: 1 addition & 1 deletion .github/workflows/fit_Zookeeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Zookeeper / H2 / JSON'
- name: 'Zookeeper / PostgreSQL / JSON'
run: mvn -f fit/core-reference/pom.xml -P zookeeper-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
30 changes: 2 additions & 28 deletions .github/workflows/mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,33 +49,7 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Unit Tests: MariaDB'
run: mvn -f core/persistence-jpa/pom.xml -P mariadb -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- name: 'Integration Tests: MariaDB'
run: mvn -f fit/core-reference/pom.xml -P mariadb-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true

majson:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Setup Java JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 21
- name: Setup Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.6
- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Unit Tests: MariaDB JPA JSON'
run: mvn -f core/persistence-jpa-json/pom.xml -P majson -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- name: 'Integration Tests: MariaDB JPA JSON'
run: mvn -f fit/core-reference/pom.xml -P majson-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
30 changes: 2 additions & 28 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,33 +49,7 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Unit Tests: MySQL'
run: mvn -f core/persistence-jpa/pom.xml -P mysql -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- name: 'Integration Tests: MySQL'
run: mvn -f fit/core-reference/pom.xml -P mysql-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true

myjson:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Setup Java JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 21
- name: Setup Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.6
- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Unit Tests: MySQL JPA JSON'
run: mvn -f core/persistence-jpa-json/pom.xml -P myjson -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- name: 'Integration Tests: MySQL JPA JSON'
run: mvn -f fit/core-reference/pom.xml -P myjson-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
30 changes: 2 additions & 28 deletions .github/workflows/oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,33 +49,7 @@ jobs:
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Unit Tests: Oracle'
run: mvn -f core/persistence-jpa/pom.xml -P oracle -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- name: 'Integration Tests: Oracle'
run: mvn -f fit/core-reference/pom.xml -P oracle-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true

ojson:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Setup Java JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 21
- name: Setup Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.6
- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build
run: mvn -U -T 1C -P 'skipTests,all'
- name: 'Unit Tests: Oracle JPA JSON'
run: mvn -f core/persistence-jpa-json/pom.xml -P ojson -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.phase=none -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
- name: 'Integration Tests: Oracle JPA JSON'
run: mvn -f fit/core-reference/pom.xml -P ojson-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
81 changes: 0 additions & 81 deletions .github/workflows/postgresql.yml

This file was deleted.

22 changes: 15 additions & 7 deletions archetype/src/main/resources/archetype-resources/fit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,15 @@ under the License.

<dependencies>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.syncope.fit</groupId>
<artifactId>persistence-embedded</artifactId>
<version>${syncope.version}</version>
<classifier>bundle</classifier>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -144,6 +151,9 @@ under the License.
<copy file="../core/target/test-classes/core-all.properties"
todir="../core/target/syncope/WEB-INF/classes"
overwrite="true"/>
<copy file="${settings.localRepository}/org/apache/syncope/fit/persistence-embedded/${syncope.version}/persistence-embedded-${syncope.version}-bundle.jar"
todir="../core/target/syncope/WEB-INF/lib"
overwrite="true"/>

<copy file="../console/target/test-classes/console-embedded.properties"
todir="../console/target/syncope-console/WEB-INF/classes"
Expand Down Expand Up @@ -226,17 +236,15 @@ under the License.

<dependencies>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
</dependencies>

<systemProperties>
<java.security.egd>file:/dev/./urandom</java.security.egd>
<java.util.secureRandomSeed>true</java.util.secureRandomSeed>

<h2.returnOffsetDateTime>true</h2.returnOffsetDateTime>

<javax.net.ssl.trustStore>${basedir}/src/test/resources/keystore.jks</javax.net.ssl.trustStore>
<javax.net.ssl.trustStorePassword>password</javax.net.ssl.trustStorePassword>

Expand Down Expand Up @@ -330,7 +338,7 @@ under the License.
</properties>

<build>
<defaultGoal>clean verify cargo:run</defaultGoal>
<defaultGoal>clean verify cargo:run</defaultGoal>
</build>
</profile>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public class DomainWizardBuilder extends BaseAjaxWizardBuilder<Domain> {
"org.postgresql.Driver",
"com.mysql.cj.jdbc.Driver",
"org.mariadb.jdbc.Driver",
"com.microsoft.sqlserver.jdbc.SQLServerDriver",
"oracle.jdbc.OracleDriver",
"org.h2.Driver");

Expand All @@ -64,7 +63,6 @@ public class DomainWizardBuilder extends BaseAjaxWizardBuilder<Domain> {
+ "(blobTypeName=LONGBLOB,dateFractionDigits=3,useSetStringForClobs=true)",
"org.apache.openjpa.jdbc.sql.MariaDBDictionary"
+ "(blobTypeName=LONGBLOB,dateFractionDigits=3)",
"org.apache.openjpa.jdbc.sql.SQLServerDictionary",
"org.apache.openjpa.jdbc.sql.OracleDictionary",
"org.apache.openjpa.jdbc.sql.H2Dictionary");

Expand Down
Loading
Loading