Skip to content

Commit

Permalink
REPO-5220: README.md update.
Browse files Browse the repository at this point in the history
(cherry picked from commit 0fb12e869a36cbcf589c7069a4a04c3e58476ff8)
Merge branch 'master' of github.com:Alfresco/alfresco-community-repo-play1

(cherry picked from commit 528874af2108eee41f3c298102d60bd22a6be382)
gitignore and gitbugtraq

(cherry picked from commit 924846370dee509036ab2e4ce0a5ab861f968202)
Link community projects together

(cherry picked from commit c9f25ee40b466aa0a1ad8cfc8422e97ca5ccc3e1)
Move TAS dependencyManagement (both com and ent) to the alfresco-community-repo

(cherry picked from commit c93eeacf1741e1d8dcba908c8ad6a8de5f4129f5)
Move community dependencyManagement to the alfresco-community-repo - has an impact on enterprise too

(cherry picked from commit e015ed3340dea1a2d4c90e9b79c07d21a26177ba)
Avoid having to have versions of the sub projects we supply

(cherry picked from commit 95d6fbd2fb98f7ec8f3d46fa9526eae0e1c123bd)
Set Java version in one place

(cherry picked from commit ce8d29e9359965809100c8ff37514525fc19f700)
Make community tas test more like enterprise

(cherry picked from commit e95af5bb4326961741d8d6bbe81773bed7f76b37)
Make community tas test more like enterprise

(cherry picked from commit 2bbce9372fd0c5b3ec83beb7d37ee0545d4c4350)
Remove distribution and public-javadoc other than licenses.

(cherry picked from commit 51f22500b6fada90e55e760c62a7e1c733511b84)
Simplify dependencies further

(cherry picked from commit ea2fe6d6c460b81270a1981d36a62bb5e4278664)
Change dependency versions to be 6.3.0 based.

(cherry picked from commit 5f2509779754eb8a0cdbd0531e649616d4271d0f)
Give TAS tests in unique atrifact names

(cherry picked from commit 4039d0d1caa63f3f3fb0cde6176fdeae4319615d)
REPO-5224 Add Travis files and gitIgnore

Co-authored-by: Sara Aspery <[email protected]>
Co-authored-by: jamalkm <[email protected]>

(cherry picked from commit 9feefec12e5d818e8d73ae50ec4d66a26277d5c2)
REPO-5292 Move creation of war from acs-community-packaging to alfresco-community-repo

(cherry picked from commit a92cafe60e32e1af1e0b645ec23816bcf930d85f)
Set up top level files for git, whitesource, README, LICENSES, CONTRIBUTING and further changes for travis.

These files have been moved out of the original modules. The README and CONTRIBUTING still need updating.

(cherry picked from commit 6f1b6df3319d563f650d3981859f33859d06932a)
Avoid push to nexus for now and combine core, data-model and repo unit tests

(cherry picked from commit ad44da65600e6ecf318573a4440062ee0adbf291)
Try remote-api tests and comment out REST API TAS tests part2 as there is a test that fails.

(cherry picked from commit b6e016315d5a32281b0cd9f2e74136d65255822c)
Comment out failing tasks

(cherry picked from commit 654f1ef2906bfdeef31a4e7be4fb753006e732a7)
Drop "-tas" and "-parent" out of modules that do tests as they will contain non TAS tests.

(cherry picked from commit 35a2870ec9a188d3f82fba58381f7b6c96326d93)
TAS test's docker-compose files changed to use -base image built in project.

(cherry picked from commit 2615f2ece972079726bd44676967fae1ff854643)
Re-comment commented out section.

(cherry picked from commit 5990979736025aeb8020b61a71d0f581f7d5f8a9)
REPO-5229-Create base Repo Docker images
-update dockerfile for alfresco-community-repo-base images

(cherry picked from commit e37e2673e80fd5dba7b4da03d6243294e41312a8)
Merge remote-tracking branch 'origin/master'

(cherry picked from commit f190a5d799f0c9435818d71a03fb12a55f7cc753)
REPO-5263-Creation of alfresco-community-repo development docker image that contains other ACS elements.
-remove aos and GoogleDocs dependencies
-create community-repo docker image from alfresco-community-repo-base

(cherry picked from commit e506d489f7412ba30e803c8f3067a97b5add7ee4)
Temp message added to README prior to making the project public.

(cherry picked from commit ebcb74485550d69f34fde8675902c0ffe76d44d1)
REPO-5255: Trigger down stream builds

- add trigger-travis script
- create stage and job for triggering downstream project

(cherry picked from commit 78b4248b5a2202f06205dfc75c38ecac480a7416)
Merge branch 'master' into feature/REPO-5255

(cherry picked from commit 80c1191187047968404270c5b0e394b7e7b3a0be)
REPO-5255: Trigger down stream builds [skip tests]

- add branch

(cherry picked from commit 7ed0693fd0f8bea4172ec10804f4a9de92807ad3)
REPO-5255: Trigger down stream builds [skip tests]

- update job condition

(cherry picked from commit 722282b45577216e2cd9f8f083873eb1f8db7eb3)
REPO-5255: Trigger down stream builds [skip tests]

- update job condition

(cherry picked from commit 2080a4842e31fc7555e14196b716334545b9b011)
Merge remote-tracking branch 'origin/feature/REPO-5255' into feature/REPO-5255

(cherry picked from commit c962da39eee67922ddfce40f40a115c4b9c2259b)
Merge pull request Alfresco#4 from Alfresco/feature/REPO-5255

Feature/repo 5255

