X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=e3eda8b0ce395f3feeaa2c52f1d533bfe88ed184;hb=7e8e7b82d01ad684b3260c12cde7cb68f087d6fe;hp=32d016897df7bddea34420205000b5f4be1c3881;hpb=21c082a3e0d6a9e80e729746258e305252b44c49;p=openflowjava.git

diff --git a/pom.xml b/pom.xml
index 32d01689..e3eda8b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,445 +2,26 @@
 <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>
-        <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
-        <relativePath/>
+        <groupId>org.opendaylight.openflowjava</groupId>
+        <artifactId>openflowjava-parent</artifactId>
+        <version>0.10.0-SNAPSHOT</version>
+        <relativePath>parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.openflowjava</groupId>
-    <artifactId>openflow-protocol-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <name>openflowjava</name> <!-- Used by Sonar to set project name -->
+    <artifactId>openflowjava-aggregator</artifactId>
     <packaging>pom</packaging>
 
     <modules>
         <module>artifacts</module>
         <module>features</module>
         <module>openflowjava-config</module>
+        <module>openflowjava-blueprint-config</module>
         <module>openflow-protocol-api</module>
         <module>openflow-protocol-impl</module>
         <module>openflow-protocol-it</module>
         <module>openflow-protocol-spi</module>
+        <module>parent</module>
         <module>simple-client</module>
