Commit e302055c authored by Ole Hejlskov's avatar Ole Hejlskov Committed by GitHub
Browse files

Merge branch 'sdk-3.0' into sdk-3.0

parents e6394e25 3b7e32df

archetypes/activiti-jar-archetype/src/main/resources/archetype-resources/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        <activiti.admin.war.artifactId>activiti-admin</activiti.admin.war.artifactId> <!-- This contains the Alfresco Activiti Administrator webapp. You use this to administer and monitor your Alfresco Activiti engines.-->



        <!-- The version of the Alfresco Activiti Enterprise Workflow Engine that the customization will run in -->

        <activiti.version>1.5.1</activiti.version>

        <activiti.version>1.5.3</activiti.version>



        <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->

        <jrebel.version>1.1.6</jrebel.version>
@@ -54,7 +54,7 @@ 
        <dependency>

            <groupId>junit</groupId>

            <artifactId>junit</artifactId>

            <version>4.11</version>

            <version>4.12</version>

            <scope>test</scope>

        </dependency>

archetypes/activiti-jar-archetype/src/test/resources/projects/basic/goal.txt

+1 −1
Original line number Diff line number Diff line 
verify
 
verify -Dmaven.test.skip=true

archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/goal.txt

+1 −1
Original line number Diff line number Diff line 
verify alfresco:run -Dmaven.tomcat.fork=true
 
install
 
 No newline at end of file

archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

+45 −0
Original line number Diff line number Diff line
@@ -96,6 +96,44 @@ 
                </fileSet>

            </fileSets>

        </module>



        <module id="integration-tests" name="integration-tests" dir="integration-tests">

            <fileSets>

                <fileSet filtered="true" packaged="true" encoding="UTF-8">

                    <directory>src/main/java</directory>

                    <includes>

                        <include>**/*.java</include>

                    </includes>

                </fileSet>

                <fileSet filtered="true" packaged="true" encoding="UTF-8">

                    <directory>src/test/java</directory>

                    <includes>

                        <include>**/*.java</include>

                    </includes>

                </fileSet>

                <fileSet encoding="UTF-8" filtered="true">

                    <directory>src/test/resources</directory>

                    <includes>

                        <include>**/dev-log4j.properties</include>

                    </includes>

                </fileSet>

                <fileSet encoding="UTF-8" filtered="false">

                    <directory>src/test/resources</directory>

                    <includes>

                        <include>**</include>

                    </includes>

                    <excludes>

                        <exclude>**/dev-log4j.properties</exclude>

                    </excludes>

                </fileSet>

                <fileSet encoding="UTF-8" filtered="false">

                    <directory>src/test/properties</directory>

                    <includes>

                        <include>**/*.properties</include>

                    </includes>

                </fileSet>

            </fileSets>

        </module>

    </modules>



    <fileSets>
@@ -105,6 +143,12 @@ 
                <include>**/dev-log4j.properties</include>

            </includes>

        </fileSet>

        <fileSet encoding="UTF-8" filtered="true">

            <directory>src/test/resources</directory>

            <includes>

                <include>*hotswap-agent.properties</include>

            </includes>

        </fileSet>

        <fileSet encoding="UTF-8" filtered="false">

            <directory>src/test/resources</directory>

            <includes>
@@ -112,6 +156,7 @@ 
            </includes>

            <excludes>

                <exclude>**/dev-log4j.properties</exclude>

                <exclude>*hotswap-agent.properties</exclude>

            </excludes>

        </fileSet>

        <fileSet encoding="UTF-8" filtered="false">

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/pom.xml

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ 
    </properties>



    <dependencies>

        <!-- The main Alfresco Repo dependency for compiling Java code in src/main/java -->

        <dependency>

            <groupId>${alfresco.groupId}</groupId>

            <artifactId>alfresco-repository</artifactId>



        </dependency>



    </dependencies>



    <build>