- Changed solr starter quartz start delay to match the interval. The 5 sec delay was causing two thread to index resulting in the index build failing.

- Added sql updates to BLC_PAGE reverting the pageTemplateId due to an issue with the new templates
- Updated POM to latest releases

Author: danielcolgrove

core/src/main/java/com/community/core/config/DemoSiteImportSqlConfig.java

@@ -0,0 +1,19 @@
+package com.community.core.config;
+
+import org.broadleafcommerce.common.demo.AutoImportPersistenceUnit;
+import org.broadleafcommerce.common.demo.AutoImportSql;
+import org.broadleafcommerce.common.demo.AutoImportStage;
+import org.broadleafcommerce.common.demo.ImportCondition;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Conditional(ImportCondition.class)
+public class DemoSiteImportSqlConfig {
+    
+    @Bean
+    public AutoImportSql contentDataImport() {
+        return new AutoImportSql(AutoImportPersistenceUnit.BL_PU,"sql/fix_content_page_template_ref.sql", AutoImportStage.PRIMARY_LATE);
+    }
+}

core/src/main/resources/runtime-properties/common-shared.properties

@@ -131,7 +131,7 @@ solr.url.primary=http://localhost:8983/solr/catalog
 solr.url.reindex=http://localhost:8983/solr/catalog_reindex
 solr.url.admin=http://localhost:8983/solr
 
-solr.index.start.delay=5000
+solr.index.start.delay=3600000
 solr.index.repeat.interval=3600000
 
 global.admin.url=/global

core/src/main/resources/sql/fix_content_page_template_ref.sql

@@ -0,0 +1,3 @@
+-- We want to use template id 1 for demo
+UPDATE BLC_PAGE set PAGE_TMPLT_ID=1 where PAGE_ID=1;
+UPDATE BLC_PAGE set PAGE_TMPLT_ID=1 where PAGE_ID=2;

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.broadleafcommerce</groupId>
         <artifactId>broadleaf-boot-starter-parent</artifactId>
-        <version>5.2.1-SNAPSHOT</version>
+        <version>5.2.2-GA</version>
         <relativePath />
     </parent>
 
@@ -32,7 +32,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <broadleaf-paypal.version>2.7.1-SNAPSHOT</broadleaf-paypal.version>
+        <broadleaf-paypal.version>2.7.1-GA</broadleaf-paypal.version>
 
         <debug.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${debug.port}</debug.args>
         <boot.jvm.memory>-Xmx1536M</boot.jvm.memory>