X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Fpom.xml;h=3ec52403bf38829a46462d64544e583164f31ef9;hb=0cd77f8ef3c8045fba03dde20044a08ec44e29f5;hp=48158421c3ab186b7e7169f7d5e6e7987a4b12a6;hpb=7508539dcab1db1d5476baaf0200a322df7596b6;p=openflowplugin.git

diff --git a/applications/pom.xml b/applications/pom.xml
index 48158421c3..3ec52403bf 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -1,236 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
+<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.openflowplugin</groupId>
-		<artifactId>openflowplugin-parent</artifactId>
-		<version>0.1.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.3.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
 
-	<groupId>org.opendaylight.openflowplugin</groupId>
-	<artifactId>applications</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<name>applications</name>
-	<url>http://maven.apache.org</url>
-	<packaging>pom</packaging>
-<!-- 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.opendaylight.openflowplugin</groupId>
-				<artifactId>openflowplugin-api</artifactId>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	 -->
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.opendaylight.yangtools</groupId>
-					<artifactId>yang-maven-plugin</artifactId>
-					<version>${yang.binding.version}</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>generate-sources</goal>
-							</goals>
-							<configuration>
-								<codeGenerators>
-									<generator>
-										<codeGeneratorClass>
-											org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-										</codeGeneratorClass>
-										<outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-										<additionalConfiguration>
-											<namespaceToPackage1>
-												urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-											</namespaceToPackage1>
-										</additionalConfiguration>
-									</generator>
-									<generator>
-										<codeGeneratorClass>
-											org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
-										</codeGeneratorClass>
-										<outputBaseDir>${project.build.directory}/generated-sources/sal</outputBaseDir>
-									</generator>
-								</codeGenerators>
-								<inspectDependencies>true</inspectDependencies>
-							</configuration>
-						</execution>
-					</executions>
-					<dependencies>
-						<dependency>
-							<groupId>org.opendaylight.controller</groupId>
-							<artifactId>yang-jmx-generator-plugin</artifactId>
-							<version>${config.parent.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>org.opendaylight.yangtools</groupId>
-							<artifactId>maven-sal-api-gen-plugin</artifactId>
-							<version>${yang.binding.version}</version>
-							<type>jar</type>
-						</dependency>
-					</dependencies>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>1.8</version>
-					<executions>
-						<execution>
-							<id>add-source</id>
-							<phase>generate-sources</phase>
-							<goals>
-								<goal>add-source</goal>
-							</goals>
-							<configuration>
-								<sources>
-									<source>${project.build.directory}/generated-sources/config</source>
-									;
-								</sources>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<version>${bundle.plugin.version}</version>
-					<extensions>true</extensions>
-					<!--executions> <execution> <id>bundle-manifest</id> <phase>process-classes</phase> 
-						<goals> <goal>manifest</goal> </goals> </execution> </executions -->
-					<configuration>
-						<instructions>
-							<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-						</instructions>
-						<manifestLocation>${project.basedir}/META-INF</manifestLocation>
-					</configuration>
-				</plugin>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>${lifecycle.mapping.version}</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>net.alchim31.maven</groupId>
-										<artifactId>scala-maven-plugin</artifactId>
-										<versionRange>[0,)</versionRange>
-										<goals>
-											<goal>compile</goal>
-											<goal>testCompile</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.jacoco</groupId>
-										<artifactId>jacoco-maven-plugin</artifactId>
-										<versionRange>[0,)</versionRange>
-										<goals>
-											<goal>prepare-agent</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>org.opendaylight.yangtools</groupId>
-										<artifactId>yang-maven-plugin</artifactId>
-										<versionRange>[0.5,)</versionRange>
-										<goals>
-											<goal>generate-sources</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<execute></execute>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>${jacoco.version}</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<!-- 
-			<plugin>
-				<groupId>org.opendaylight.yangtools</groupId>
-				<artifactId>yang-maven-plugin</artifactId>
-				<dependencies>
-					<dependency>
-						<groupId>org.opendaylight.controller</groupId>
-						<artifactId>yang-jmx-generator-plugin</artifactId>
-						<version>${config.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			 -->
-		</plugins>
-	</build>
+    <artifactId>applications</artifactId>
+    <name>applications</name>
+    <url>http://maven.apache.org</url>
+    <packaging>pom</packaging>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>${findbugs.maven.plugin.version}</version>
-				<configuration>
-					<effort>Max</effort>
-					<threshold>Low</threshold>
-					<goal>site</goal>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jdepend-maven-plugin</artifactId>
-				<version>${jdepend.maven.plugin.version}</version>
-			</plugin>
-		</plugins>
-	</reporting>
-	<scm>
-		<connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
-		<developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
-		<tag>HEAD</tag>
-	</scm>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>generate-sources</goal>
+                            </goals>
+                            <configuration>
+                                <codeGenerators>
+                                    <generator>
+                                        <codeGeneratorClass>
+                                            org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+                                        </codeGeneratorClass>
+                                        <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
+                                        <additionalConfiguration>
+                                            <namespaceToPackage1>
+                                                urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
+                                            </namespaceToPackage1>
+                                            <namespaceToPackage2>
+                                                urn:opendaylight:params:xml:ns:yang:openflowplugin:app==org.opendaylight.openflowplugin.applications.config.yang
+                                            </namespaceToPackage2>
+                                        </additionalConfiguration>
+                                    </generator>
+                                    <generator>
+                                        <codeGeneratorClass>
+                                            org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                                        </codeGeneratorClass>
+                                        <outputBaseDir>${project.build.directory}/generated-sources/sal</outputBaseDir>
+                                    </generator>
+                                </codeGenerators>
+                                <inspectDependencies>true</inspectDependencies>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.opendaylight.controller</groupId>
+                            <artifactId>yang-jmx-generator-plugin</artifactId>
+                            <version>${config.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.opendaylight.mdsal</groupId>
+                            <artifactId>maven-sal-api-gen-plugin</artifactId>
+                            <version>${mdsal.model.version}</version>
+                            <type>jar</type>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-	<modules>
-		<module>table-miss-enforcer</module>
-		<module>of-switch-config-pusher</module>
-		<module>lldp-speaker</module>
-		<!-- Base Models -->
-		<module>model</module>
-		<module>inventory-manager</module>
-		<module>statistics-manager</module>
-		<module>statistics-manager-config</module>
-		<module>topology-manager</module>
-		<module>forwardingrules-manager</module>
-		<module>topology-lldp-discovery</module>
-	</modules>
+    <scm>
+      <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
+      <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
+      <tag>HEAD</tag>
+    </scm>
+
+    <modules>
+        <module>table-miss-enforcer</module>
+        <module>of-switch-config-pusher</module>
+        <module>lldp-speaker</module>
+        <!-- deprecated apps -->
+        <module>old-notification-supplier</module>
+        <!-- nsf apps -->
+        <module>inventory-manager</module>
+        <module>statistics-manager</module>
+        <module>statistics-manager-config</module>
+        <module>topology-manager</module>
+        <module>forwardingrules-manager</module>
+        <module>forwardingrules-manager-config</module>
+        <module>topology-lldp-discovery</module>
+        <!--<module>features</module>-->
+        <!-- experimental apps -->
+        <module>bulk-o-matic</module>
+    </modules>
 
 </project>