-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HTM-1174: ⭕ Update namespace / package name (#922)
[![HTM-1174](https://badgen.net/badge/JIRA/HTM-1174/pink?icon=jira)](https://b3partners.atlassian.net/browse/HTM-1174) [<img width="16" alt="Powered by Pull Request Badge" src="https://user-images.githubusercontent.com/1393946/111216524-d2bb8e00-85d4-11eb-821b-ed4c00989c02.png">](https://pullrequestbadge.com/?utm_medium=github&utm_source=Tailormap&utm_campaign=badge_info)<!-- PR-BADGE: PLEASE DO NOT REMOVE THIS COMMENT --> Removed `nl.b3p.tailormap` namespace in favour of `org.tailormap` [HTM-1174]: https://b3partners.atlassian.net/browse/HTM-1174?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
- Loading branch information
Showing
160 changed files
with
751 additions
and
750 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT | |
<artifactId>spring-boot-starter-parent</artifactId> | ||
<version>3.3.3</version> | ||
</parent> | ||
<groupId>nl.b3p.tailormap</groupId> | ||
<groupId>org.tailormap</groupId> | ||
<artifactId>tailormap-api</artifactId> | ||
<version>11.4.0-SNAPSHOT</version> | ||
<packaging>jar</packaging> | ||
|
@@ -88,7 +88,7 @@ SPDX-License-Identifier: MIT | |
<site> | ||
<id>gh-pages</id> | ||
<name>github pages site</name> | ||
<url>scm:git:ssh://[email protected]/b3partners/tailormap-api.git</url> | ||
<url>scm:git:ssh://[email protected]/tailormap/tailormap-api.git</url> | ||
</site> | ||
</distributionManagement> | ||
<properties> | ||
|
@@ -162,7 +162,7 @@ SPDX-License-Identifier: MIT | |
<pom.fmt.action>sort</pom.fmt.action> | ||
<!-- suppress missing javadoc warnings --> | ||
<javadoc.doclint>all,-missing</javadoc.doclint> | ||
<!-- docker.b3p.nl or alternatively ghcr.io --> | ||
<!-- ghcr.io or alternatively another OCI repo such as docker.b3p.nl --> | ||
<docker.deploy.repo>ghcr.io</docker.deploy.repo> | ||
<docker.skip>false</docker.skip> | ||
<docker.pull.policy>Always</docker.pull.policy> | ||
|
@@ -635,8 +635,8 @@ SPDX-License-Identifier: MIT | |
<artifactId>jacoco-maven-plugin</artifactId> | ||
<configuration> | ||
<excludes> | ||
<exclude>nl/b3p/tailormap/api/viewer/model/**</exclude> | ||
<exclude>nl/b3p/tailormap/api/persistence/json/**</exclude> | ||
<exclude>org/tailormap/api/viewer/model/**</exclude> | ||
<exclude>org/tailormap/api/persistence/json/**</exclude> | ||
</excludes> | ||
</configuration> | ||
<executions> | ||
|
@@ -816,7 +816,7 @@ SPDX-License-Identifier: MIT | |
<configuration> | ||
<inputSpec>${project.basedir}/src/main/resources/openapi/persistence-schemas.yaml</inputSpec> | ||
<generatorName>spring</generatorName> | ||
<modelPackage>nl.b3p.tailormap.api.persistence.json</modelPackage> | ||
<modelPackage>org.tailormap.api.persistence.json</modelPackage> | ||
<library>spring-boot</library> | ||
<configOptions> | ||
<!-- see https://openapi-generator.tech/docs/generators/spring/ --> | ||
|
@@ -849,7 +849,7 @@ SPDX-License-Identifier: MIT | |
<configuration> | ||
<inputSpec>${project.basedir}/src/main/resources/openapi/admin-schemas.yaml</inputSpec> | ||
<generatorName>spring</generatorName> | ||
<modelPackage>nl.b3p.tailormap.api.admin.model</modelPackage> | ||
<modelPackage>org.tailormap.api.admin.model</modelPackage> | ||
<library>spring-boot</library> | ||
<configOptions> | ||
<dateLibrary>java8</dateLibrary> | ||
|
@@ -879,7 +879,7 @@ SPDX-License-Identifier: MIT | |
<!-- see https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin --> | ||
<inputSpec>${project.basedir}/src/main/resources/openapi/viewer-api.yaml</inputSpec> | ||
<generatorName>spring</generatorName> | ||
<modelPackage>nl.b3p.tailormap.api.viewer.model</modelPackage> | ||
<modelPackage>org.tailormap.api.viewer.model</modelPackage> | ||
<library>spring-boot</library> | ||
<configOptions> | ||
<!-- see https://openapi-generator.tech/docs/generators/spring/ --> | ||
|
@@ -893,19 +893,19 @@ SPDX-License-Identifier: MIT | |
<useSpringBoot3>true</useSpringBoot3> | ||
</configOptions> | ||
<!-- All common models from common-schemas.yaml here, comma separated --> | ||
<importMappings>TileLayerHiDpiMode=nl.b3p.tailormap.api.persistence.json.TileLayerHiDpiMode, | ||
GeoServiceProtocol=nl.b3p.tailormap.api.persistence.json.GeoServiceProtocol, | ||
Bounds=nl.b3p.tailormap.api.persistence.json.Bounds, | ||
BoundsWithCRS=nl.b3p.tailormap.api.persistence.json.BoundsWithCRS, | ||
TMAttributeType=nl.b3p.tailormap.api.persistence.json.TMAttributeType, | ||
TMGeometryType=nl.b3p.tailormap.api.persistence.json.TMGeometryType, | ||
WMSStyle=nl.b3p.tailormap.api.persistence.json.WMSStyle, | ||
AppI18nSettings=nl.b3p.tailormap.api.persistence.json.AppI18nSettings, | ||
AppUiSettings=nl.b3p.tailormap.api.persistence.json.AppUiSettings, | ||
FormOptions=nl.b3p.tailormap.api.persistence.json.FormOptions, | ||
FormTab=nl.b3p.tailormap.api.persistence.json.FormTab, | ||
FormField=nl.b3p.tailormap.api.persistence.json.FormField, | ||
FormFieldValue=nl.b3p.tailormap.api.persistence.json.FormFieldValue</importMappings> | ||
<importMappings>TileLayerHiDpiMode=org.tailormap.api.persistence.json.TileLayerHiDpiMode, | ||
GeoServiceProtocol=org.tailormap.api.persistence.json.GeoServiceProtocol, | ||
Bounds=org.tailormap.api.persistence.json.Bounds, | ||
BoundsWithCRS=org.tailormap.api.persistence.json.BoundsWithCRS, | ||
TMAttributeType=org.tailormap.api.persistence.json.TMAttributeType, | ||
TMGeometryType=org.tailormap.api.persistence.json.TMGeometryType, | ||
WMSStyle=org.tailormap.api.persistence.json.WMSStyle, | ||
AppI18nSettings=org.tailormap.api.persistence.json.AppI18nSettings, | ||
AppUiSettings=org.tailormap.api.persistence.json.AppUiSettings, | ||
FormOptions=org.tailormap.api.persistence.json.FormOptions, | ||
FormTab=org.tailormap.api.persistence.json.FormTab, | ||
FormField=org.tailormap.api.persistence.json.FormField, | ||
FormFieldValue=org.tailormap.api.persistence.json.FormFieldValue</importMappings> | ||
<ignoreFileOverride>${project.basedir}/src/main/resources/openapi/common-schemas-openapi-ignore</ignoreFileOverride> | ||
<generateApis>false</generateApis> | ||
<generateModels>true</generateModels> | ||
|
@@ -941,7 +941,7 @@ SPDX-License-Identifier: MIT | |
<!-- HTM-1051 replace javax.validation with jakarta.validation in generated sources | ||
the current config still generates javax.validation, but we want jakarta.validation | ||
--> | ||
<replace dir="target/generated-sources/openapi/src/main/java/nl/b3p/tailormap/api/" summary="true"> | ||
<replace dir="target/generated-sources/openapi/src/main/java/org/tailormap/api/" summary="true"> | ||
<replacetoken><![CDATA[import javax.validation.]]></replacetoken> | ||
<replacevalue><![CDATA[import jakarta.validation.]]></replacevalue> | ||
</replace> | ||
|
@@ -1231,8 +1231,9 @@ SPDX-License-Identifier: MIT | |
<goal>push</goal> | ||
</goals> | ||
<!-- NB for deploy/push login is required on ghcr.io or docker.b3p.nl repository with | ||
docker - whatever value is ${docker.deploy.repo} | ||
see: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry --> | ||
docker login - whatever value is ${docker.deploy.repo} | ||
see: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry | ||
--> | ||
<phase>deploy</phase> | ||
</execution> | ||
</executions> | ||
|
@@ -1420,8 +1421,8 @@ SPDX-License-Identifier: MIT | |
<!-- NO! <dataFileInclude>${project.build.directory}/jacoco-it.exec</dataFileInclude>--> | ||
</dataFileIncludes> | ||
<excludes> | ||
<exclude>nl/b3p/tailormap/api/viewer/model/**</exclude> | ||
<exclude>nl/b3p/tailormap/api/persistence/json/**</exclude> | ||
<exclude>org/tailormap/api/viewer/model/**</exclude> | ||
<exclude>org/tailormap/api/persistence/json/**</exclude> | ||
</excludes> | ||
</configuration> | ||
<reportSets> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.