Skip to content
Snippets Groups Projects
Commit def241a9 authored by tranoris's avatar tranoris
Browse files

Merge branch 'develop' into parent-child-characteristics

parents af14877d a3d26704
No related branches found
No related tags found
2 merge requests!11Merging 2024Q2_RC into main, creating 2024Q2 Release,!5Parent child characteristics
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
pom.xml
+ 4
− 4
View file @ def241a9
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
<version>1.2.0-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../org.etsi.osl.main</relativePath>
</parent>
<artifactId>org.etsi.osl.model.tmf</artifactId>
<artifactId>org.etsi.osl.model.tmf</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment