Skip to content

Commit

Permalink
chore: dependency updates (#431)
Browse files Browse the repository at this point in the history
* chore(deps): update caddy docker tag to v2.6.4

* fix(deps): update dependency org.springframework.boot:spring-boot-starter-parent to v3.0.5 (#430)

Co-authored-by: Renovate Bot <[email protected]>

* chore(deps): update maven all non-major dependencies (#429)

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Paulo Gomes da Cruz Junior <[email protected]>

* feat(BE:FSADT1-700): adding report for all and business as (#426)

* chore: removing unused code

* feat(BE:FSADT1-700): adding report for business as and all

* chore: adding temporary folder

* chore: adding native parameter to swagger

* ci: removing parameter FOREST_API_URL

* chore: changing bcreg env to prod

* docs: adding readme doc resources

* chore: adding bcregistry params to deploy/config

* chore: setting poi version and removing log4j deps

* chore: testing removal of log4j

* fix: fixing missing parameter on deployment

* chore: reducing the init memory param

* chore: updating deps

* chore: removing unwanted constant

* feat: changing lib from poi to fastexcel

* fix: removing unused parameters and endpoints

* fix: fixing parsing and preventing empty results

* chore: removing tests for removed code

* chore(deps): update eclipse-temurin docker tag to v17.0.6_10-jdk-alpine

* chore(deps): update eclipse-temurin:17.0.6_10-jre-alpine docker digest to e39db8b

* chore(deps): pin dependencies

* chore(deps): update dependency maven to v3.9.1

* fix(deps): update dependency org.springframework.cloud:spring-cloud-dependencies to v2022.0.2

* chore(deps): update registry.access.redhat.com/ubi8/ubi docker tag to v8.7-1112

* chore: removing spring cloud dependency

* feat(BE:FSADT1-739): migrating init repo to openssl

* chore: adding parameter to initialize

* chore: normalizing Caddy file

* chore: updating init

* fix: adding register for jackson on native

* fix: fixing legacy deployment with new init

* fix: changing frontend image file

* fix: reverting caddy to 2.4.6

---------

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: BCGov-NR Renovate Bot <[email protected]>
  • Loading branch information
3 people authored Apr 13, 2023
1 parent 47f81e4 commit f1c66f6
Show file tree
Hide file tree
Showing 13 changed files with 130 additions and 306 deletions.
2 changes: 1 addition & 1 deletion backend/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN chmod +x ./mvnw
RUN ./mvnw clean package -DskipTests -Dtests.skip=true -Dskip.unit.tests=true -q
RUN echo

FROM eclipse-temurin:17.0.6_10-jre-alpine@sha256:f59c1acc26975859545eabb2051f4b9a41d5ef278aad9dfe42bdb0aff5611613
FROM eclipse-temurin:17.0.6_10-jre-alpine@sha256:e39db8ba89a39ccd1224490e4bbfc9e3bdbc4493ac849523f2aa8a52f5b42ad9
LABEL maintainer="Paulo Gomes da Cruz Junior <[email protected]>"

WORKDIR /usr/share/service/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
package ca.bc.gov.app.configuration;

import javax.net.ssl.SSLException;
import ca.bc.gov.app.dto.ValidationError;
import ca.bc.gov.app.dto.bcregistry.BcRegistryAddressDto;
import ca.bc.gov.app.dto.bcregistry.BcRegistryBusinessAdressesDto;
import ca.bc.gov.app.dto.bcregistry.BcRegistryBusinessDto;
import ca.bc.gov.app.dto.bcregistry.BcRegistryFacetResponseDto;
import ca.bc.gov.app.dto.bcregistry.BcRegistryFacetSearchResultEntryDto;
import ca.bc.gov.app.dto.bcregistry.BcRegistryFacetSearchResultsDto;
import ca.bc.gov.app.dto.bcregistry.BcRegistryIdentificationDto;
import ca.bc.gov.app.dto.bcregistry.ClientDetailsDto;
import ca.bc.gov.app.dto.client.ClientAddressDto;
import ca.bc.gov.app.dto.client.ClientBusinessInformationDto;
import ca.bc.gov.app.dto.client.ClientBusinessTypeDto;
import ca.bc.gov.app.dto.client.ClientCodeTypeDto;
import ca.bc.gov.app.dto.client.ClientContactDto;
import ca.bc.gov.app.dto.client.ClientDetailsAddressDto;
import ca.bc.gov.app.dto.client.ClientLocationDto;
import ca.bc.gov.app.dto.client.ClientLookUpDto;
import ca.bc.gov.app.dto.client.ClientNameCodeDto;
import ca.bc.gov.app.dto.client.ClientSubmissionDto;
import ca.bc.gov.app.dto.client.ClientSubmitterInformationDto;
import ca.bc.gov.app.dto.client.ClientValueTextDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.reactive.function.client.WebClient;
Expand All @@ -13,6 +34,29 @@
*/
@Configuration
@Slf4j
@RegisterReflectionForBinding({
ValidationError.class,
ClientAddressDto.class,
ClientBusinessInformationDto.class,
ClientBusinessTypeDto.class,
ClientCodeTypeDto.class,
ClientContactDto.class,
ClientDetailsAddressDto.class,
ClientLocationDto.class,
ClientLookUpDto.class,
ClientNameCodeDto.class,
ClientSubmissionDto.class,
ClientSubmitterInformationDto.class,
ClientValueTextDto.class,
BcRegistryAddressDto.class,
BcRegistryBusinessAdressesDto.class,
BcRegistryBusinessDto.class,
BcRegistryFacetResponseDto.class,
BcRegistryFacetSearchResultEntryDto.class,
BcRegistryFacetSearchResultsDto.class,
BcRegistryIdentificationDto.class,
ClientDetailsDto.class
})
public class GlobalServiceConfiguration {

/**
Expand Down Expand Up @@ -46,7 +90,7 @@ public WebClient openMapsApi(ForestClientConfiguration configuration) {
* @return A configured instance of WebClient for accessing the BC Registry API.
*/
@Bean
public WebClient bcRegistryApi(ForestClientConfiguration configuration) throws SSLException {
public WebClient bcRegistryApi(ForestClientConfiguration configuration) {
return WebClient
.builder()
.baseUrl(configuration.getBcregistry().getUri())
Expand Down
11 changes: 6 additions & 5 deletions common/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
FROM eclipse-temurin:17-jdk-alpine

WORKDIR /app
FROM eclipse-temurin:17.0.6_10-jdk-alpine@sha256:a765a97826df90554f3d3a98be5586012bbc53593876f669ff4b2e68717be71d

ENV LANG en_CA.UTF-8
ENV LANGUAGE en_CA.UTF-8
ENV LC_ALL en_CA.UTF-8

WORKDIR /app

RUN apk --no-cache add openssl

COPY startup.sh .
COPY InstallCert.java .

RUN chmod g+w /app && \
chmod g+x startup.sh && \
Expand All @@ -16,4 +17,4 @@ RUN chmod g+w /app && \
# Non-privileged user
USER app

ENTRYPOINT ["sh", "startup.sh"]
ENTRYPOINT ["sh", "startup.sh"]
262 changes: 0 additions & 262 deletions common/InstallCert.java

This file was deleted.

Loading

0 comments on commit f1c66f6

Please sign in to comment.