X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Futil%2Fpom.xml;h=d9c5aaaf274eead2957bb5346226bc661baa54e0;hb=8e2b081c6f6703fd959d65f2f48eff395d00a56b;hp=7d7c41b6d796e8e4b0c607e5ea8ba0ec10aafcc2;hpb=8a6bc76658a2c3e97fd596000a47797773940005;p=yangtools.git

diff --git a/common/util/pom.xml b/common/util/pom.xml
index 7d7c41b6d7..d9c5aaaf27 100644
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -8,87 +8,46 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>1.8.0-Carbon</version>
-        <relativePath/>
+        <version>6.0.3-SNAPSHOT</version>
+        <relativePath>../../bundle-parent</relativePath>
     </parent>
-    <packaging>bundle</packaging>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.yangtools</groupId>
-    <artifactId>util</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <artifactId>util</artifactId>
+    <packaging>bundle</packaging>
+    <name>${project.artifactId}</name>
+    <description>Common utilities</description>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
+        <dependency>
+            <groupId>tech.pantheon.triemap</groupId>
+            <artifactId>triemap</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.romix</groupId>
-            <artifactId>java-concurrent-hash-trie-map</artifactId>
+            <groupId>org.immutables</groupId>
+            <artifactId>value</artifactId>
+            <classifier>annotations</classifier>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava-testlib</artifactId>
-          <scope>test</scope>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava-testlib</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<!--
-	  Maven Site Configuration
-
-	  The following configuration is necessary for maven-site-plugin to
-	  correctly identify the correct deployment path for OpenDaylight Maven
-	  sites.
-      -->
-    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-	<distributionManagement>
-		<site>
-			<id>opendaylight-site</id>
-			<url>${nexus.site.url}/${project.artifactId}/</url>
-		</site>
-	</distributionManagement>
 </project>