feat: update db config, remove deprecated ogc features custom impleme…

…ntation
georchestra · Jun 20, 2024 · e7a16da · e7a16da
1 parent 092e109
commit e7a16da
Show file tree

Hide file tree

Showing 6 changed files with 1,037 additions and 622 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -217,25 +217,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>jdk11+</id>
-      <activation>
-        <jdk>[11,)</jdk>
-      </activation>
-      <properties>
-        <java.version>11</java.version>
-      </properties>
-        <dependencies>
-          <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-          </dependency>
-          <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-          </dependency>
-        </dependencies>
-    </profile>
   </profiles>
   <properties>
     <rootProjectDir>${basedir}/..</rootProjectDir>

diff --git a/georchestra-migration/migration-dev-guide.md b/georchestra-migration/migration-dev-guide.md
@@ -28,7 +28,6 @@ All italic folder just have the `pom.xml` change.
 - common
   - `ZipUtilTest.java` : In `assertExampleZip` method, assertions which are supposed check folders must check with trailing slash too.
 - core
-  - `JeevesContextLoaderListener.java` : remove java 8 runtime exception as we use java 11.
   - `XslUtil.java`: Implement georchestra header specific code
   - `config-spring-geonetwork.xml` : Implement `context:property-placeholder` for georchestra's datadir
   - `src/test/resources/config-spring-geonetwork.xml`: Add GeonetworkDataDirectory bean
@@ -49,9 +48,7 @@ All italic folder just have the `pom.xml` change.
 - *events*
 - **georchestra-integration** 
   - Mandatory, get everything from geOrchestra
-- harvesters
-  - `Harvester.java`: Use parseJDK11 method 
-  - `HarvesterTest.java` : Ignore and assume true Java 8
+- *harvesters*
 - *healthmonitor*
 - *index*
 - *inspire-atom*
@@ -62,14 +59,10 @@ All italic folder just have the `pom.xml` change.
 - *release*
 - schemas
   - `src/main/plugin/iso19115-3.2018`
-    - OGC API features, COG and 3Dtiles added. Differences in files:
-      - `config/associated-panel/default.json`
-      - `loc/eng/labels.xml`
-      - `loc/fre/labels.xml`
-      - `test/resources/metadata-for-editing.xml`
-      - `test/resources/metadata-for-editing-light.xml`
-      - `test/resources/metadata-iso19139-for-editing.xml`
-      - `src/main/plugin/iso19115-3.2018/config/associated-panel/default.json` : Keep OGC API - Features placeholder
+    - COG and 3Dtiles added. Differences in files:
+      - ...`config/associated-panel/default.json`
+      - ...`loc/eng/labels.xml`
+      - ...`loc/fre/labels.xml`
   - `src/main/plugin/iso19139/loc` : COG and 3Dtiles added in labels.xml files.
   - `iso19139/layout/config-editor.xml`: xlinks for contacts reenabled
 - *schemas-test*
@@ -118,7 +111,7 @@ All italic folder just have the `pom.xml` change.
 - .gitignore 
   - add idea and settings to it
 - pom.xml  
-  - Implement JDK 11 specific things, add georchestra-integration module, set db-type
+  - Add georchestra-integration module, set db-type
 
 ## Process used
 

diff --git a/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing-light.xml b/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing-light.xml
@@ -5080,7 +5080,6 @@ la non-évaluation</b>, dans le cadre de métadonnées INSPIRE]]></help>
             <help>Protocole de connexion utilisé, par exemple FTP.</help>
             <condition />
             <helper sort="true">
-              <option value="OGC API Features">OGC API - Features</option>
               <option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
               <option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
               <option value="OGC:GML">OGC-GML Geography Markup Language</option>

diff --git a/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing.xml b/schemas/iso19115-3.2018/src/test/resources/metadata-for-editing.xml
@@ -23601,7 +23601,6 @@ la non-évaluation</b>, dans le cadre de métadonnées INSPIRE]]></help>
             <help>Protocole de connexion utilisé, par exemple FTP.</help>
             <condition />
             <helper sort="true">
-              <option value="OGC API Features">OGC API - Features</option>
               <option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
               <option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
               <option value="OGC:GML">OGC-GML Geography Markup Language</option>

diff --git a/schemas/iso19115-3.2018/src/test/resources/metadata-iso19139-for-editing.xml b/schemas/iso19115-3.2018/src/test/resources/metadata-iso19139-for-editing.xml
@@ -23601,7 +23601,6 @@ la non-évaluation</b>, dans le cadre de métadonnées INSPIRE]]></help>
             <help>Protocole de connexion utilisé, par exemple FTP.</help>
             <condition />
             <helper sort="true">
-              <option value="OGC API Features">OGC API - Features</option>
               <option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
               <option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
               <option value="OGC:GML">OGC-GML Geography Markup Language</option>