inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-08-07 17:49:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to 5.0.b.

Browse Source 
- Remove jcl-over-slf4j
 - Bump H2 support
This commit is contained in:
Ole Hejlskov
2014-10-06 21:10:26 +01:00
parent 70533a2973
commit c6beb898ad
16 changed files with 21 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@
<defaultValue>org.alfresco</defaultValue>
</requiredProperty>
<requiredProperty key="alfresco_target_version">
<defaultValue>5.0.a</defaultValue>
<defaultValue>5.0.b</defaultValue>
</requiredProperty>
<requiredProperty key="package">
<defaultValue>(not used)</defaultValue>

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

@@ -140,14 +140,6 @@
</plugin>
</plugins>
</build>
<!-- Needed to fix http://code.google.com/p/maven-alfresco-archetypes/issues/detail?id=150.
Only for community, scope controlled by dependencyManagement via sdk-parent -->
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
</profile>
<!-- Installs the needed runtime artifact for an RM (Records Management) project -->
<profile>

2
archetypes/alfresco-allinone-archetype/src/site/apt/index.apt.vm
View File

@@ -46,7 +46,7 @@ mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog
[[2]] Specify the <<<groupId>>> and <<<artifactId>>> for the project you want to create
[[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a)
[[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.b)
You can find new Alfresco All-in-One project ready to go in the <<<artifactId>>> folder.

2
archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties
View File

@@ -3,4 +3,4 @@ version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=allInOneTest
alfresco_target_groupId=org.alfresco
alfresco_target_version=5.0.a
alfresco_target_version=5.0.b

2
archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties
View File

@@ -3,4 +3,4 @@ version=0.1-SNAPSHOT
groupId=archetype.it
artifactId=allInOneTest
alfresco_target_groupId=org.alfresco
alfresco_target_version=5.0.a
alfresco_target_version=5.0.b

2
archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View File

@@ -10,7 +10,7 @@
<defaultValue>org.alfresco</defaultValue>
</requiredProperty>
<requiredProperty key="alfresco_target_version">
<defaultValue>5.0.a</defaultValue>
<defaultValue>5.0.b</defaultValue>
</requiredProperty>
<requiredProperty key="package">
<defaultValue>(not used)</defaultValue>

4
archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
View File

@@ -2,10 +2,10 @@
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
alfresco_target_version=5.0.a
alfresco_target_version=5.0.b
$=cat archetype.properties
alfresco_target_groupId=org.alfresco
alfresco_target_amp_client_war=alfresco
alfresco_target_amp_client_war_groupId=org.alfresco
alfresco_target_amp_client_war_version=5.0.a
alfresco_target_amp_client_war_version=5.0.b
artifactId=basic

4
archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties
View File

@@ -2,10 +2,10 @@
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
alfresco_target_version=5.0.a
alfresco_target_version=5.0.b
$=cat archetype.properties
alfresco_target_groupId=org.alfresco
alfresco_target_amp_client_war=alfresco
alfresco_target_amp_client_war_groupId=org.alfresco
alfresco_target_amp_client_war_version=5.0.a
alfresco_target_amp_client_war_version=5.0.b
artifactId=basic

2
archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View File

@@ -10,7 +10,7 @@
<defaultValue>org.alfresco</defaultValue>
</requiredProperty>
<requiredProperty key="alfresco_target_version">
<defaultValue>5.0.a</defaultValue>
<defaultValue>5.0.b</defaultValue>
</requiredProperty>
<requiredProperty key="package">
<defaultValue>(not used)</defaultValue>

2
archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample
View File

@@ -1,4 +1,4 @@
<!-- Alfresco 5.0.a share-config-custom.xml sample -->
<!-- Alfresco 5.0.b share-config-custom.xml sample -->
<alfresco-config>
<!-- Global config section -->

2
archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm
View File

@@ -42,7 +42,7 @@ mvn archetype:generate -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/c
[[2]] Specify the <<<groupId>>> and <<<artifactId>>> for the project you want to create
[[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a)
[[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.b)
You can find new Share AMP project ready to go in the <<<artifactId>>> folder.

2
archetypes/share-amp-archetype/src/site/apt/index.apt.vm
View File

@@ -46,7 +46,7 @@ mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog
[[2]] Specify the <<<groupId>>> and <<<artifactId>>> for the project you want to create
[[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a)
[[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.b)
You can find new Share AMP project ready to go in the <<<artifactId>>> folder.

4
archetypes/share-amp-archetype/src/test/resources/projects/basic/archetype.properties
View File

@@ -2,10 +2,10 @@
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
alfresco_target_version=5.0.a
alfresco_target_version=5.0.b
$=cat archetype.properties
alfresco_target_groupId=org.alfresco
alfresco_target_amp_client_war=share
alfresco_target_amp_client_war_groupId=org.alfresco
alfresco_target_amp_client_war_version=5.0.a
alfresco_target_amp_client_war_version=5.0.b
artifactId=basic

4
archetypes/share-amp-archetype/src/test/resources/projects/run-basic/archetype.properties
View File

@@ -2,10 +2,10 @@
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
alfresco_target_version=5.0.a
alfresco_target_version=5.0.b
$=cat archetype.properties
alfresco_target_groupId=org.alfresco
alfresco_target_amp_client_war=share
alfresco_target_amp_client_war_groupId=org.alfresco
alfresco_target_amp_client_war_version=5.0.a
alfresco_target_amp_client_war_version=5.0.b
artifactId=basic

2
plugins/alfresco-maven-plugin/pom.xml
View File

@@ -79,7 +79,7 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-mmt</artifactId>
<version>5.0.a</version>
<version>5.0.b</version>
</dependency>
<dependency>
<groupId>org.alfrescolabs.alfresco-technical-validation</groupId>

27
poms/alfresco-sdk-parent/pom.xml
View File

@@ -37,7 +37,7 @@
| For available versions please search on https://artifacts.alfresco.com/nexus/index.html
-->
<alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.version>5.0.a</alfresco.version>
<alfresco.version>5.0.b</alfresco.version>
<!-- By default uses community artifacts (alfresco|share). Overridden in the 'enterprise' profile, with 'alfresco-enterprise' and 'share-enterprise' -->
<alfresco.repo.artifactId>alfresco</alfresco.repo.artifactId>
<alfresco.share.artifactId>share</alfresco.share.artifactId>
@@ -124,7 +124,7 @@
<!-- Maven Alfresco plugin in use throughout the SDK -->
<maven.alfresco.version>2.0.0-SNAPSHOT</maven.alfresco.version>
<h2.version>1.3.174</h2.version>
<h2-support.version>1.5</h2-support.version>
<h2-support.version>5.0.0</h2-support.version>
<junit.version>4.11</junit.version>
</properties>
@@ -350,18 +350,6 @@
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${app.slf4j.version}</version>
<scope>${app.slf4j.scope}</scope>
</dependency>
</dependencies>
</dependencyManagement>
<!-- Feature / behavioral profiles -->
<profiles>
<!-- Enable environment properties filtering based on the env property -->
@@ -675,16 +663,7 @@
</plugins>
</build>
<dependencies>
<!-- Needed to fix http://code.google.com/p/maven-alfresco-archetypes/issues/detail?id=150 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${app.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-rad</artifactId>