diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a1db291..5cbcfe95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,17 +10,6 @@ jobs: distribution: 'temurin' java-version: '17' - # because Avispa ECM is not available now in any public Maven repository - # it needs to be checked out and installed manually - - name: Checkout of Avispa ECM - uses: actions/checkout@v3.2.0 - with: - repository: RHarryH/avispa-ecm - - - name: Installment of Avispa ECM into Maven repository - run: mvn -B -DskipTests install - - # here the actual build starts - name: Standard Checkout uses: actions/checkout@v3.2.0 diff --git a/README.md b/README.md index c0ec5db7..fd38b97e 100644 --- a/README.md +++ b/README.md @@ -259,7 +259,7 @@ when working with DTOs in MicroF. ### 2.0.0 → 2.1.0 1. Access PostgreSQL container console and connect to the db with `psql -U microf` command. -2. Run `/ecm-client-backend/sql/03-schema-ecm-client-postgresql.sql` script to add missing tables. -3. Run `/migration/2_0_0-2_1_0.sql` script to change the type of `id` columns for existing tables. This covers both ECM +2. Run `/migration/2_0_0-2_1_0.sql` script to change the type of `id` columns for existing tables. This covers both ECM and μF tables. +3. Run `/ecm-client-backend/sql/03-schema-ecm-client-postgresql.sql` script to add missing tables. 4. Load `microf-configuration.zip` from Swagger without configuration override. \ No newline at end of file diff --git a/ecm-client-backend/pom.xml b/ecm-client-backend/pom.xml index 1ebe9cfd..5ca833af 100644 --- a/ecm-client-backend/pom.xml +++ b/ecm-client-backend/pom.xml @@ -24,7 +24,7 @@ com.avispa microf - 2.1.0 + 2.1.1 ecm-client-backend diff --git a/microf-custom/pom.xml b/microf-custom/pom.xml index 7ccc6160..aef7188d 100644 --- a/microf-custom/pom.xml +++ b/microf-custom/pom.xml @@ -24,7 +24,7 @@ com.avispa microf - 2.1.0 + 2.1.1 com.avispa.microf @@ -48,7 +48,7 @@ com.avispa ecm-client-backend - 2.1.0 + 2.1.1 diff --git a/migration/2_0_0-2_1_0.sql b/migration/2_0_0-2_1_0.sql index 4c17686e..b0c01793 100644 --- a/migration/2_0_0-2_1_0.sql +++ b/migration/2_0_0-2_1_0.sql @@ -80,6 +80,11 @@ ALTER TABLE upsert ALTER TABLE upsert ALTER COLUMN property_page_id TYPE CHAR(36); +ALTER TABLE list_widget_config + RENAME TO list_widget; +ALTER TABLE list_widget_config_properties + RENAME TO list_widget_properties; + -- Avispa μF ALTER TABLE address ALTER COLUMN id TYPE CHAR(36); diff --git a/pom.xml b/pom.xml index 6c8852ad..9148df73 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ com.avispa microf - 2.1.0 + 2.1.1 pom Avispa μF Simple application for invoice creation and taxes calculation @@ -41,6 +41,19 @@ + + + avispa-repository-release + Avispa Repository Release + https://repository.rafalhiszpanski.pl/releases + + + avispa-repository-snapshot + Avispa Repository Snapshot + https://repository.rafalhiszpanski.pl/snapshots + + + ecm-client-backend microf-custom