Skip to content

Commit

Permalink
Update parent 12 (#111)
Browse files Browse the repository at this point in the history
* Use new shared lombok configuration
* Remove EqualsVerifier

Signed-off-by: Tristan Chuine <[email protected]>
  • Loading branch information
Tristan-WorkGH authored Jul 16, 2023
1 parent 5e28e09 commit afaa34b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 16 deletions.
Empty file added .mvn/lombok-config-copy.marker
Empty file.
1 change: 1 addition & 0 deletions lombok.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import target/configs/powsybl-build-tools.jar!powsybl-build-tools/lombok.config
20 changes: 8 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-parent-ws</artifactId>
<version>11</version>
<version>12</version>
</parent>

<artifactId>powsybl-network-conversion-server</artifactId>
Expand All @@ -25,7 +25,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<log4j2-mock-version>0.0.2</log4j2-mock-version>
<equalsverifier-version>3.7.1</equalsverifier-version>
<powsybl-ws-dependencies.version>2.3.0</powsybl-ws-dependencies.version>
<testcontainers.version>1.16.2</testcontainers.version>
<!-- to remove when powsybl-ws-dependencies is released -->
Expand Down Expand Up @@ -81,11 +80,6 @@
<artifactId>log4j2-mock</artifactId>
<version>${log4j2-mock-version}</version>
</dependency>
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>${equalsverifier-version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>elasticsearch</artifactId>
Expand All @@ -96,6 +90,13 @@
</dependencyManagement>

<dependencies>
<!-- Annotation processors dependencies -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!-- Compilation dependencies -->
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -234,11 +235,6 @@
<artifactId>log4j2-mock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import com.powsybl.network.conversion.server.elasticsearch.EquipmentInfosService;
import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
import com.powsybl.network.store.iidm.impl.NetworkImpl;
import nl.jqno.equalsverifier.EqualsVerifier;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -54,9 +53,6 @@ public void setup() {

@Test
public void testAddDeleteEquipmentInfos() {
EqualsVerifier.simple().forClass(EquipmentInfos.class).verify();
EqualsVerifier.simple().forClass(VoltageLevelInfos.class).verify();

List<EquipmentInfos> infos = List.of(
EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id1").name("name1").type(IdentifiableType.LOAD.name()).voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl1").name("vl1").build())).build(),
EquipmentInfos.builder().networkUuid(NETWORK_UUID).id("id2").name("name2").type(IdentifiableType.LOAD.name()).voltageLevels(Set.of(VoltageLevelInfos.builder().id("vl2").name("vl2").build())).build()
Expand Down

0 comments on commit afaa34b

Please sign in to comment.