Properly separate enterprise tests, execute with correct share version

This commit is contained in:
Ole Hejlskov 2017-03-27 11:27:09 +02:00
parent 55ac6917b7
commit 1a8d8b76b6
6 changed files with 32 additions and 43 deletions

View File

@ -1,23 +1,23 @@
#set( $symbol_pound = '#' ) #set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' ) #set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' ) #set( $symbol_escape = '\' )
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0 The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans

View File

@ -1 +1 @@
install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@ install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dalfresco.share.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=enterprise

View File

@ -1 +1 @@
install -Dalfresco.platform.version=4.2.7 -Dmaven.alfresco.edition=enterprise install -Dalfresco.platform.version=4.2.7 -Dalfresco.share.version=4.2.7 -Dmaven.alfresco.edition=enterprise

View File

@ -1 +1 @@
install -Dalfresco.platform.version=5.0 -Dmaven.alfresco.edition=enterprise install -Dalfresco.platform.version=5.0 -Dalfresco.share.version=5.0 -Dmaven.alfresco.edition=enterprise

View File

@ -1 +1 @@
install -Dalfresco.platform.version=5.1 -Dmaven.alfresco.edition=enterprise install -Dalfresco.platform.version=5.1 -Dalfresco.share.version=5.1 -Dmaven.alfresco.edition=enterprise

33
pom.xml
View File

@ -136,7 +136,7 @@
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
<maven.archetype.version>3.0.0</maven.archetype.version> <maven.archetype.version>3.0.0</maven.archetype.version>
<alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version> <alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
<alfresco.sdk.tests.exclude>*/*-enterprise/*</alfresco.sdk.tests.exclude> <alfresco.sdk.tests.exclude>*/*-enterprise*/*</alfresco.sdk.tests.exclude>
<!-- The following version is needed for alfresco-rad --> <!-- The following version is needed for alfresco-rad -->
<alfresco.community.default.version>5.2.e</alfresco.community.default.version> <alfresco.community.default.version>5.2.e</alfresco.community.default.version>
@ -176,6 +176,16 @@
<version>2.10</version> <version>2.10</version>
</extension> </extension>
</extensions> </extensions>
<testResources>
<testResource>
<filtering>true</filtering>
<directory>src/test/resources</directory>
<excludes>
<exclude>${alfresco.sdk.tests.exclude}</exclude>
</excludes>
</testResource>
</testResources>
</build> </build>
<repositories> <repositories>
@ -231,27 +241,6 @@
</distributionManagement> </distributionManagement>
</profile> </profile>
<profile>
<id>exclude-enterprise-tests-for-archetypes</id>
<activation>
<file>
<exists>src/test/resources/projects</exists>
</file>
</activation>
<build>
<testResources>
<testResource>
<filtering>true</filtering>
<directory>src/test/resources</directory>
<excludes>
<exclude>${alfresco.sdk.tests.exclude}</exclude>
</excludes>
</testResource>
</testResources>
</build>
</profile>
<profile> <profile>
<id>enterprise-tests</id> <id>enterprise-tests</id>
<properties> <properties>