Merge remote-tracking branch 'deegree/main' into changeSchemaFolder-1495

lat-lon · May 12, 2023 · c4ee1f9 · c4ee1f9
2 parents e58ec55 + 5c759db
commit c4ee1f9
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 13 deletions.
diff --git a/...ce/metadata/iso19115/example_iso19115.xml → .../datasource/metadata/iso19115/example.xml b/...ce/metadata/iso19115/example_iso19115.xml → .../datasource/metadata/iso19115/example.xml
diff --git a/...ree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/example.xml b/...ree-tilestore-merge/src/main/resources/META-INF/schemas/datasource/tile/merge/example.xml
@@ -1,4 +1,6 @@
-<mer:MergingTileStore xmlns:mer="http://www.deegree.org/datasource/tile/merge">
+<mer:MergingTileStore xmlns:mer="http://www.deegree.org/datasource/tile/merge"
+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                      xsi:schemaLocation="http://www.deegree.org/datasource/tile/merge https://schemas.deegree.org/3.5/datasource/tile/merge/merge.xsd">
   <mer:TileMatrixSetId>string</mer:TileMatrixSetId>
   <!--1 or more repetitions:-->
   <mer:TileStoreId>string</mer:TileStoreId>

diff --git a/...ee-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/example.xml b/...ee-layers/deegree-layers-gdal/src/main/resources/META-INF/schemas/layers/gdal/example.xml
@@ -1,5 +1,7 @@
 <GDALLayers xmlns="http://www.deegree.org/layers/gdal" xmlns:d="http://www.deegree.org/metadata/description"
-  xmlns:l="http://www.deegree.org/layers/base" xmlns:s="http://www.deegree.org/metadata/spatial">
+            xmlns:l="http://www.deegree.org/layers/base" xmlns:s="http://www.deegree.org/metadata/spatial"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.deegree.org/layers/gdal http://schemas.deegree.org/3.5/layers/gdal/gdal.xsd">
   <GDALLayer>
     <l:Name>luchtfoto_2010</l:Name>
     <d:Title>Orthophoto layer served from an ECW file</d:Title>

diff --git a/...console/resourceprovider/org.deegree.services.wps.provider.fme.FMEProcessProviderProvider b/...console/resourceprovider/org.deegree.services.wps.provider.fme.FMEProcessProviderProvider
@@ -1,2 +1,2 @@
 name=FME-Server
-example1_location=/META-INF/schemas/fme/example.xml
+example1_location=/META-INF/schemas/processes/fme/example.xml
diff --git a/...onsole/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider b/...onsole/resourceprovider/org.deegree.layer.persistence.coverage.CoverageLayerStoreProvider
@@ -1,2 +1,2 @@
 name=Coverage
-example1_location=/META-INF/schemas/layers/tile/example.xml
+example1_location=/META-INF/schemas/layers/coverage/example.xml
diff --git a/...TA-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider b/...TA-INF/console/resourceprovider/org.deegree.layer.persistence.tile.TileLayerStoreProvider
@@ -1,2 +1,2 @@
 name=Tile
-example1_location=/META-INF/schemas/layers/coverage/example.xml
+example1_location=/META-INF/schemas/layers/tile/example.xml
diff --git a/...NF/console/resourceprovider/org.deegree.metadata.iso.persistence.ISOMetadataStoreProvider b/...NF/console/resourceprovider/org.deegree.metadata.iso.persistence.ISOMetadataStoreProvider
@@ -1,2 +1,2 @@
 name=ISO19115
-example1_location=/META-INF/schemas/datasource/metadata/iso19115/example_iso19115.xml
+example1_location=/META-INF/schemas/datasource/metadata/iso19115/example.xml
diff --git a/deegree-tests/deegree-integration-tests/pom.xml b/deegree-tests/deegree-integration-tests/pom.xml
@@ -82,7 +82,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.0.0-M5</version>
         <executions>
           <execution>
             <id>integration-test</id>

diff --git a/...deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml b/...deegree-themes-remotewms/src/main/resources/META-INF/schemas/themes/remotewms/example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <RemoteWMSThemes xmlns="http://www.deegree.org/themes/remotewms" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.deegree.org/themes/remotewms remotewms.xsd">
+                 xsi:schemaLocation="http://www.deegree.org/themes/remotewms http://schemas.deegree.org/3.5/themes/remotewms/remotewms.xsd">
   <RemoteWMSId>d3</RemoteWMSId>
   <LayerStoreId>d3</LayerStoreId>
 </RemoteWMSThemes>
diff --git a/pom.xml b/pom.xml
@@ -137,7 +137,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M7</version>
+          <version>3.0.0</version>
           <configuration>
             <!-- Travis build workaround -->
             <argLine>-Djava.awt.headless=true -Xms1024m -Xmx2048m --illegal-access=permit
@@ -154,7 +154,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.0.0-M7</version>
+          <version>3.0.0</version>
           <configuration>
             <argLine>
               --illegal-access=permit
@@ -238,7 +238,7 @@
         <plugin>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
-          <version>10.0.12</version>
+          <version>10.0.15</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -323,7 +323,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>enforce-versions</id>
@@ -381,7 +381,7 @@
           <dependency>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.6.1</version>
+            <version>1.6.2</version>
           </dependency>
         </dependencies>
       </plugin>