Commit 699afd75 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 9e15133c 0bad7d4f

asie-api/pom.xml

+4 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
	</parent>



	<artifactId>asie-api</artifactId>

	<version>1.1.2-asie2</version>

	<version>1.2.0-asie2</version>

	<packaging>jar</packaging>

	

	<name>ASIE Jakarta RS API</name>
@@ -33,7 +33,7 @@ 
		<dependency>

			<groupId>com.inteligr8</groupId>

			<artifactId>solr-api</artifactId>

			<version>1.1.0-solr6</version>

			<version>1.2.0-solr6</version>

		</dependency>

		<dependency>

			<groupId>org.alfresco</groupId>
@@ -53,7 +53,7 @@ 
		<dependency>

			<groupId>org.glassfish.jersey.inject</groupId>

			<artifactId>jersey-hk2</artifactId>

			<version>3.1.10</version>

			<version>4.0.2</version>

			<scope>test</scope>

		</dependency>

		<dependency>
@@ -84,7 +84,7 @@ 
	<repositories>

		<repository>

			<id>alfresco-public</id>

			<url>https://artifacts.alfresco.com/nexus/repository/public/</url>

			<url>https://artifacts.alfresco.com/nexus/repository/releases/</url>

		</repository>

	</repositories>

</project>

community-module/pom.xml

+6 −7
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
	<name>ASIE Platform Module for ACS Community</name>



	<properties>

		<alfresco.sdk.version>4.9.0</alfresco.sdk.version>

		<alfresco.platform.version>23.3.0</alfresco.platform.version>

		<alfresco.platform.war.version>23.3.0.98</alfresco.platform.war.version>

		<tomcat-rad.version>10-2.1</tomcat-rad.version>

		<alfresco.sdk.version>4.16.0</alfresco.sdk.version>

		<alfresco.platform.version>26.1.0</alfresco.platform.version>

		<alfresco.platform.war.version>26.1.0.61</alfresco.platform.war.version>

		<tomcat-rad.version>2.3-tomcat-11.0.22</tomcat-rad.version>

		

		<beedk.rad.acs-search.enabled>true</beedk.rad.acs-search.enabled>

	</properties>
@@ -59,7 +59,7 @@ 
		<dependency>

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

			<artifactId>cxf-jaxrs-platform-module</artifactId>

			<version>1.3.1-acs-v23.3</version>

			<version>1.4.0-acs-v26.1</version>

			<type>amp</type>

		</dependency>
@@ -81,7 +81,6 @@ 
			<plugin>

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

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

				<version>2.40</version>

				<extensions>true</extensions>

				<configuration>

					<tiles>
@@ -100,7 +99,7 @@ 
	<repositories>

		<repository>

			<id>alfresco-public</id>

			<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>

			<url>https://artifacts.alfresco.com/nexus/repository/releases/</url>

		</repository>

	</repositories>

</project>

enterprise-module/pom.xml

+7 −6
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 
	<name>ASIE Platform Module for ACS Enterprise</name>



	<properties>

		<alfresco.platform.version>25.1.0</alfresco.platform.version>

		<alfresco.platform.war.version>25.1.0.71</alfresco.platform.war.version>

		<tomcat-rad.version>2.3-tomcat-10.1.52</tomcat-rad.version>

		<alfresco.platform.version>26.1.0</alfresco.platform.version>

		<alfresco.platform.war.version>26.1.0.61</alfresco.platform.war.version>

		<tomcat-rad.version>2.3-tomcat-11.0.22</tomcat-rad.version>

		<jackson.version>2.17.2</jackson.version>

		

		<beedk.rad.acs-search.enabled>true</beedk.rad.acs-search.enabled>

	</properties>
@@ -40,7 +41,7 @@ 
		<dependency>

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

			<artifactId>cxf-jaxrs-platform-module</artifactId>

			<version>1.4.0-acs-v25.1</version>

			<version>1.4.0-acs-v26.1</version>

			<type>amp</type>

			<scope>provided</scope>

		</dependency>
@@ -74,13 +75,13 @@ 
		<dependency>

			<groupId>com.fasterxml.jackson.datatype</groupId>

			<artifactId>jackson-datatype-jsr310</artifactId>

			<version>2.17.3</version>

			<version>${jackson.version}</version>

			<scope>provided</scope>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.module</groupId>

			<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>

			<version>2.17.2</version>

			<version>${jackson.version}</version>

			<scope>provided</scope>

		</dependency>

enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/service/ShardDiscoveryService.java

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ public class ShardDiscoveryService implements com.inteligr8.alfresco.asie.spi.Sh 
				ShardInstanceState nodeShardState = ShardInstanceState.from(shardState);

				

				Pair<SolrHost, ShardInstanceState> pair = new Pair<>(node, nodeShardState);

				if (comparator.compare(pair, shardNodeStates.get(shardId)) < 0)

				if (!shardNodeStates.containsKey(shardId) || comparator.compare(pair, shardNodeStates.get(shardId)) < 0)

					shardNodeStates.put(shardId, pair);

			}

		}

pom.xml

+8 −8
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ 
		<!-- must be aligned with the target ACS platform junit -->

		<junit.version>5.12.2</junit.version>

		

		<commom-rest-client.base.version>3.0.3</commom-rest-client.base.version>

		<commom-rest-client.base.version>3.0.4</commom-rest-client.base.version>

		

		<alfresco.platform.version>25.1.0</alfresco.platform.version>

		<alfresco.platform.version>26.1.0</alfresco.platform.version>

	</properties>

	

	<dependencyManagement>
@@ -68,7 +68,7 @@ 
				<!-- helps avoid vulnerable dependencies -->

				<plugin>

					<artifactId>maven-site-plugin</artifactId>

					<version>3.21.0</version>

					<version>3.22.0</version>

				</plugin>

				<plugin>

					<artifactId>maven-compiler-plugin</artifactId>
@@ -76,12 +76,12 @@ 
				</plugin>

				<plugin>

					<artifactId>maven-dependency-plugin</artifactId>

					<version>3.10.0</version>

					<version>3.11.0</version>

				</plugin>

				

				<plugin>

					<artifactId>maven-surefire-plugin</artifactId>

					<version>3.5.5</version>

					<version>3.5.6</version>

					<dependencies>

						<dependency>

							<groupId>org.junit.jupiter</groupId>
@@ -92,7 +92,7 @@ 
				</plugin>

				<plugin>

					<artifactId>maven-failsafe-plugin</artifactId>

					<version>3.5.5</version>

					<version>3.5.6</version>

					<dependencies>

						<dependency>

							<groupId>org.junit.jupiter</groupId>
@@ -105,7 +105,7 @@ 
				<plugin>

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

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

					<version>2.43</version>

					<version>2.45</version>

				</plugin>

			</plugins>

		</pluginManagement>
@@ -162,7 +162,7 @@ 
					<plugin>

						<groupId>org.sonatype.central</groupId>

						<artifactId>central-publishing-maven-plugin</artifactId>

						<version>0.8.0</version>

						<version>0.10.0</version>

						<extensions>true</extensions>

						<configuration>

							<publishingServerId>central</publishingServerId>