Skip to content

Commit

Permalink
Loopback to previous version of pom file
Browse files Browse the repository at this point in the history
  • Loading branch information
flopezag committed Jan 10, 2025
1 parent 9fd676b commit 2ffb6b9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 21 deletions.
7 changes: 5 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
COMPOSE_PROJECT_NAME=fiware
EXPOSED_PORT=1026

# Hashicorp vault as a wallet
# Hashicorp vault as a wallet
VAULT_IMAGE=quay.io/fiware/vault-ethereum:1.0.1

# Orion LD variables
Expand All @@ -12,4 +12,7 @@ EXPOSED_PORT=1026

# Mongo DB is used by Orion
MONGO_DB_VERSION=mongo:6.0
MONGO_DB_PORT=27017
MONGO_DB_PORT=27017

# Canis Major variables
CANISMAJOR_IMAGE=quay.io/fiware/vault-ethereum:1.5.28
2 changes: 1 addition & 1 deletion it/docker-compose/docker-compose-java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ services:
## CanisMajor setup
canis-major:
restart: always
image: ${CANISMAJOR_IMAGE:-quay.io/fiware/canis-major}
image: ${CANISMAJOR_IMAGE:-quay.io/fiware/canis-major:1.5.28}
hostname: canismajor
depends_on:
- ganache-cli
Expand Down
18 changes: 6 additions & 12 deletions it/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.fiware.canismajor</groupId>
Expand All @@ -13,7 +13,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- jackson -->
<version.com.fasterxml.jackson.core.jackson-databind>2.17.2</version.com.fasterxml.jackson.core.jackson-databind>
<version.com.fasterxml.jackson.core.jackson-databind>2.17.1</version.com.fasterxml.jackson.core.jackson-databind>

<!-- cucumber -->
<version.io.cucumber>7.0.0</version.io.cucumber>
Expand All @@ -32,7 +32,7 @@
<version.org.apache.maven.plugins.maven-surefire-plugin>3.0.0-M5</version.org.apache.maven.plugins.maven-surefire-plugin>

<!-- cucumber token, see: https://reports.cucumber.io -->
<cucumber.publish-token>CUCUMBER_PUBLISH_TOKEN</cucumber.publish-token>
<cucumber.publish-token>bf7355ee-d54c-4c04-b8d6-363866ef3d93</cucumber.publish-token>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -135,7 +135,6 @@
</testResource>
</testResources>
<plugins>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -146,7 +145,6 @@
<target>11</target>
</configuration>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -155,13 +153,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<!-- Uncomment to enable incremental compilation -->
<!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
<encoding>UTF-8</encoding>
<source>11</source>
<target>11</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -190,4 +184,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
8 changes: 2 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<!-- lazy dev -->
<version.org.mapstruct>1.5.5.Final</version.org.mapstruct>
<version.org.projectlombok>1.18.34</version.org.projectlombok>
<version.org.projectlombok>1.18.32</version.org.projectlombok>

<!-- logging -->
<version.ch.qos.logback>1.2.3</version.ch.qos.logback>
Expand Down Expand Up @@ -115,7 +115,6 @@
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-http-server-netty</artifactId>
<version>4.7.6</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -192,7 +191,6 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>runtime</scope>
<version>1.5.12</version>
</dependency>

<!-- DB -->
Expand All @@ -208,7 +206,7 @@
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>3.2.0</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
Expand All @@ -218,7 +216,6 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.224</version>
</dependency>
<dependency>
<groupId>io.micronaut.data</groupId>
Expand Down Expand Up @@ -709,4 +706,3 @@
</profile>
</profiles>
</project>

0 comments on commit 2ffb6b9

Please sign in to comment.