Commit 876f6286 authored by Martin Bergljung's avatar Martin Bergljung
Browse files

Bring branch up to date

parents 3e7a6d83 5d59d6cd
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to
This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.

## News

- 2015-10-19: SDK 2.1.1 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html)
- 2015-05-20: SDK 2.1.0 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html)
- 2014-12-23: SDK 2.0.0 release to Maven Central. [Docs](http://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html), [Release Notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/archive/2.0.0/github-report.htm)  
- 2014-08-22: First SNAPSHOT of SDK 2.0.0 in the [OSS Sonatype Repository](https://oss.sonatype.org/content/repositories/snapshots/org/alfresco/maven/alfresco-sdk-parent/2.0.0-SNAPSHOT/)!
@@ -14,7 +16,7 @@ This project is released under the [Apache License, Version 2.0](http://www.apac
## User Getting Started

### Latest Documentation
To get started with Alfresco SDK 2.1 (latest) visit the offical Alfresco Documentation for:
To get started with Alfresco SDK 2.1.1 (latest) visit the offical Alfresco Documentation for:

- [Alfresco Community 5.0.d and above](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html)
- [Alfresco Enterprise 5.0.1 and above](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html)
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@
  <parent>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
    <version>2.1.1-SNAPSHOT</version>
    <version>2.2.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>
  
+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
        </requiredProperty>
    </requiredProperties>
    <modules>
        <module id="repo-amp" dir="repo-amp" name="repo-amp">
        <module id="${rootArtifactId}-repo-amp" name="${rootArtifactId}-repo-amp" dir="__rootArtifactId__-repo-amp">
            <fileSets>
                <fileSet filtered="true" packaged="true" encoding="UTF-8">
                    <directory>src/main/java</directory>
@@ -54,7 +54,7 @@
            </fileSets>
        </module>

        <module id="share-amp" dir="share-amp" name="share-amp">
        <module id="${rootArtifactId}-share-amp" name="${rootArtifactId}-share-amp" dir="__rootArtifactId__-share-amp" >
            <fileSets>
                <fileSet filtered="true" packaged="true" encoding="UTF-8">
                    <directory>src/main/java</directory>
@@ -153,7 +153,7 @@

        <module id="runner" dir="runner" name="runner" filtered="false">
            <fileSets>
                <fileSet encoding="UTF-8" filtered="false">
                <fileSet encoding="UTF-8" filtered="true">
                    <directory>tomcat</directory>
                    <includes>
                        <include>**</include>
+0 −0

File moved.

+0 −0

File moved.

Loading