(cherry picked from commit badee221e160118593740c3e8243edb5af67d378)
Bump mockito-core from 3.3.3 to 3.4.0 (Alfresco#138)

(cherry picked from commit 8784ebb)
  • Loading branch information
alandavis committed Jul 21, 2020
1 parent 0c69b98 commit fd2f2bd
Show file tree
Hide file tree
Showing 86 changed files with 443 additions and 5,111 deletions.
4 changes: 3 additions & 1 deletion core/.gitattributes → .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
*.css eol=crlf
*.xml eol=crlf
*.js eol=crlf
*.properties eol=crlf
*.properties eol=crlf
# Shell scripts require LF
*.sh text eol=lf
File renamed without changes.
3 changes: 3 additions & 0 deletions data-model/.gitignore → .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
*.iml
*.iws

#VSCode
/.vscode

# Mac
.DS_Store

Expand Down
5 changes: 5 additions & 0 deletions packaging/.travis.settings.xml → .travis.settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@


<servers>
<server>
<id>alfresco-public</id>
<username>${env.MAVEN_USERNAME}</username>
<password>${env.MAVEN_PASSWORD}</password>
</server>
<server>
<id>alfresco-internal</id>
<username>${env.MAVEN_USERNAME}</username>
Expand Down
252 changes: 252 additions & 0 deletions .travis.yml

Large diffs are not rendered by default.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ apiKey=
#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option
#userKey=

projectName=alfresco-core
projectName=alfresco-community-repo
projectVersion=
projectToken=

Expand Down
File renamed without changes.
File renamed without changes.
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# README

Repository is a work in progress and is temporary. It will be deleted. Please do not clone it.

It is an attempt to combine a number of existing community projects to make development of the repository component
simpler. It creates an alfresco.war and an alfresco/alfresco-community-repo-base docker image that contains no other
ACS components. A branch of acs-community-packaging is also being changed so that dependency management flows from
this project to the packaging and AMP projects.

## Project versions

This table shows the project branches/tags that have been used to create the branches on alfresco-community-repo.

| alfresco-community-repo | alfresco-core | alfresco-data-model | alfresco-repository | alfresco-remote-api | acs-community-packaging |
| ----------------------- | ------------------ | -------------------- | -------------------- | -------------------- | ----------------------- |
|master | master | master | master | master | develop |
|release/6.2.N | support/SP/7.N | support/SP/8.50.N | support/SP/7.N | support/SP/7.N | develop |
|release/6.2.1 | tags/7.33 | tags/8.50.14 | support/HF/7.183.N | support/HF/7.133.N | develop |
|release/6.2.0 | tags/7.22 | support/HF/8.50.2.N | support/HF/7.134.N | support/HF/7.107.N | develop |
|release/6.1.1 | support/HF/7.5.7.N | support/HF/8.25.11.N | support/HF/7.33.42.N | support/HF/7.34.25.N | develop |
|release/6.1.0 | support/HF/7.5.1.N | tags/8.25.1 | support/HF/7.33.12.N | support/HF/7.34.1.N | develop |
|release/6.0.1 | tags/7.5 | tags/8.18 | support/HF/6.56.15.N | support/HF/6.39.7.N | develop |
|release/6.0.0 | tags/7.3 | tags/8.9 | support/HF/6.56.5.N | support/HF/6.39.2.N | develop |
34 changes: 0 additions & 34 deletions core/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions core/.travis.settings.xml

This file was deleted.

52 changes: 0 additions & 52 deletions core/.travis.yml

This file was deleted.

36 changes: 6 additions & 30 deletions core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-super-pom</artifactId>
<version>12</version>
</parent>
<artifactId>alfresco-core</artifactId>
<version>8.40-SNAPSHOT</version>
<name>Alfresco Core</name>
<description>Alfresco core libraries and utils</description>

<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>8.300-SNAPSHOT</version>
</parent>

<scm>
<connection>scm:git:https://github.com/Alfresco/alfresco-core.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-core.git</developerConnection>
Expand All @@ -25,32 +24,22 @@
</repository>
</distributionManagement>

<properties>
<dependency.spring.version>5.2.7.RELEASE</dependency.spring.version>
<dependency.surf.version>8.5</dependency.surf.version>
<maven.build.sourceVersion>11</maven.build.sourceVersion>
</properties>

<dependencies>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1-HTTPCLIENT-1265</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -71,12 +60,10 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160212</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${dependency.spring.version}</version>
<!-- exclude spring-jcl which is brought in by spring-core -->
<!-- see https://issues.alfresco.com/jira/browse/REPO-4774 -->
<exclusions>
Expand All @@ -89,12 +76,10 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${dependency.spring.version}</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.3.2</version>
<!-- exclude c3p0 -->
<!-- see https://issues.alfresco.com/jira/browse/REPO-3447 -->
<exclusions>
Expand All @@ -107,12 +92,10 @@
<dependency>
<groupId>org.alfresco.surf</groupId>
<artifactId>spring-surf-core-configservice</artifactId>
<version>${dependency.surf.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
Expand All @@ -127,45 +110,38 @@
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10.6</version>
</dependency>

<!-- provided dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>

<!-- Test only dependencies, as popped up while running mvn test -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.30</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4-DBCP330</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 0 additions & 8 deletions data-model/.gitattributes

This file was deleted.

4 changes: 0 additions & 4 deletions data-model/.gitbugtraq

This file was deleted.

10 changes: 0 additions & 10 deletions data-model/.travis.settings.xml

This file was deleted.

46 changes: 0 additions & 46 deletions data-model/.travis.yml

This file was deleted.

8 changes: 0 additions & 8 deletions data-model/.whitesource

This file was deleted.

Loading

0 comments on commit fd2f2bd

Please sign in to comment.