Commit 37351974 authored by Brian Long's avatar Brian Long
Browse files

POM reorg

parent 66933e58

asie-api/pom.xml

+19 −18
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
		<relativePath>../</relativePath>

	</parent>



	<groupId>com.inteligr8.alfresco</groupId>

	<artifactId>asie-api</artifactId>

	<version>1.1-SNAPSHOT-asie2</version>

	<packaging>jar</packaging>
@@ -18,10 +17,6 @@ 
	<name>ASIE Jakarta RS API</name>

	<description>Alfresco Search &amp; Insight Engine Jakarta RS API</description>



	<properties>

		<alfresco.platform.version>23.2.0</alfresco.platform.version>

	</properties>



	<dependencyManagement>

		<dependencies>

			<dependency>
@@ -43,17 +38,6 @@ 
		<dependency>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-data-model</artifactId>

			<exclusions>

				<exclusion>

					<groupId>*</groupId>

					<artifactId>*</artifactId>

				</exclusion>

			</exclusions>

		</dependency>

		<dependency>

			<groupId>org.apache.commons</groupId>

			<artifactId>commons-lang3</artifactId>

			<version>3.17.0</version>

		</dependency>

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>
@@ -63,7 +47,7 @@ 
		<dependency>

			<groupId>com.inteligr8</groupId>

			<artifactId>common-rest-client</artifactId>

			<version>3.0.2-jersey</version>

			<version>${commom-rest-client.base.version}-jersey</version>

			<scope>test</scope>

		</dependency>

		<dependency>
@@ -75,11 +59,28 @@ 
		<dependency>

			<groupId>org.junit.jupiter</groupId>

			<artifactId>junit-jupiter-api</artifactId>

			<version>5.11.2</version>

			<scope>test</scope>

		</dependency>

	</dependencies>



	<build>

		<plugins>

			<plugin>

				<groupId>io.repaint.maven</groupId>

				<artifactId>tiles-maven-plugin</artifactId>

				<extensions>true</extensions>

				<configuration>

					<tiles>

						<!-- Documentation: https://git.inteligr8.com/inteligr8/ootbee-beedk/src/stable/beedk-acs-platform-webapp-tile -->

						<!-- TODO spin up just ASIE

						<tile>com.inteligr8.ootbee:beedk-acs-platform-webapp-tile:[1.1.6,2.0.0)</tile>

						-->

					</tiles>

				</configuration>

			</plugin>

		</plugins>

	</build>

	

	<repositories>

		<repository>

			<id>alfresco-public</id>

asie-api/src/main/java/com/inteligr8/alfresco/asie/model/core/NewCoreRequest.java

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package com.inteligr8.alfresco.asie.model.core; 
import java.util.Collection;



import org.alfresco.service.cmr.repository.StoreRef;

import org.apache.commons.lang3.StringUtils;

import org.springframework.util.StringUtils;



import com.inteligr8.solr.model.JsonFormattedResponseRequest;
@@ -89,7 +89,7 @@ public class NewCoreRequest extends JsonFormattedResponseRequest<NewCoreRequest> 
	}

	

	public NewCoreRequest withShardIds(Collection<String> shardIds) {

		this.shardIds = StringUtils.join(shardIds, ",");

		this.shardIds = StringUtils.collectionToDelimitedString(shardIds, ",");

		return this;

	}

asie-api/src/test/java/com/inteligr8/alfresco/asie/api/AbstractApiUnitTest.java→asie-api/src/test/java/com/inteligr8/alfresco/asie/api/AbstractApiIT.java

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; 


import com.inteligr8.alfresco.asie.AsieClient;



public class AbstractApiUnitTest {

public class AbstractApiIT {

	

	protected Logger logger = LoggerFactory.getLogger(this.getClass());

asie-api/src/test/java/com/inteligr8/alfresco/asie/api/CoreAdminReindexUnitTest.java→asie-api/src/test/java/com/inteligr8/alfresco/asie/api/CoreAdminReindexIT.java

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import com.inteligr8.solr.model.Action.Status; 
import com.inteligr8.solr.model.Cores;

import com.inteligr8.solr.model.ResponseHeader;



public class CoreAdminReindexUnitTest extends AbstractApiUnitTest {

public class CoreAdminReindexIT extends AbstractApiIT {

	

	@Test

	public void reindex() {

asie-api/src/test/java/com/inteligr8/alfresco/asie/api/CoreAdminStatusUnitTest.java→asie-api/src/test/java/com/inteligr8/alfresco/asie/api/CoreAdminStatusIT.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import com.inteligr8.solr.model.core.StatusResponse; 


import jakarta.ws.rs.ProcessingException;



public class CoreAdminStatusUnitTest extends AbstractApiUnitTest {

public class CoreAdminStatusIT extends AbstractApiIT {

	

	@Test

	public void noHost() {