Merge pull request 'fix_23213' (!5) from fix_23213 into master

Reviewed-on: #5
This commit is contained in:
Francesco Mangiacrapa 2022-04-27 15:02:45 +02:00
commit 336d06ee4c
4 changed files with 37 additions and 24 deletions

View File

@ -1,61 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="uri-resolver-2.7.2-SNAPSHOT">
<wb-module deploy-name="uri-resolver-2.7.2">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="context-root" value="uri-resolver"/> <property name="context-root" value="uri-resolver"/>
<property name="java-output-path" value="/uri-resolver/target/classes"/> <property name="java-output-path" value="/uri-resolver/target/classes"/>
</wb-module> </wb-module>

View File

@ -4,7 +4,13 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v2-7.2] - 2022-04-06 ## [v2.7.3-SNAPSHOT] - 2022-04-27
**Bug Fixing**
- [#23213] Fixing NoClassDefFoundError: org/geotoolkit/xml/XML
## [v2.7.2] - 2022-04-06
**New** **New**
@ -18,7 +24,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- [#20743] Integration with javamelody - [#20743] Integration with javamelody
## [v2-6-1] - 2022-01-17 ## [v2.6.1] - 2022-01-17
**New features** **New features**
@ -30,7 +36,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- [#21560] Checking the bug fix done - [#21560] Checking the bug fix done
- Moved to gcube-smartgears-bom.2.1.0 - Moved to gcube-smartgears-bom.2.1.0
## [v2-5-0] - 2021-04-08 ## [v2.5.0] - 2021-04-08
**New features** **New features**
@ -41,7 +47,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
[#21093] StorageHubResolver HEAD request does not support Content-Length [#21093] StorageHubResolver HEAD request does not support Content-Length
## [v2-4-1] - 2021-01-13 ## [v2.4.1] - 2021-01-13
**Bug Fixes** **Bug Fixes**

View File

@ -10,11 +10,17 @@
pattern="org.gcube.datatransfer.resolver.services.UriResolverIndex" /> pattern="org.gcube.datatransfer.resolver.services.UriResolverIndex" />
<exclude <exclude
pattern="org.gcube.datatransfer.resolver.services.UriResolverInfo" /> pattern="org.gcube.datatransfer.resolver.services.UriResolverInfo" />
<exclude pattern="org.gcube.datatransfer.resolver.services.OatResolver" /> <exclude
pattern="org.gcube.datatransfer.resolver.services.OatResolver" />
<exclude <exclude
pattern="org.gcube.datatransfer.resolver.services.tobackward.BackCatalogueResolver" /> pattern="org.gcube.datatransfer.resolver.services.tobackward.BackCatalogueResolver" />
<exclude <exclude
pattern="org.gcube.datatransfer.resolver.services.tobackward.BackUriResolverCatalogueResolver" /> pattern="org.gcube.datatransfer.resolver.services.tobackward.BackUriResolverCatalogueResolver" />
<exclude pattern="org.geotoolkit.internal.jaxb.referencing.*" />
<exclude pattern="org.opengis.metadata.*" />
</api-classes> </api-classes>
<modules> <modules>

10
pom.xml
View File

@ -9,7 +9,7 @@
</parent> </parent>
<groupId>org.gcube.data.transfer</groupId> <groupId>org.gcube.data.transfer</groupId>
<artifactId>uri-resolver</artifactId> <artifactId>uri-resolver</artifactId>
<version>2.7.2</version> <version>2.7.3-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<description>The URI Resolver is an HTTP URI resolver implemented as a REST service which gives access trough HTTP to different gcube Resolvers and gCube Applications.</description> <description>The URI Resolver is an HTTP URI resolver implemented as a REST service which gives access trough HTTP to different gcube Resolvers and gCube Applications.</description>
@ -250,14 +250,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- Required for Enunciate plugin -->
<dependency>
<groupId>org.geotoolkit</groupId>
<artifactId>geotk-xml-base</artifactId>
<version>3.20-geoapi-3.0</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>