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

Fix/mnt 22827 remove activemq all dependency (#631)

Browse Source 
* MNT-22827: remove activemq-all dependency
This commit is contained in:
Vítor Moreira 2022-03-09 15:07:59 +00:00 committed by GitHub
parent 712eb22dd4
commit 1aff0f2a01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
View File

@ -20,6 +20,9 @@ services:
context: ../../../${rootArtifactId}-platform-docker/target context: ../../../${rootArtifactId}-platform-docker/target
environment: environment:
JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}" JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
JAVA_OPTS: "
-Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"
"
CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888" CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
ports: ports:
- "${symbol_dollar}{acs.port}:8080" - "${symbol_dollar}{acs.port}:8080"
@ -52,6 +55,15 @@ services:
volumes: volumes:
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
${rootArtifactId}-activemq:
image: alfresco/alfresco-activemq:5.16.1
mem_limit: 1g
ports:
- 8161:8161 # Web Console
- 5672:5672 # AMQP
- 61616:61616 # OpenWire
- 61613:61613 # STOMP
volumes: volumes:
${rootArtifactId}-acs-volume: ${rootArtifactId}-acs-volume:
external: true external: true

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

@ -33,8 +33,6 @@
<keystore.settings>@@keystore.settings@@</keystore.settings> <keystore.settings>@@keystore.settings@@</keystore.settings>
<activemq.version>@@activemq.version@@</activemq.version>
<!-- JRebel Hot reloading of classpath stuff and web resource stuff --> <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
<jrebel.version>1.1.8</jrebel.version> <jrebel.version>1.1.8</jrebel.version>
@ -86,12 +84,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>${activemq.version}</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

12
archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
View File

@ -16,6 +16,9 @@ services:
context: ../../../target context: ../../../target
environment: environment:
JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}" JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
JAVA_OPTS: "
-Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"
"
CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888" CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
ports: ports:
- "${symbol_dollar}{acs.port}:8080" - "${symbol_dollar}{acs.port}:8080"
@ -48,6 +51,15 @@ services:
volumes: volumes:
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
- ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
${rootArtifactId}-activemq:
image: alfresco/alfresco-activemq:5.16.1
mem_limit: 1g
ports:
- 8161:8161 # Web Console
- 5672:5672 # AMQP
- 61616:61616 # OpenWire
- 61613:61613 # STOMP
volumes: volumes:
${rootArtifactId}-acs-volume: ${rootArtifactId}-acs-volume:
external: true external: true

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

@ -29,8 +29,6 @@
<keystore.settings>@@keystore.settings@@</keystore.settings> <keystore.settings>@@keystore.settings@@</keystore.settings>
<activemq.version>@@activemq.version@@</activemq.version>
<!-- JRebel Hot reloading of classpath stuff and web resource stuff --> <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
<jrebel.version>1.1.8</jrebel.version> <jrebel.version>1.1.8</jrebel.version>
@ -82,12 +80,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>${activemq.version}</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

1
pom.xml
View File

@ -80,7 +80,6 @@
-Dmetadata-keystore.metadata.algorithm=AES -Dmetadata-keystore.metadata.algorithm=AES
</keystore.settings> </keystore.settings>
<activemq.version>5.16.3</activemq.version>
<test.acs.endpoint.path /> <test.acs.endpoint.path />
<scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base> <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
</properties> </properties>