-        <module>util</module>
+        <module>openflowjava-util</module>
     </modules>
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</developerConnection>
-        <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
-      <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmxGeneratorPath>${project.build.directory}/yang-gen-config</jmxGeneratorPath>
-        <karaf.distro.empty.version>1.6.0-SNAPSHOT</karaf.distro.empty.version>
-        <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
-
-        <config.version>0.4.0-SNAPSHOT</config.version>
-        <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-
-        <!-- Sonar config -->
-        <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
-        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-        <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
-        <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.openflowjava</groupId>
-              <artifactId>openflowjava-artifacts</artifactId>
-              <version>${project.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
-              <artifactId>yangtools-artifacts</artifactId>
-              <version>${yangtools.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>config-artifacts</artifactId>
-              <version>${config.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>mdsal-artifacts</artifactId>
-              <version>${mdsal.version}</version>
-              <scope>import</scope>
-              <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <!-- Sonar -->
-        <dependency>
-            <groupId>org.codehaus.sonar-plugins.java</groupId>
-            <artifactId>sonar-jacoco-listeners</artifactId>
-            <version>${sonar-jacoco-listeners.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <inherited>true</inherited>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>maven-bundle-plugin</artifactId>
-              <extensions>true</extensions>
-              <configuration>
-                <instructions>
-                  <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                </instructions>
-                <manifestLocation>${project.build.directory}/META-INF</manifestLocation>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-	          <artifactId>maven-checkstyle-plugin</artifactId>
-              <version>${checkstyle.version}</version>
-              <configuration>
-                <failOnViolation>false</failOnViolation>
-                <configLocation>checkstyle-logging.xml</configLocation>
-                <consoleOutput>true</consoleOutput>
-                <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                <sourceDirectory>${project.basedir}</sourceDirectory>
-                <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
-                <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/</excludes>
-              </configuration>
-              <dependencies>
-                <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>checkstyle-logging</artifactId>
-                <version>${yangtools.version}</version>
-                </dependency>
-              </dependencies>
-              <executions>
-                <execution>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>prepare-ut-agent</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${sonar.jacoco.reportPath}</destFile>
-                            <propertyName>jacoco.agent.ut.arg</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>prepare-it-agent</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${sonar.jacoco.itReportPath}</destFile>
-                            <propertyName>jacoco.agent.it.arg</propertyName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.opendaylight.yangtools</groupId>
-                    <artifactId>yang-maven-plugin</artifactId>
-                    <version>${yangtools.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.8</version>
-                    <executions>
-                        <execution>
-                            <id>add-source</id>
-                            <goals>
-                                <goal>add-source</goal>
-                            </goals>
-                            <phase>generate-sources</phase>
-                            <configuration>
-                                <sources>
-                                    <source>src/main/yang</source>
-                                </sources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <configuration>
-                        <!-- Specific to generate mapping between tests and covered code -->
-                        <argLine>${jacoco.agent.it.arg}</argLine>
-                        <properties>
-                            <property>
-                                <name>listener</name>
-                                <value>org.sonar.java.jacoco.JUnitListener</value>
-                            </property>
-                        </properties>
-                        <!-- Let's put failsafe reports with surefire to have access to tests failures/success reports in sonar -->
-                        <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <!-- Specific to generate mapping between tests and covered code -->
-                        <argLine>${jacoco.agent.ut.arg}</argLine>
-                        <properties>
-                            <property>
-                                <name>listener</name>
-                                <value>org.sonar.java.jacoco.JUnitListener</value>
-                            </property>
-                        </properties>
-                    </configuration>
-                </plugin>
-                <!-- Ignore/Execute plugin execution -->
-                <plugin>
-                  <groupId>org.eclipse.m2e</groupId>
-                  <artifactId>lifecycle-mapping</artifactId>
-                  <version>1.0.0</version>
-                  <configuration>
-                    <lifecycleMappingMetadata>
-                      <pluginExecutions>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>properties-maven-plugin</artifactId>
-                            <versionRange>[0.0,)</versionRange>
-                            <goals>
-                              <goal>set-system-properties</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.jacoco</groupId>
-                            <artifactId>jacoco-maven-plugin</artifactId>
-                            <versionRange>[0.0,)</versionRange>
-                            <goals>
-                              <goal>prepare-agent</goal>
-                              <goal>pre-test</goal>
-                              <goal>post-test</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.ops4j.pax.exam</groupId>
-                            <artifactId>maven-paxexam-plugin</artifactId>
-                            <versionRange>[1.2.4,)</versionRange>
-                            <goals>
-                              <goal>generate-depends-file</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <execute>
-                              <runOnIncremental>false</runOnIncremental>
-                            </execute>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-checkstyle-plugin</artifactId>
-                            <versionRange>[2.0,)</versionRange>
-                            <goals>
-                              <goal>check</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/>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.codehaus.groovy.maven</groupId>
-                            <artifactId>gmaven-plugin</artifactId>
-                            <versionRange>1.0</versionRange>
-                            <goals>
-                              <goal>execute</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                        <pluginExecution>
-                          <pluginExecutionFilter>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-enforcer-plugin</artifactId>
-                            <versionRange>${enforcer.version}</versionRange>
-                            <goals>
-                              <goal>enforce</goal>
-                            </goals>
-                          </pluginExecutionFilter>
-                          <action>
-                            <ignore/>
-                          </action>
-                        </pluginExecution>
-                      </pluginExecutions>
-                    </lifecycleMappingMetadata>
-                  </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.5.2</version>
-                <configuration>
-                    <effort>Max</effort>
-                    <threshold>Low</threshold>
-                    <goal>site</goal>
-                </configuration>
-            </plugin>
-            <plugin>
-              <artifactId>maven-jxr-plugin</artifactId>
-              <version>2.3</version>
-              <configuration>
-                <aggregate>true</aggregate>
-                <linkJavadoc>true</linkJavadoc>
-              </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0-beta-2</version>
-            </plugin>
-        </plugins>
-    </reporting>
-    <profiles>
-        <profile>
-            <id>viewbuild</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <build.suffix>${project.version}</build.suffix>
-            </properties>
-        </profile>
-        <profile>
-            <id>jenkins</id>
-            <activation>
-                <property>
-                    <name>BUILDSUFFIX</name>
-                </property>
-            </activation>
-            <properties>
-                <build.suffix>${BUILDSUFFIX}</build.suffix>
-            </properties>
-        </profile>
-        <profile>
-            <id>repoBuild</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8.1</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>aggregate</goal>
-                                </goals>
-                                <phase>site</phase>
-                            </execution>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>