inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-10-08 14:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-16: Added a parent pom to help with the bamboo build

Browse Source
This commit is contained in:
Gethin James
2016-06-03 13:46:05 +02:00
parent 3f21379b82
commit a826eb877f
3 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
alfresco-solr/pom.xml
View File

@@ -9,30 +9,17 @@
<name>Alfresco Solr 6</name> <name>Alfresco Solr 6</name>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<parent>
<repositories>
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<!-- <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId> <artifactId>alfresco-solr-parent</artifactId>
<version>6</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
-->
<properties> <properties>
<maven.tomcat.path>/solr6</maven.tomcat.path> <maven.tomcat.path>/solr6</maven.tomcat.path>
<m2eclipse.wtp.contextRoot>${maven.tomcat.path}</m2eclipse.wtp.contextRoot> <m2eclipse.wtp.contextRoot>${maven.tomcat.path}</m2eclipse.wtp.contextRoot>
<maven.tomcat.port>${tomcat.default.solr6.port}</maven.tomcat.port> <maven.tomcat.port>${tomcat.default.solr6.port}</maven.tomcat.port>
<maven.tomcat.httpsPort>${tomcat.default.solr6.ssl.port}</maven.tomcat.httpsPort> <maven.tomcat.httpsPort>${tomcat.default.solr6.ssl.port}</maven.tomcat.httpsPort>
<solr.version>6.0.0</solr.version>
<solr.instance.source.folder>src/main/resources/solr/instance</solr.instance.source.folder> <solr.instance.source.folder>src/main/resources/solr/instance</solr.instance.source.folder>
<!-- This gets filtered in the solr-tomcat-context.xml and in solrcore.properties when running embedded --> <!-- This gets filtered in the solr-tomcat-context.xml and in solrcore.properties when running embedded -->
<solr.ssl.instance.target.folder>${project.build.directory}/solr-instance-ssl</solr.ssl.instance.target.folder> <solr.ssl.instance.target.folder>${project.build.directory}/solr-instance-ssl</solr.ssl.instance.target.folder>
@@ -53,11 +40,11 @@
<version>${solr.version}</version> <version>${solr.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solrclient</artifactId> <artifactId>alfresco-solrclient</artifactId>
<version>5.1-K_2-SNAPSHOT</version> <version>${alfresco-solr.version}</version>
</dependency> </dependency>
@@ -362,7 +349,7 @@
</executions> </executions>
</plugin> </plugin>
--> -->
</plugins> </plugins>
</build> </build>
<profiles> <profiles>

11
packaging/pom.xml
View File

@@ -2,19 +2,18 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solr</artifactId> <artifactId>alfresco-solr</artifactId>
<version>5.1-K_2-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<name>Alfresco Solr Distribution</name> <name>Alfresco Solr Distribution</name>
<description>Produces the solr distribution zip</description> <description>Produces the solr distribution zip</description>
<properties> <properties>
<solr.version>6.0.1</solr.version>
<alfresco-solr.version>${project.version}</alfresco-solr.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId> <artifactId>alfresco-solr-parent</artifactId>
<version>6</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>

23
pom.xml Normal file
View File

@@ -0,0 +1,23 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId>
<version>6</version>
</parent>
<artifactId>alfresco-solr-parent</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Alfresco Solr parent</name>
<properties>
<solr.version>6.0.1</solr.version>
<alfresco-solr.version>5.1-K_2-SNAPSHOT</alfresco-solr.version>
</properties>
<modules>
<module>alfresco-solr</module>
<module>packaging</module>
</modules>
</project>