inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

review changes

Browse Source
This commit is contained in:
Rodica Sutu
2018-05-31 09:48:30 +03:00
parent d2cc170616
commit c11ace2a31
4 changed files with 8 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@@ -171,10 +171,11 @@
<argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<license.update.dryrun>true</license.update.dryrun>
<license.verbose>false</license.verbose>
<alfresco.min.version>6.0.0</alfresco.min.version>
<dependency.jackson.version>2.9.5</dependency.jackson.version>
<dependency.spring.version>5.0.4.RELEASE</dependency.spring.version>
<dependency.mockito.version>1.10.19</dependency.mockito.version>
<dependency.postgresql.version>42.2.1</dependency.postgresql.version>
<dependency.mysql.version>5.1.40</dependency.mysql.version>
</properties>
<dependencyManagement>
@@ -231,7 +232,7 @@
<regexPropertySettings>
<regexPropertySetting>
<name>rm.module.repo.version.min</name>
<value>${alfresco.min.version}</value>
<value>${alfresco.version}</value>
<regex>(\d+)\.(\d+).*</regex>
<replacement>$1.$2</replacement>
<failIfNoMatch>false</failIfNoMatch>

39
rm-community/rm-community-repo/pom.xml
View File

@@ -22,13 +22,12 @@
<alfresco.db.host>localhost</alfresco.db.host>
<alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
<alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
<alfresco.mysql.version>5.1.40</alfresco.mysql.version>
<alfresco.rm.artifactId>alfresco-rm-community-repo</alfresco.rm.artifactId>
<skip.integrationtests>true</skip.integrationtests>
<alfresco.solr.home>${project.build.directory}/solr/home</alfresco.solr.home>
<api.explorer.version>6.0.4-ea</api.explorer.version>
<!-- 6.0 changes !-->
<api.explorer.version>6.0.4-ea</api.explorer.version>
<dependency.alfresco-core.version>7.2</dependency.alfresco-core.version>
<dependency.alfresco-data-model.version>8.7</dependency.alfresco-data-model.version>
<dependency.alfresco-repository.version>6.50</dependency.alfresco-repository.version>
@@ -41,8 +40,6 @@
Deprecated SOLR4 app, still packaged for downward compatibility
-->
<alfresco.solr4.version>6.7</alfresco.solr4.version>
<dependency.postgresql.version>42.2.1</dependency.postgresql.version>
<dependency.mysql.version>5.1.40</dependency.mysql.version>
</properties>
<build>
@@ -192,7 +189,6 @@
<artifactItems>
<artifactItem>
<groupId>${alfresco.groupId}</groupId>
<!--<artifactId>${app.amp.client.war.artifactId}</artifactId> -->
<artifactId>content-services-community</artifactId>
<type>war</type>
<version>${alfresco.version}</version>
@@ -487,16 +483,6 @@
<artifactId>spring-tx</artifactId>
<version>${dependency.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${dependency.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${dependency.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
@@ -549,12 +535,9 @@
<artifactItems>
<artifactItem>
<groupId>${alfresco.groupId}</groupId>
<!--<artifactId>${alfresco.repo.artifactId}</artifactId>-->
<artifactId>content-services-community</artifactId>
<type>war</type>
<!--<version>${alfresco.version}</version>-->
<!--<version>6.0.0-RC4</version>-->
<version>6.0.5-ea</version>
<version>${alfresco.version}</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -722,22 +705,8 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${alfresco.mysql.version}</version>
<version>${dependency.mysql.version}</version>
</dependency>
<!--
<dependency>
<groupId>${alfresco.groupId}</groupId>
<artifactId>alfresco-repository</artifactId>
<version>${alfresco.version}</version>
<classifier>h2scripts</classifier>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
-->
</dependencies>
</plugin>
</plugins>
@@ -767,7 +736,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${alfresco.mysql.version}</version>
<version>${dependency.mysql.version}</version>
</dependency>
</dependencies>
<executions>

3
rm-community/rm-community-repo/test/resources/test-context.xml
View File

@@ -124,7 +124,6 @@
class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="scheduledPublishUpdatesJobDetail" />
<property name="cronExpression">
<!-- <value>0 30 3 * * ?</value> -->
<value>0 30 3 * * ?</value>
</property>
</bean>
@@ -232,7 +231,7 @@
<bean id="Search" class="org.alfresco.repo.management.subsystems.SwitchableApplicationContextFactory" parent="abstractPropertyBackedBean">
<property name="autoStart">
<value>false</value>
<value>start</value>
</property>
<property name="category">
<value>Search</value>

1
rm-community/rm-community-repo/test/resources/test-job-context.xml
View File

@@ -11,7 +11,6 @@
<bean id="scheduledDispositionLifecyceleJobTrigger"
class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
<property name="jobDetail" ref="scheduledDispositionLifecyceleJobDetail" />
<!-- <value>0/30 * * * * ?</value> -->
<property name="cronExpression" value="0/30 * * * * ?" />
</bean>
</property>