AMBARI-20566. Create ambari-infra module in Ambari (move solr modules from ambari-logsearch) (oleewere)

ambari-infra/ambari-infra-assembly/pom.xml

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<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">
+  <parent>
+    <artifactId>ambari-infra</artifactId>
+    <groupId>org.apache.ambari</groupId>
+    <version>2.0.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>ambari-infra-assembly</artifactId>
+  <name>Ambari Infra Solr Assembly</name>
+  <url>http://maven.apache.org</url>
+
+  <properties>
+    <mapping.base.path>/usr/lib</mapping.base.path>
+    <!-- original apache repo location: http://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz -->
+    <solr.tar>http://public-repo-1.hortonworks.com/ARTIFACTS/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
+    <solr.mapping.path>${mapping.base.path}/ambari-infra-solr</solr.mapping.path>
+    <solr.package.name>ambari-infra-solr</solr.package.name>
+    <solr.client.package.name>ambari-infra-solr-client</solr.client.package.name>
+    <solr.client.mapping.path>${mapping.base.path}/${solr.client.package.name}</solr.client.mapping.path>
+    <solr.client.dir>${project.basedir}/../ambari-infra-solr-client</solr.client.dir>
+    <infra.solr.plugin.dir>${project.basedir}/../ambari-infra-solr-plugin</infra.solr.plugin.dir>
+  </properties>
+
+  <profiles>
+
+    <profile>
+      <id>rpm</id>
+      <properties>
+        <download.solr>true</download.solr>
+      </properties>
+      <activation>
+        <property>
+          <name>build-rpm</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rpm-maven-plugin</artifactId>
+            <version>2.1.4</version>
+            <configuration>
+              <copyright>2012, Apache Software Foundation</copyright>
+              <group>Development</group>
+              <description>Maven Recipe: RPM Package.</description>
+              <autoRequires>false</autoRequires>
+              <prefix>/</prefix>
+              <needarch>noarch</needarch>
+              <targetOS>linux</targetOS>
+
+              <version>${package-version}</version>
+              <release>${package-release}</release>
+
+              <defaultUsername>root</defaultUsername>
+              <defaultGroupname>root</defaultGroupname>
+            </configuration>
+            <executions>
+              <execution>
+                <id>infra-solr</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+                <configuration>
+                  <group>Development</group>
+                  <name>${solr.package.name}</name>
+                  <mappings>
+                    <mapping>
+                      <directory>${solr.mapping.path}</directory>
+                      <sources>
+                        <source>
+                          <location>${project.build.directory}/solr</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
+              <execution>
+                <id>infra-solr-client</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
+                <configuration>
+                  <group>Development</group>
+                  <name>${solr.client.package.name}</name>
+                  <needarch>noarch</needarch>
+                  <targetOS>linux</targetOS>
+                  <mappings>
+                    <mapping>
+                      <directory>${solr.client.mapping.path}</directory>
+                      <sources>
+                        <source>
+                          <location>${solr.client.dir}/target/package</location>
+                        </source>
+                      </sources>
+                    </mapping>
+                  </mappings>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="Download Solr">
+                    <get
+                      src="${solr.tar}"
+                      dest="${project.build.directory}/solr.tgz"
+                      usetimestamp="true"
+                    />
+                    <untar
+                      src="${project.build.directory}/solr.tgz"
+                      dest="${project.build.directory}/"
+                      compression="gzip"
+                    />
+                    <move todir="${project.build.directory}/solr">
+                      <fileset dir="${project.build.directory}/solr-${solr.version}"/>
+                    </move>
+                    <copy file="${project.basedir}/src/main/resources/solr" toDir="${project.build.directory}/solr/bin/" />
+                    <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar"
+                          toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+                    <chmod file="${project.build.directory}/solr/bin/**" perm="755"/>
+                    <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>deb</id>
+
+      <activation>
+        <property>
+          <name>build-deb</name>
+        </property>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>2.7</version>
+
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/resources/deb</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>${project.basedir}/src/main/package/deb</directory>
+                      <excludes>
+                        <exclude>solr/postinst</exclude>
+                        <exclude>solr-client/postinst</exclude>
+                      </excludes>
+                      <filtering>false</filtering>
+                    </resource>
+                    <resource>
+                      <directory>${project.basedir}/src/main/package/deb</directory>
+                      <includes>
+                        <include>solr/postinst</include>
+                        <include>solr-client/postinst</include>
+                      </includes>
+                      <filtering>true</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.vafer</groupId>
+            <artifactId>jdeb</artifactId>
+            <version>1.4</version>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <id>jdeb-solr</id>
+                <goals>
+                  <goal>jdeb</goal>
+                </goals>
+                <configuration>
+                  <controlDir>${basedir}/src/main/package/deb/solr</controlDir>
+                  <deb>${basedir}/target/${solr.package.name}_${package-version}-${package-release}.deb</deb>
+                  <skip>false</skip>
+                  <skipPOMs>false</skipPOMs>
+                  <dataSet>
+                    <data>
+                      <src>${project.build.directory}/solr</src>
+                      <type>directory</type>
+                      <mapper>
+                        <type>perm</type>
+                        <user>root</user>
+                        <group>root</group>
+                        <prefix>${solr.mapping.path}</prefix>
+                      </mapper>
+                      <excludes>
+                        bin/**,server/scripts/**
+                      </excludes>
+                    </data>
+                    <data>
+                      <src>${project.build.directory}/solr</src>
+                      <type>directory</type>
+                      <mapper>
+                        <type>perm</type>
+                        <user>root</user>
+                        <group>root</group>
+                        <filemode>755</filemode>
+                        <prefix>${solr.mapping.path}</prefix>
+                      </mapper>
+                      <includes>
+                        bin/**,server/scripts/**
+                      </includes>
+                    </data>
+                  </dataSet>
+                </configuration>
+              </execution>
+
+              <execution>
+                <phase>package</phase>
+                <id>jdeb-solr-client</id>
+                <goals>
+                  <goal>jdeb</goal>
+                </goals>
+                <configuration>
+                  <controlDir>${basedir}/src/main/package/deb/solr-client</controlDir>
+                  <deb>${basedir}/target/${solr.client.package.name}_${package-version}-${package-release}.deb</deb>
+                  <skip>false</skip>
+                  <skipPOMs>false</skipPOMs>
+                  <dataSet>
+                    <data>
+                      <src>${solr.client.dir}/target/ambari-infra-solr-client.tar.gz</src>
+                      <type>archive</type>
+                      <mapper>
+                        <type>perm</type>
+                        <user>root</user>
+                        <group>root</group>
+                        <prefix>${solr.client.mapping.path}</prefix>
+                      </mapper>
+                    </data>
+                  </dataSet>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target name="Download Solr">
+                    <get
+                      src="${solr.tar}"
+                      dest="${project.build.directory}/solr.tgz"
+                      usetimestamp="true"
+                    />
+                    <untar
+                      src="${project.build.directory}/solr.tgz"
+                      dest="${project.build.directory}/"
+                      compression="gzip"
+                    />
+                    <move todir="${project.build.directory}/solr">
+                      <fileset dir="${project.build.directory}/solr-${solr.version}"/>
+                    </move>
+                    <copy file="${project.basedir}/src/main/resources/solr" toDir="${project.build.directory}/solr/bin/" />
+                    <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar"
+                          toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
+                    <chmod file="${project.build.directory}/solr/bin/**" perm="755"/>
+                    <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-infra-solr-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-infra-solr-plugin</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+
+</project>

ambari-logsearch/ambari-infra-solr-client/pom.xml → ambari-infra/ambari-infra-solr-client/pom.xml

@@ -19,7 +19,7 @@
          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">
   <parent>
-    <artifactId>ambari-logsearch</artifactId>
+    <artifactId>ambari-infra</artifactId>
     <groupId>org.apache.ambari</groupId>
     <version>2.0.0.0-SNAPSHOT</version>
   </parent>

ambari-logsearch/ambari-infra-solr-plugin/pom.xml → ambari-infra/ambari-infra-solr-plugin/pom.xml

@@ -19,7 +19,7 @@
          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">
   <parent>
-    <artifactId>ambari-logsearch</artifactId>
+    <artifactId>ambari-infra</artifactId>
     <groupId>org.apache.ambari</groupId>
     <version>2.0.0.0-SNAPSHOT</version>
   </parent>

ambari-infra/pom.xml

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<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">
+  <parent>
+    <groupId>org.apache.ambari</groupId>
+    <artifactId>ambari-project</artifactId>
+    <version>2.0.0.0-SNAPSHOT</version>
+    <relativePath>../ambari-project</relativePath>
+  </parent>
+  <groupId>org.apache.ambari</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>ambari-infra</artifactId>
+  <version>2.0.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <jdk.version>1.7</jdk.version>
+    <solr.version>5.5.2</solr.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <python.ver>python &gt;= 2.6</python.ver>
+    <deb.python.ver>python (&gt;= 2.6)</deb.python.ver>
+    <deb.architecture>amd64</deb.architecture>
+    <deb.dependency.list>${deb.python.ver}</deb.dependency.list>
+  </properties>
+
+  <modules>
+    <module>ambari-infra-assembly</module>
+    <module>ambari-infra-solr-client</module>
+    <module>ambari-infra-solr-plugin</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <inherited>false</inherited>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>../ambari-project/src/main/assemblies/empty.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>build-tarball</id>
+            <phase>none</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>${skipSurefireTests}</skip>
+          <groups>${testcase.groups}</groups>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <source>${jdk.version}</source>
+          <target>${jdk.version}</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>${basedir}</directory>
+              <followSymlinks>false</followSymlinks>
+              <includes>
+                <include>**/*.pyc</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>parse-version</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>regex-property</id>
+            <goals>
+              <goal>regex-property</goal>
+            </goals>
+            <configuration>
+              <name>ambariVersion</name>
+              <value>${project.version}</value>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
+              <failIfNoMatch>false</failIfNoMatch>
+            </configuration>
+          </execution>
+          <execution>
+            <id>parse-package-version</id>
+            <goals>
+              <goal>regex-property</goal>
+            </goals>
+            <configuration>
+              <name>package-version</name>
+              <value>${project.version}</value>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <replacement>$1.$2.$3.$4</replacement>
+              <failIfNoMatch>true</failIfNoMatch>
+            </configuration>
+          </execution>
+          <execution>
+            <id>parse-package-release</id>
+            <goals>
+              <goal>regex-property</goal>
+            </goals>
+            <configuration>
+              <name>package-release</name>
+              <value>${project.version}</value>
+              <regex>
+                ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
+              </regex>
+              <replacement>$6</replacement>
+              <failIfNoMatch>true</failIfNoMatch>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>README.md</exclude>
+            <exclude>**/*.json</exclude>
+            <exclude>**/*.log</exclude>
+            <exclude>**/*.txt</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>test</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <!-- Dependency in order to annotate unit tests with a category. -->
+    <dependency>
+      <groupId>utility</groupId>
+      <artifactId>utility</artifactId>
+      <version>1.0.0.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

ambari-logsearch/ambari-logsearch-assembly/pom.xml

@@ -28,12 +28,6 @@
   <modelVersion>4.0.0</modelVersion>
   <properties>
     <mapping.base.path>/usr/lib</mapping.base.path>
-    <solr.tar>http://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.tgz</solr.tar>
-    <solr.mapping.path>${mapping.base.path}/ambari-infra-solr</solr.mapping.path>
-    <solr.package.name>ambari-infra-solr</solr.package.name>
-    <solr.client.package.name>ambari-infra-solr-client</solr.client.package.name>
-    <solr.client.mapping.path>${mapping.base.path}/${solr.client.package.name}</solr.client.mapping.path>
-    <solr.client.dir>${project.basedir}/../ambari-infra-solr-client</solr.client.dir>
     <logsearch.portal.package.name>ambari-logsearch-portal</logsearch.portal.package.name>
     <logsearch.portal.mapping.path>${mapping.base.path}/ambari-logsearch-portal</logsearch.portal.mapping.path>
     <logsearch.server.dir>${project.basedir}/../ambari-logsearch-server</logsearch.server.dir>
@@ -43,7 +37,6 @@
     <logsearch.portal.conf.mapping.path>/etc/${logsearch.portal.package.name}/conf</logsearch.portal.conf.mapping.path>
     <logsearch.logfeeder.conf.mapping.path>/etc/${logsearch.logfeeder.package.name}/conf
     </logsearch.logfeeder.conf.mapping.path>
-    <infra.solr.plugin.dir>${project.basedir}/../ambari-infra-solr-plugin</infra.solr.plugin.dir>
   </properties>
   <artifactId>ambari-logsearch-assembly</artifactId>
   <profiles>
@@ -80,50 +73,6 @@
               <defaultGroupname>root</defaultGroupname>
             </configuration>
             <executions>
-              <execution>
-                <id>logsearch-solr</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>rpm</goal>
-                </goals>
-                <configuration>
-                  <group>Development</group>
-                  <name>${solr.package.name}</name>
-                  <mappings>
-                    <mapping>
-                      <directory>${solr.mapping.path}</directory>
-                      <sources>
-                        <source>
-                          <location>${project.build.directory}/solr</location>
-                        </source>
-                      </sources>
-                    </mapping>
-                  </mappings>
-                </configuration>
-              </execution>
-              <execution>
-                <id>logsearch-solr-client</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>rpm</goal>
-                </goals>
-                <configuration>
-                  <group>Development</group>
-                  <name>${solr.client.package.name}</name>
-                  <needarch>noarch</needarch>
-                  <targetOS>linux</targetOS>
-                  <mappings>
-                    <mapping>
-                      <directory>${solr.client.mapping.path}</directory>
-                      <sources>
-                        <source>
-                          <location>${solr.client.dir}/target/package</location>
-                        </source>
-                      </sources>
-                    </mapping>
-                  </mappings>
-                </configuration>
-              </execution>
               <execution>
                 <id>logsearch-portal</id>
                 <phase>package</phase>
@@ -214,41 +163,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target name="Download Solr">
-                    <get
-                      src="${solr.tar}"
-                      dest="${project.build.directory}/solr.tgz"
-                      usetimestamp="true"
-                    />
-                    <untar
-                      src="${project.build.directory}/solr.tgz"
-                      dest="${project.build.directory}/"
-                      compression="gzip"
-                    />
-                    <move todir="${project.build.directory}/solr">
-                      <fileset dir="${project.build.directory}/solr-${solr.version}"/>
-                    </move>
-                    <copy file="${project.basedir}/src/main/resources/solr" toDir="${project.build.directory}/solr/bin/" />
-                    <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar"
-                          toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
-                    <chmod file="${project.build.directory}/solr/bin/**" perm="755"/>
-                    <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -280,8 +194,6 @@
                     <resource>
                       <directory>${project.basedir}/src/main/package/deb</directory>
                       <excludes>
-                        <exclude>solr/postinst</exclude>
-                        <exclude>solr-client/postinst</exclude>
                         <exclude>portal/postinst</exclude>
                         <exclude>logfeeder/postinst</exclude>
                       </excludes>
@@ -290,8 +202,6 @@
                     <resource>
                       <directory>${project.basedir}/src/main/package/deb</directory>
                       <includes>
-                        <include>solr/postinst</include>
-                        <include>solr-client/postinst</include>
                         <include>portal/postinst</include>
                         <include>logfeeder/postinst</include>
                       </includes>
@@ -307,75 +217,6 @@
             <artifactId>jdeb</artifactId>
             <version>1.4</version>
             <executions>
-              <execution>
-                <phase>package</phase>
-                <id>jdeb-solr</id>
-                <goals>
-                  <goal>jdeb</goal>
-                </goals>
-                <configuration>
-                  <controlDir>${basedir}/src/main/package/deb/solr</controlDir>
-                  <deb>${basedir}/target/${solr.package.name}_${package-version}-${package-release}.deb</deb>
-                  <skip>false</skip>
-                  <skipPOMs>false</skipPOMs>
-                  <dataSet>
-                    <data>
-                      <src>${project.build.directory}/solr</src>
-                      <type>directory</type>
-                      <mapper>
-                        <type>perm</type>
-                        <user>root</user>
-                        <group>root</group>
-                        <prefix>${solr.mapping.path}</prefix>
-                      </mapper>
-                      <excludes>
-                        bin/**,server/scripts/**
-                      </excludes>
-                    </data>
-                    <data>
-                      <src>${project.build.directory}/solr</src>
-                      <type>directory</type>
-                      <mapper>
-                        <type>perm</type>
-                        <user>root</user>
-                        <group>root</group>
-                        <filemode>755</filemode>
-                        <prefix>${solr.mapping.path}</prefix>
-                      </mapper>
-                      <includes>
-                        bin/**,server/scripts/**
-                      </includes>
-                    </data>
-                  </dataSet>
-                </configuration>
-              </execution>
-
-              <execution>
-                <phase>package</phase>
-                <id>jdeb-solr-client</id>
-                <goals>
-                  <goal>jdeb</goal>
-                </goals>
-                <configuration>
-                  <controlDir>${basedir}/src/main/package/deb/solr-client</controlDir>
-                  <deb>${basedir}/target/${solr.client.package.name}_${package-version}-${package-release}.deb</deb>
-                  <skip>false</skip>
-                  <skipPOMs>false</skipPOMs>
-                  <dataSet>
-                    <data>
-                      <src>${solr.client.dir}/target/ambari-infra-solr-client.tar.gz</src>
-                      <type>archive</type>
-                      <mapper>
-                        <type>perm</type>
-                        <user>root</user>
-                        <group>root</group>
-                        <prefix>${solr.client.mapping.path}</prefix>
-                      </mapper>
-                    </data>
-                  </dataSet>
-                </configuration>
-              </execution>
-
               <execution>
                 <id>jdeb-portal</id>
                 <phase>package</phase>
@@ -475,41 +316,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target name="Download Solr">
-                    <get
-                      src="${solr.tar}"
-                      dest="${project.build.directory}/solr.tgz"
-                      usetimestamp="true"
-                    />
-                    <untar
-                      src="${project.build.directory}/solr.tgz"
-                      dest="${project.build.directory}/"
-                      compression="gzip"
-                    />
-                    <move todir="${project.build.directory}/solr">
-                      <fileset dir="${project.build.directory}/solr-${solr.version}"/>
-                    </move>
-                    <copy file="${project.basedir}/src/main/resources/solr" toDir="${project.build.directory}/solr/bin/" />
-                    <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar"
-                          toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/>
-                    <chmod file="${project.build.directory}/solr/bin/**" perm="755"/>
-                    <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -531,16 +337,6 @@
       <artifactId>ambari-logsearch-logfeeder</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-infra-solr-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-infra-solr-plugin</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 
 </project>

ambari-logsearch/ambari-logsearch-it/pom.xml

@@ -43,6 +43,11 @@
       <artifactId>jbehave-core</artifactId>
       <version>${jbehave.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>solr-solrj</artifactId>
+      <version>${solr.version}</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -52,11 +57,6 @@
       <artifactId>commons-io</artifactId>
       <version>2.5</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.ambari</groupId>
-      <artifactId>ambari-infra-solr-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.github.docker-java</groupId>
       <artifactId>docker-java</artifactId>

ambari-logsearch/pom.xml

@@ -35,8 +35,6 @@
     <module>ambari-logsearch-web</module>
     <module>ambari-logsearch-logfeeder</module>
     <module>ambari-logsearch-it</module>
-    <module>ambari-infra-solr-client</module>
-    <module>ambari-infra-solr-plugin</module>
   </modules>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

ambari-project/pom.xml

@@ -27,6 +27,7 @@
   <name>Apache Ambari Project POM</name>
   <packaging>pom</packaging>
   <properties>
+    <solr.version>5.5.2</solr.version>
     <ambari.dir>${project.parent.basedir}</ambari.dir>
     <powermock.version>1.6.3</powermock.version>
     <jetty.version>8.1.19.v20160209</jetty.version>

pom.xml

@@ -467,6 +467,7 @@
         <module>ambari-client</module>
         <module>ambari-shell</module>
         <module>ambari-logsearch</module>
+        <module>ambari-infra</module>
       </modules>
     </profile>
     <profile>
@@ -503,6 +504,7 @@
         <module>ambari-client</module>
         <module>ambari-shell</module>
         <module>ambari-logsearch</module>
+        <module>ambari-infra</module>
       </modules>
     </profile>
     <profile>
@@ -524,6 +526,7 @@
         <module>ambari-client</module>
         <module>ambari-shell</module>
         <module>ambari-logsearch</module>
+        <module>ambari-infra</module>
         </modules>
     </profile>
     <profile>