diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 00000000000..c3298e14cce --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,41 @@ +name: Documentation + +on: + push: + branches: + - 3.12.x + paths: + - "docs/manual/**" + pull_request: + branches: + - 3.12.x + paths: + - "docs/manual/**" + workflow_dispatch: + +jobs: + deploy-docs: + runs-on: ubuntu-latest + steps: + - name: Checkout GeoNetwork + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install Python + uses: actions/setup-python@v4 + with: + python-version: 3.x + - name: mkdocs install + run: pip install --upgrade pip && pip install -r docs/manual/requirements.txt + - name: git configuration + run: git config user.name 'github-actions[bot]' && git config user.email 'github-actions[bot]@users.noreply.github.com' + - name: build docs without publishing them + if: ${{ github.event_name == 'pull_request' }} + working-directory: docs/manual + run: | + mike deploy --title "3.12 Maintenance" --no-redirect --update-aliases 3.12 maintenance + - name: deploy maintenance docs to gh-pages branch + if: ${{ github.event_name != 'pull_request' }} + working-directory: docs/manual + run: | + mike deploy --push --title "3.12 Maintenance" --no-redirect --update-aliases 3.12 maintenance diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c5ef45be957..6650af828d2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -3,7 +3,7 @@ name: Linux GitHub CI on: [pull_request,push,workflow_dispatch] env: - MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Xmx512m -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS + MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Xmx512m -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn TAKARI_SMART_BUILDER_VERSION: 0.6.1 jobs: @@ -22,17 +22,25 @@ jobs: submodules: 'recursive' show-progress: 'false' - name: Set up JDK - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v3.12.0 with: distribution: 'temurin' java-version: ${{ matrix.jdk }} cache: 'maven' + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: 3.x + - name: mkdocs install + working-directory: docs/manual + run: pip install --upgrade pip && pip install -r requirements.txt - name: Set up Maven uses: stCarolas/setup-maven@v4 with: maven-version: 3.6.3 - name: Build with Maven - run: mvn -B -V install -DskipTests=true -Dmaven.javadoc.skip=true + run: | + mvn -B -ntp -V install -DskipTests=true -Dmaven.javadoc.skip=true -Pwith-doc - name: Remove SNAPSHOT jars from repository run: | find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {} @@ -50,7 +58,7 @@ jobs: submodules: 'recursive' show-progress: 'false' - name: Set up JDK - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v3.12.0 with: distribution: 'temurin' java-version: 8 diff --git a/.gitignore b/.gitignore index ee11cd6bee8..00e528530e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,9 @@ # Extensions *.factorypath *.iml -*.iml +*.bak *.launch *.old -*.bak .DS_Store .project git*.properties @@ -15,8 +14,9 @@ git*.properties */.* */target/ .*/ -!.github/ +!.github +#GeoNetwork* /geonetwork* camel-harvesters/wfsfeature-harvester/logs changes-* @@ -29,6 +29,7 @@ docs/schema-loc-*.rst eclipse/ es/elasticsearch-* es/es-dashboards/kibana-* +es/es-dashboards/data/nodes/ harvesters/harvester_*.log idea/ jcs_caching/ @@ -41,6 +42,9 @@ schemas/*/doc/*/*.rst schematrons/.build target/ transifex/transifex-format/ + +# web-app, clear using: mvn -f web/pom.xml clean:clean@reset + web-itest/jcs_caching web-ui-docs/node web-ui-docs/node_modules @@ -57,6 +61,8 @@ web/jcs_caching/ web/logs/ web/src/main/webapp/META-INF/MANIFEST.MF web/src/main/webapp/WEB-INF/data/0* +web/src/main/webapp/WEB-INF/data/config/encryptor.properties +web/src/main/webapp/WEB-INF/data/config/index/records.json web/src/main/webapp/WEB-INF/data/config/schema_plugins/*/schematron/schematron*.xsl web/src/main/webapp/WEB-INF/data/config/schema_plugins/csw-record web/src/main/webapp/WEB-INF/data/config/schema_plugins/dublin-core @@ -83,6 +89,7 @@ web/src/main/webapp/WEB-INF/data_* web/src/main/webapp/WEB-INF/lucene/ web/src/main/webapp/WEB-INF/metadata_subversion/ web/src/main/webapp/WEB-INF/server.prop +web/src/main/webapp/WEB-INF/prebuilt web/src/main/webapp/data/ web/src/main/webapp/doc/en web/src/main/webapp/doc/fr diff --git a/docs/manual/docs/index.fr.md b/docs/manual/docs/index.fr.md index 5b83b12bb30..0578e9f40dd 100644 --- a/docs/manual/docs/index.fr.md +++ b/docs/manual/docs/index.fr.md @@ -3,7 +3,7 @@ hide: - navigation --- -# GeoNetwork {#toc} +# GeoNetwork 3.12 {#toc} Bienvenue à GeoNetwork. Cette documentation est organisée en guides spécifiques destinés à différents publics. diff --git a/docs/manual/docs/index.md b/docs/manual/docs/index.md index 53566091e50..10024565735 100644 --- a/docs/manual/docs/index.md +++ b/docs/manual/docs/index.md @@ -3,7 +3,7 @@ hide: - navigation --- -# GeoNetwork {#toc} +# GeoNetwork 3.12 {#toc} Welcome to GeoNetwork. This documentation is organized into specific guides targeting different audience. diff --git a/docs/manual/mkdocs.yml b/docs/manual/mkdocs.yml index 4b9b22b8056..defb1508e48 100644 --- a/docs/manual/mkdocs.yml +++ b/docs/manual/mkdocs.yml @@ -126,7 +126,7 @@ markdown_extensions: # Page tree nav: - - index.md + - 'GeoNetwork': index.md - 'Overview': - overview/index.md - overview/about.md diff --git a/docs/manual/pom.xml b/docs/manual/pom.xml index 9bd8e690cc0..c83d2f33840 100644 --- a/docs/manual/pom.xml +++ b/docs/manual/pom.xml @@ -25,9 +25,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - gn-docs + docs org.geonetwork-opensource - 4.4.0-SNAPSHOT + 3.12-SNAPSHOT 4.0.0 gn-guide