Skip to content

Commit

Permalink
Merge branch 'main' into main.menu.static.page.feature
Browse files Browse the repository at this point in the history
  • Loading branch information
wangf1122 authored Nov 14, 2024
2 parents 8cd0798 + d672a4c commit b8f1a9b
Show file tree
Hide file tree
Showing 1,112 changed files with 104,898 additions and 21,601 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
show-progress: 'false'

- name: Setup Java JDK
uses: actions/setup-java@v4.1.0
uses: actions/setup-java@v4.2.1
with:
java-version: 11
# Java distribution. See the list of supported distributions in README file
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
working-directory: docs/manual
run: |
mike deploy --title "4.4 Latest" --alias-type=copy --update-aliases 4.4 latest
mike deploy --title "4.4" --alias-type=copy --update-aliases 4.4 latest
- name: deploy latest docs to gh-pages branch
if: ${{ github.event_name != 'pull_request' }}
working-directory: docs/manual
run: |
mike deploy --push --title "4.4 Latest" --alias-type=copy --update-aliases 4.4 latest
mike deploy --push --title "4.4" --alias-type=copy --update-aliases 4.4 latest
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
submodules: 'recursive'
show-progress: 'false'
- name: Set up JDK
uses: actions/setup-java@v4.1.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'temurin'
java-version: ${{ matrix.jdk }}
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.6.3
maven-version: 3.8.3
- name: Build with Maven
run: |
mvn -B -ntp -V install -DskipTests=true -Dmaven.javadoc.skip=true -Drelease -Pwith-doc
Expand All @@ -55,15 +55,15 @@ jobs:
submodules: 'recursive'
show-progress: 'false'
- name: Set up JDK
uses: actions/setup-java@v4.1.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'temurin'
java-version: 11
cache: 'maven'
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.6.3
maven-version: 3.8.3
- name: Test with maven
run: |
mvn -B resources:resources@copy-index-schema-to-source -f web
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mvn-dep-tree.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
show-progress: 'false'

- name: Setup Java JDK
uses: actions/setup-java@v4.1.0
uses: actions/setup-java@v4.2.1
with:
java-version: 11
# Java distribution. See the list of supported distributions in README file
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# This workflow uses actions that are not certified by GitHub. They are provided
# by a third-party and are governed by separate terms of service, privacy
# policy, and support documentation.

name: Scorecard supply-chain security
on:
# For Branch-Protection check. Only the default branch is supported. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
branch_protection_rule:
# To guarantee Maintained check is occasionally updated. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
schedule:
- cron: '26 10 * * 5'
push:
branches: [ "main" ]

# Declare default permissions as read only.
permissions: read-all

jobs:
analysis:
name: Scorecard analysis
runs-on: ubuntu-latest
permissions:
# Needed to upload the results to code-scanning dashboard.
security-events: write
# Needed to publish results and get a badge (see publish_results below).
id-token: write
# Uncomment the permissions below if installing in a private repository.
# contents: read
# actions: read

steps:
- name: "Checkout code"
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
with:
results_file: results.sarif
results_format: sarif
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
# - you want to enable the Branch-Protection check on a *public* repository, or
# - you are installing Scorecard on a *private* repository
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
# repo_token: ${{ secrets.SCORECARD_TOKEN }}

# Public repositories:
# - Publish results to OpenSSF REST API for easy access by consumers
# - Allows the repository to include the Scorecard badge.
# - See https://github.com/ossf/scorecard-action#publishing-results.
# For private repositories:
# - `publish_results` will always be set to `false`, regardless
# of the value entered here.
publish_results: true

# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
submodules: 'recursive'
show-progress: 'false'
- name: Set up JDK 11
uses: actions/setup-java@v4.1.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'temurin'
java-version: '11'
Expand All @@ -34,7 +34,7 @@ jobs:
run: mvn -B package -DskipTests

