inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-10-01 14:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDK 4.3 (#626)

Browse Source 
* Improved the readability of the pom.xml

* Introduced 7.1 + upgrade others to the latest version

* Handled the new Share's versions separation

* Use a variable to set the user in the Dockerfile

* Final versions

* Updated README [ci skip]

* Fixed the broken URL to the new one

* Wildcard on the version to prevent further useless updates

Co-authored-by: gfertuso <giovanni.fertuso@alfresco.com>
This commit is contained in:
Andrea Ligios
2021-09-30 15:37:50 +02:00
committed by GitHub
parent 219389197a
commit b1139739b8
43 changed files with 399 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md
View File

@@ -1,6 +1,6 @@
# Alfresco AIO Project - SDK 4.2
# Alfresco AIO Project - SDK 4.3
This is an All-In-One (AIO) project for Alfresco SDK 4.2.
This is an All-In-One (AIO) project for Alfresco SDK 4.3.
Run with `./run.sh build_start` or `./run.bat build_start` and verify that it

2
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${artifactId}</artifactId>
<name>Integration Tests Module</name>
<description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.2</description>
<description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.3</description>
<packaging>jar</packaging> <!-- Note. this just runs Integration Tests, but it needs to be a JAR otherwise
nothing is compiled (i.e. you cannot set it to pom) -->

1
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/Dockerfile
View File

@@ -1,6 +1,7 @@
FROM ${docker.acs.image}:${alfresco.platform.version}
ARG TOMCAT_DIR=/usr/local/tomcat
ARG USERNAME=${alfresco.platform.docker.user}
USER root

2
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j.properties
View File

@@ -14,7 +14,7 @@ log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t]
#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
log4j.appender.File.File=alfresco.log
log4j.appender.File.File=logs/alfresco.log
log4j.appender.File.Append=true
log4j.appender.File.DatePattern='.'yyyy-MM-dd
log4j.appender.File.layout=org.apache.log4j.PatternLayout

2
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${artifactId}</artifactId>
<name>Alfresco Platform/Repository JAR Module</name>
<description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.2
<description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.3
</description>
<packaging>jar</packaging>

4
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ${docker.share.image}:${alfresco.share.version}
FROM ${docker.share.image}:${alfresco.share.docker.version}
ARG TOMCAT_DIR=/usr/local/tomcat
@@ -13,4 +13,4 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
COPY share-config-custom.xml $TOMCAT_DIR/shared/classes/alfresco/web-extension
COPY log4j.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes

2
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/share-config-custom.xml
View File

@@ -39,7 +39,7 @@
<!--
Disable CSRF completely for now
It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
It seems Share has issues on 4.x with the embedded tomcat and CSRFPolicy
-->
<config evaluator="string-compare" condition="CSRFPolicy" replace="true">
<filter/>

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

@@ -5,7 +5,7 @@
<artifactId>${artifactId}</artifactId>
<name>Alfresco Share JAR Module</name>
<packaging>jar</packaging>
<description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.2</description>
<description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.3</description>
<parent>
<groupId>${groupId}</groupId>

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

@@ -5,8 +5,8 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>AIO - SDK 4.2</name>
<description>All-In-One (AIO) project for SDK 4.2</description>
<name>AIO - SDK 4.3</name>
<description>All-In-One (AIO) project for SDK 4.3</description>
<packaging>pom</packaging>
<prerequisites>
@@ -23,7 +23,9 @@
<alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
<alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
<alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
<alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
<alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
<!-- Docker images -->
<docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>

4
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md
View File

@@ -1,6 +1,6 @@
# Alfresco ACS JAR Module - SDK 4.2
# Alfresco ACS JAR Module - SDK 4.3
This is an ACS project for Alfresco SDK 4.2.
This is an ACS project for Alfresco SDK 4.3.
Run with `./run.sh build_start` or `./run.bat build_start` and verify that it

2
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml
View File

@@ -19,7 +19,9 @@
<alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
<alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
<alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
<alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
<alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
<!-- Docker images -->
<docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>

1
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile
View File

@@ -1,6 +1,7 @@
FROM ${docker.acs.image}:${alfresco.platform.version}
ARG TOMCAT_DIR=/usr/local/tomcat
ARG USERNAME=${alfresco.platform.docker.user}
USER root

2
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j.properties
View File

@@ -14,7 +14,7 @@ log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t]
#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
log4j.appender.File.File=alfresco.log
log4j.appender.File.File=logs/alfresco.log
log4j.appender.File.Append=true
log4j.appender.File.DatePattern='.'yyyy-MM-dd
log4j.appender.File.layout=org.apache.log4j.PatternLayout

4
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md
View File

@@ -1,6 +1,6 @@
# Alfresco Share JAR Module - SDK 4.2
# Alfresco Share JAR Module - SDK 4.3
This is a Share project for Alfresco SDK 4.2.
This is a Share project for Alfresco SDK 4.3.
Run with `./run.sh build_start` or `./run.bat build_start` and verify that it

2
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml
View File

@@ -19,7 +19,9 @@
<alfresco.groupId>org.alfresco</alfresco.groupId>
<alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
<alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
<alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
<alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
<alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
<!-- Docker images -->
<docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>

4
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ${docker.share.image}:${alfresco.share.version}
FROM ${docker.share.image}:${alfresco.share.docker.version}
ARG TOMCAT_DIR=/usr/local/tomcat
@@ -13,4 +13,4 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
COPY share-config-custom.xml $TOMCAT_DIR/shared/classes/alfresco/web-extension
COPY log4j.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes

2
archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/share-config-custom.xml
View File

@@ -39,7 +39,7 @@
<!--
Disable CSRF completely for now
It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
It seems Share has issues on 4.x with the embedded tomcat and CSRFPolicy
-->
<config evaluator="string-compare" condition="CSRFPolicy" replace="true">
<filter/>