inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-05-26 17:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

More clean up, fix AIO

Browse Source
This commit is contained in:
Ole Hejlskov 2018-10-05 16:20:56 +02:00
parent 5291dc6e97
commit d268c20c3a
4 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/pom.xml
View File

@ -26,10 +26,6 @@
<classifier>classes</classifier> <classifier>classes</classifier>
</dependency> </dependency>
<dependency>
<groupId>org.alfresco.surf</groupId>
<artifactId>spring-surf-api</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

2
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/properties/local/alfresco-global.properties
View File

@ -60,7 +60,7 @@ integrity.failOnError=true
# Alfresco Repository PostgreSQL Database configuration. # Alfresco Repository PostgreSQL Database configuration.
# The PostgreSQL Driver is brought in via the tomcat7-maven-plugin as a dependency. # The PostgreSQL Driver is brought in via the tomcat7-maven-plugin as a dependency.
db.driver=org.postgresql.Driver db.driver=org.postgresql.Driver
db.url=jdbc:postgresql://localhost:5432/alfrescoaio db.url=jdbc:postgresql://localhost:5432/alfresco
db.username=alfresco db.username=alfresco
db.password=alfresco db.password=alfresco
db.pool.initial=10 db.pool.initial=10

22
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
View File

@ -26,12 +26,13 @@
<!-- Properties used in dependency declarations, you don't need to change these --> <!-- Properties used in dependency declarations, you don't need to change these -->
<alfresco.groupId>org.alfresco</alfresco.groupId> <alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.bomDependencyArtifactId>acs-community-packaging</alfresco.bomDependencyArtifactId>
<!-- Alfresco Platform and Share webapp versions, these are the original Alfresco webapps that will be <!-- Alfresco Platform and Share webapp versions, these are the original Alfresco webapps that will be
customized and then deployed and run by the tomcat maven plugin when customized and then deployed and run by the tomcat maven plugin when
executing for example $ mvn clean install alfresco:run --> executing for example $ mvn clean install alfresco:run -->
<alfresco.platform.version>6.0.7-ga</alfresco.platform.version> <alfresco.platform.version>6.0.7-ga</alfresco.platform.version>
<alfresco.share.version>6.0.7-ga</alfresco.share.version> <alfresco.share.version>6.0.c</alfresco.share.version>
<!-- JRebel Hot reloading of classpath stuff and web resource stuff --> <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
@ -72,10 +73,9 @@
<!-- The main Alfresco Repo dependency for compiling Java code in src/main/java --> <!-- The main Alfresco Repo dependency for compiling Java code in src/main/java -->
<dependency> <dependency>
<groupId>${alfresco.groupId}</groupId> <groupId>${alfresco.groupId}</groupId>
<artifactId>alfresco-repository</artifactId> <artifactId>alfresco-remote-api</artifactId>
</dependency> </dependency>
<!-- Bring in Alfresco RAD so we get access to AlfrescoTestRunner classes --> <!-- Bring in Alfresco RAD so we get access to AlfrescoTestRunner classes -->
<dependency> <dependency>
<groupId>org.alfresco.maven</groupId> <groupId>org.alfresco.maven</groupId>
@ -95,7 +95,7 @@
--> -->
<dependency> <dependency>
<groupId>${alfresco.groupId}</groupId> <groupId>${alfresco.groupId}</groupId>
<artifactId>alfresco-platform-distribution</artifactId> <artifactId>${alfresco.bomDependencyArtifactId}</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
@ -124,20 +124,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Redefine the following surf dependencies as they have no resolvable version in the
alfresco-platform-distribution artifact -->
<dependency>
<groupId>org.alfresco.surf</groupId>
<artifactId>spring-surf</artifactId>
<version>${alfresco.surf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.alfresco.surf</groupId>
<artifactId>spring-surf-api</artifactId>
<version>${alfresco.surf.version}</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

2
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
View File

@ -57,7 +57,7 @@ integrity.failOnError=true
# Alfresco Repository PostgreSQL Database configuration. # Alfresco Repository PostgreSQL Database configuration.
# The PostgreSQL Driver is brought in via the tomcat7-maven-plugin as a dependency. # The PostgreSQL Driver is brought in via the tomcat7-maven-plugin as a dependency.
db.driver=org.postgresql.Driver db.driver=org.postgresql.Driver
db.url=jdbc:postgresql://localhost:5432/alfrescoaio db.url=jdbc:postgresql://localhost:5432/alfresco
db.username=alfresco db.username=alfresco
db.password=alfresco db.password=alfresco
db.pool.initial=10 db.pool.initial=10