LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

* Remvoved log4j-core, log4j-api is now included in provided scope (provided by Wildfly) 

* Fixed bug in folder tree
pull/10/head
Jens Pelzetter 2021-12-13 20:52:34 +01:00
parent 7dd51f4c46
commit e640261066
6 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ccm-bundle-devel/pom.xml
View File

@ -63,13 +63,10 @@
<!-- CCM Modules end --> <!-- CCM Modules end -->
<!-- Dependencies for log4j 2 including adapter for the log4j 1.2 API --> <!-- Dependencies for log4j 2 including adapter for the log4j 1.2 API -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

5
ccm-cms/pom.xml
View File

@ -103,13 +103,10 @@
</dependency> </dependency>
<!-- Dependencies for log4j 2 --> <!-- Dependencies for log4j 2 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

12
ccm-cms/src/main/java/org/librecms/ui/contentsections/AbstractFolderTree.java
View File

@ -115,12 +115,12 @@ abstract class AbstractFolderTree<T extends FolderTreeNode<T, P>, P extends Perm
final Folder folder final Folder folder
) { ) {
final String folderPath = folderManager final String folderPath = folderManager
.getFolderPath(folder) .getFolderPath(folder);
.substring( // .substring(
folderManager // folderManager
.getFolderPath(section.getRootDocumentsFolder()) // .getFolderPath(section.getRootDocumentsFolder())
.length() - 1 // .length() - 1
); // );
final T node = newFolderTreeNode(); final T node = newFolderTreeNode();
node.setFolderId(folder.getObjectId()); node.setFolderId(folder.getObjectId());
node.setUuid(folder.getUuid()); node.setUuid(folder.getUuid());

5
ccm-core/pom.xml
View File

@ -127,13 +127,10 @@
</dependency> </dependency>
<!-- Dependencies for log4j 2 --> <!-- Dependencies for log4j 2 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

5
ccm-docrepo/pom.xml
View File

@ -55,13 +55,10 @@
</dependency> </dependency>
<!-- Dependencies for log4j 2 --> <!-- Dependencies for log4j 2 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

5
ccm-shortcuts/pom.xml
View File

@ -98,13 +98,10 @@
<artifactId>jackson-jaxrs-xml-provider</artifactId> <artifactId>jackson-jaxrs-xml-provider</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>