Compare commits

...
Author SHA1 Message Date
pmm 29ccc523fa [MNT-24306] log4j2 debug log fixes 2024-05-09 13:30:54 +05:30
Marcin Strankowski 340785180d Merge pull request #662 from Alfresco/feature/add_agent_based_scanning
SCA setup
2024-04-04 15:49:03 +02:00
mstrankowski 2bc06e4222 SCA setup 2024-04-04 15:01:34 +02:00
Suneet Gupta 4f70d0f575 Merge pull request #660 from Alfresco/PRODDEL-7832-UpdateSnapshot
[PRODDEL-7832] Switched to 4.9.0-SNAPSHOT
2024-03-06 17:06:20 +05:30
Manish Kumar fd106b13c7 [PRODDEL-7832] Switched to 4.9.0-SNAPSHOT 2024-03-06 16:44:13 +05:30
Suneet Gupta f59a05a0c0 Merge pull request #659 from Alfresco/release/PRODDEL-7832-PrepareRelease4.8
[PRODDEL-7832] Prepare 4.8 release
2024-03-05 16:48:53 +05:30
13 changed files with 52 additions and 19 deletions
+17
View File
@@ -28,6 +28,23 @@ jobs:
steps:
- uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v1.35.0
veracode_sca:
name: "Veracode - Source Clear Scan (SCA)"
runs-on: ubuntu-latest
if: >
github.ref_name == 'master' ||
github.event_name == 'pull_request'
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.34.0
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.34.0
- name: "Clean-up SNAPSHOT artifacts"
run: find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
- uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v1.34.0
continue-on-error: true
with:
srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
build:
name: "Build application"
runs-on: ubuntu-latest
@@ -11,7 +11,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.8.0</version>
<version>4.9.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -24,8 +24,10 @@ import org.alfresco.repo.module.AbstractModuleComponent;
import org.alfresco.repo.nodelocator.NodeLocatorService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.Level;
/**
* A basic component that will be started for this module.
@@ -36,7 +38,7 @@ import org.apache.commons.logging.LogFactory;
* @author Maurizio Pillitu
*/
public class DemoComponent extends AbstractModuleComponent {
private static Log logger = LogFactory.getLog(DemoComponent.class);
private static Logger logger = LogManager.getLogger(DemoComponent.class);
private NodeService nodeService;
@@ -55,6 +57,7 @@ public class DemoComponent extends AbstractModuleComponent {
*/
@Override
protected void executeInternal() throws Throwable {
Configurator.setLevel(logger.getName(), Level.DEBUG);
System.out.println("DemoComponent has been executed");
logger.debug("Test debug logging. Congratulation your JAR Module is working");
logger.info("This is only for information purposes. Better remove me from the log in Production");
@@ -24,8 +24,11 @@ import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.Level;
import java.util.HashMap;
import java.util.Map;
@@ -37,13 +40,14 @@ import java.util.Map;
* @since 2.1.0
*/
public class HelloWorldWebScript extends DeclarativeWebScript {
private static Log logger = LogFactory.getLog(HelloWorldWebScript.class);
private static Logger logger = LogManager.getLogger(HelloWorldWebScript.class);
protected Map<String, Object> executeImpl(
WebScriptRequest req, Status status, Cache cache) {
Map<String, Object> model = new HashMap<String, Object>();
model.put("fromJava", "HelloFromJava");
Configurator.setLevel(logger.getName(), Level.DEBUG);
logger.debug("Your 'Hello World' Web Script was called!");
return model;
@@ -12,7 +12,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.8.0</version>
<version>4.9.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -24,8 +24,10 @@ import org.alfresco.repo.module.AbstractModuleComponent;
import org.alfresco.repo.nodelocator.NodeLocatorService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.Level;
/**
* A basic component that will be started for this module.
@@ -36,7 +38,7 @@ import org.apache.commons.logging.LogFactory;
* @author Maurizio Pillitu
*/
public class DemoComponent extends AbstractModuleComponent {
private static Log logger = LogFactory.getLog(DemoComponent.class);
private static Logger logger = LogManager.getLogger(DemoComponent.class);
private NodeService nodeService;
@@ -55,6 +57,7 @@ public class DemoComponent extends AbstractModuleComponent {
*/
@Override
protected void executeInternal() throws Throwable {
Configurator.setLevel(logger.getName(), Level.DEBUG);
System.out.println("DemoComponent has been executed");
logger.debug("Test debug logging. Congratulation your JAR Module is working");
logger.info("This is only for information purposes. Better remove me from the log in Production");
@@ -24,8 +24,10 @@ import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.Level;
import java.util.HashMap;
import java.util.Map;
@@ -37,13 +39,14 @@ import java.util.Map;
* @since 2.1.0
*/
public class HelloWorldWebScript extends DeclarativeWebScript {
private static Log logger = LogFactory.getLog(HelloWorldWebScript.class);
private static Logger logger = LogManager.getLogger(HelloWorldWebScript.class);
protected Map<String, Object> executeImpl(
WebScriptRequest req, Status status, Cache cache) {
Map<String, Object> model = new HashMap<String, Object>();
model.put("fromJava", "HelloFromJava");
Configurator.setLevel(logger.getName(), Level.DEBUG);
logger.debug("Your 'Hello World' Web Script was called!");
return model;
@@ -14,7 +14,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.8.0</version>
<version>4.9.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+1 -1
View File
@@ -17,7 +17,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.8.0</version>
<version>4.9.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+1 -1
View File
@@ -10,7 +10,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.8.0</version>
<version>4.9.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+1 -1
View File
@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.8.0</version>
<version>4.9.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.8.0</version>
<version>4.9.0-SNAPSHOT</version>
<name>Alfresco SDK</name>
<description>This aggregator Project builds all modules required for the Alfresco SDK</description>
<packaging>pom</packaging>
+3
View File
@@ -0,0 +1,3 @@
# To avoid the provided dependencies we set the scope to runtime. See: https://docs.veracode.com/r/c_sc_scan_directives
# runtime: to restrict the scan to compile and runtime dependencies.
scope: runtime