- name: Set up JDK 21 # Sonarcloud analyzer needs at least JDK 17
uses: actions/setup-java@v4.1.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'temurin'
java-version: '21'
Expand Down
11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ release/jetty/*
schemas/*/doc/*/*.rst
schematrons/.build
target/

# build and release
transifex/transifex-format/
build/
web-ui/LICENSE
web-ui/tx

# web-app, clear using: mvn -f web/pom.xml clean:clean@reset

Expand All @@ -59,11 +64,7 @@ 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
web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19*
web/src/main/webapp/WEB-INF/data/config/schema_plugins/schemaplugin-uri-catalog.xml
web/src/main/webapp/WEB-INF/data/config/schema_plugins/*
web/src/main/webapp/WEB-INF/data/config/schemaplugin-uri-catalog.xml
web/src/main/webapp/WEB-INF/data/data/backup
web/src/main/webapp/WEB-INF/data/data/metadata_data
Expand Down
88 changes: 88 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# This CITATION.cff file was generated with cffinit.
# Visit https://bit.ly/cffinit to generate yours today!

cff-version: 1.2.0
title: GeoNetwork opensource
message: >-
If you use this software, please cite it using the
metadata from this file.
type: software
authors:
- given-names: François
family-names: Prunayre
affiliation: Titellus
- given-names: Jose
family-names: García
affiliation: GeoCat BV
- given-names: Jeroen
family-names: Ticheler
affiliation: GeoCat BV
orcid: 'https://orcid.org/0009-0003-3896-0437'
email: [email protected]
- given-names: Florent
family-names: Gravin
affiliation: CamptoCamp
- given-names: Simon
family-names: Pigot
affiliation: CSIRO Australia
- name: GeoCat BV
address: Veenderweg 13
city: Bennekom
country: NL
post-code: 6721 WD
tel: +31 (0) 318 416 664
website: 'https://www.geocat.net/'
email: [email protected]
- name: Titellus
address: 321 Route de la Mollière
city: Saint Pierre de Genebroz
country: FR
post-code: 73360
website: 'https://titellus.net/'
email: [email protected]
- name: CamptoCamp
address: QG Center Rte de la Chaux 4
city: Bussigny
country: CH
post-code: 1030
tel: +41 (21) 619 10 10
website: 'https://camptocamp.com/'
email: [email protected]
- name: Open Source Geospatial Foundation - OSGeo
address: '9450 SW Gemini Dr. #42523'
location: Beaverton
region: Oregon
post-code: '97008'
country: US
email: [email protected]
website: 'https://www.osgeo.org/'
repository-code: 'http://github.com/geonetwork/core-geonetwork'
url: 'https://geonetwork-opensource.org'
repository-artifact: >-
https://sourceforge.net/projects/geonetwork/files/GeoNetwork_opensource/
abstract: >-
GeoNetwork is a catalog application to manage spatial and
non-spatial resources. It is compliant with critical
international standards from ISO, OGC and INSPIRE. It
provides powerful metadata editing and search functions as
well as an interactive web map viewer.
keywords:
- catalog
- gis
- sdi
- spatial data infrastructure
- dataspace
- search
- open data
- standards
- spatial
- CSW
- OGCAPI Records
- DCAT
- GeoDCAT-AP
- Catalog Service
- OGC
- open geospatial consortium
- osgeo
- open source geospatial foundation
license: GPL-2.0
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ Developer documentation located in ``README.md`` files in the code-base:
* General documentation for the project as a whole is in this [README.md](README.md)
* [Software Development Documentation](/software_development/) provides instructions for setting up a development environment, building GeoNetwork, compiling user documentation, and making a releases.
* Module specific documentation can be found in each module:

## Open Source Security Foundation (OpenSSF) best practices status
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8626/badge)](https://www.bestpractices.dev/projects/8626)
10 changes: 5 additions & 5 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ Each GeoNetwork release is supported with bug fixes for a limited period, with p
- We recommend to update to latest incremental release as soon as possible to address security vulnerabilities.
- Some overlap is provided when major versions are announced with both a current version and a maintenance version being made available to provide time for organizations to upgrade.

| Version | Supported | Comment |
|---------|--------------------|---------------------|
| 4.4.x | :white_check_mark: | Latest version |
| 4.2.x | :white_check_mark: | Stable version |
| 3.12.x | :white_check_mark: | Maintenance version |
| Version | Supported | Comment |
|---------|--------------------|---------------------------------------------|
| 4.4.x | :white_check_mark: | Latest version |
| 4.2.x | :white_check_mark: | Stable version |
| 3.12.x | | End Of Life 2024-03-31 |

If your organisation is making use of a GeoNetwork version that is no longer in use by the community all is not lost. You can volunteer on the developer list to make additional releases, or engage with one of our [Commercial Support](https://www.osgeo.org/service-providers/?p=geonetwork) providers.

Expand Down
10 changes: 5 additions & 5 deletions add-schema.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ then
${insertLine} a\\
\ <dependency>\\
\ <groupId>org.geonetwork-opensource.schemas</groupId>\\
\ <artifactId>schema-${schema}</artifactId>\\
\ <artifactId>gn-schema-${schema}</artifactId>\\
\ <version>${gnSchemasVersion}</version>\\
\ </dependency>
SED_SCRIPT
Expand All @@ -103,7 +103,7 @@ SED_SCRIPT
\ <dependencies>\\
\ <dependency>\\
\ <groupId>org.geonetwork-opensource.schemas</groupId>\\
\ <artifactId>schema-${schema}</artifactId>\\
\ <artifactId>gn-schema-${schema}</artifactId>\\
\ <version>${gnSchemasVersion}</version>\\
\ </dependency>\\
\ </dependencies>\\
Expand All @@ -121,7 +121,7 @@ SED_SCRIPT
\ <artifactItems>\\
\ <artifactItem>\\
\ <groupId>org.geonetwork-opensource.schemas</groupId>\\
\ <artifactId>schema-${schema}</artifactId>\\
\ <artifactId>gn-schema-${schema}</artifactId>\\
\ <type>zip</type>\\
\ <overWrite>false</overWrite>\\
\ <outputDirectory>\$\{schema-plugins.dir\}</outputDirectory>\\
Expand All @@ -138,7 +138,7 @@ SED_SCRIPT
fi

# Add schema resources in service/pom.xml with test scope for unit tests
line=$(grep -n "<artifactId>schema-${schema}</artifactId>" services/pom.xml | cut -d: -f1)
line=$(grep -n "<artifactId>gn-schema-${schema}</artifactId>" services/pom.xml | cut -d: -f1)

if [ ! $line ]
then
Expand All @@ -154,7 +154,7 @@ then
${finalLine} a\\
\ <dependency>\\
\ <groupId>${projectGroupId}</groupId>\\
\ <artifactId>schema-${schema}</artifactId>\\
\ <artifactId>gn-schema-${schema}</artifactId>\\
\ <version>${gnSchemasVersion}</version>\\
\ <scope>test</scope>\\
\ </dependency>
Expand Down
2 changes: 1 addition & 1 deletion cachingxslt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>4.4.3-SNAPSHOT</version>
<version>4.4.7-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>4.4.3-SNAPSHOT</version>
<version>4.4.7-SNAPSHOT</version>
</parent>


Expand Down
Loading

0 comments on commit b8f1a9b

Please sign in to comment.