Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump upstreams #1881

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Bump upstreams #1881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19e85c3
Bump upstreams
ihrasko Jun 4, 2024
048eaf1
Revert "Create a workaround for YANGTOOLS-1575"
ihrasko Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lighty-core/dependency-versions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
<version>13.1.2</version>
<version>13.1.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -48,14 +48,14 @@
<dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>infrautils-artifacts</artifactId>
<version>6.0.8</version>
<version>6.0.9</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
<version>13.0.3</version>
<version>13.0.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -69,7 +69,7 @@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<version>13.0.5</version>
<version>13.0.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions lighty-core/lighty-binding-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<version>13.0.5</version>
<version>13.0.6</version>
<dependencies>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-java-api-generator</artifactId>
<version>13.0.3</version>
<version>13.0.4</version>
</dependency>
</dependencies>
<executions>
Expand Down
4 changes: 2 additions & 2 deletions lighty-core/lighty-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>checkstyle</artifactId>
<version>13.1.2</version>
<version>13.1.3</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -220,7 +220,7 @@
<dependency>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>spotbugs</artifactId>
<version>13.1.2</version>
<version>13.1.3</version>
</dependency>
<!-- The SpotBugs Maven plugin uses SLF4J-2 -->
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions ...va/io/lighty/gnmi/southbound/mountpoint/codecs/YangInstanceNormToGnmiUpdateCodecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
Expand Down Expand Up @@ -48,7 +47,6 @@ public void topLevelElementTest() throws Exception {
assertUpdateEquals(prepared.getValue(), result);
}

@Disabled("Disabled until YANGTOOLS-1575 is resolved")
@Test
public void listEntryCase() throws Exception {
final Map.Entry<ImmutablePair<YangInstanceIdentifier, NormalizedNode>, Gnmi.Update> prepared =
Expand Down
3 changes: 1 addition & 2 deletions ...mi/lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/SimulatorCrudTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.json.JSONException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.skyscreamer.jsonassert.JSONAssert;
import org.slf4j.Logger;
Expand Down Expand Up @@ -639,7 +638,7 @@ public void crudComplexAugmentedValue() throws ExecutionException, InterruptedEx
assertThrows(ExecutionException.class, () -> sessionProvider.getGnmiSession().get(getRequest).get());
}

@Disabled("Disabled until YANGTOOLS-1575 is resolved")

@Test
public void getListEntryTest() throws ExecutionException, InterruptedException, IOException, JSONException {
final Gnmi.Path path = Gnmi.Path.newBuilder()
Expand Down
2 changes: 0 additions & 2 deletions ...lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiGetITTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.skyscreamer.jsonassert.JSONAssert;
import org.slf4j.Logger;
Expand Down Expand Up @@ -163,7 +162,6 @@ public void getLeafIdentityRefTest() throws InterruptedException, IOException, J
assertEquals(OC_INTERFACE_ETH3_CONFIG_TYPE_EXPECTED, ocInterfaceEth3ConfigType);
}

@Disabled("Disabled until YANGTOOLS-1575 is resolved")
@Test
public void getListEntryTest() throws InterruptedException, IOException, JSONException {
//assert list entry in openconfig-interfaces - interface - eth3, and also if it is only one with that key
Expand Down
4 changes: 0 additions & 4 deletions ...lighty-gnmi-test/src/test/java/io/lighty/modules/gnmi/test/gnmi/rcgnmi/GnmiSetITTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.skyscreamer.jsonassert.JSONAssert;
import org.slf4j.Logger;
Expand Down Expand Up @@ -153,7 +152,6 @@ public void setContainerTest() throws InterruptedException, IOException, JSONExc
restoreDeviceToOriginalState();
}

@Disabled("Disabled until YANGTOOLS-1575 is resolved")
@Test
public void setAugmentedInterfaceListFromOuterModelTest() throws Exception {
final String payload = getAugmentedTestInterfaceBody();
Expand Down Expand Up @@ -271,7 +269,6 @@ public void deleteLeafTest() throws InterruptedException, IOException, JSONExcep
restoreDeviceToOriginalState();
}

@Disabled("Disabled until YANGTOOLS-1575 is resolved")
@Test
public void setSimpleListEntryTest() throws IOException, InterruptedException, JSONException {
// Set simple list with
Expand Down Expand Up @@ -358,7 +355,6 @@ public void setNestedListInWrongWayTest() throws IOException, InterruptedExcepti
assertEquals(HttpURLConnection.HTTP_INTERNAL_ERROR, nestedListResponse.statusCode());
}

@Disabled("Disabled until YANGTOOLS-1575 is resolved")
@Test
public void setNestedListTest() throws IOException, InterruptedException, JSONException {
// Create data in base list
Expand Down
Loading