You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2019/06/04 12:43:08 UTC
[sling-org-apache-sling-app-cms] branch master updated: Removing
unneeded files and hopefully finally squashing the RAT false flag
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new c62a719 Removing unneeded files and hopefully finally squashing the RAT false flag
c62a719 is described below
commit c62a719ee2006ff848c9c3fc215766dfd7f8b528
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Jun 4 08:42:58 2019 -0400
Removing unneeded files and hopefully finally squashing the RAT false flag
---
core/pom.xml | 24 ---------------------
.../cms/core/helpers/SlingCMSContextHelper.java | 4 ----
core/src/test/resources/Sling.docx | Bin 15143 -> 0 bytes
core/src/test/resources/Sling.ppt | Bin 123392 -> 0 bytes
core/src/test/resources/Sling.pptx | Bin 99100 -> 0 bytes
core/src/test/resources/sling.pdf | Bin 251268 -> 0 bytes
transformer/pom.xml | 24 +++++++++++++++++++++
7 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 59427eb..01ff742 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -60,30 +60,6 @@
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- Used by maven-remote-resources-plugin -->
- <exclude>src/main/appended-resources/META-INF/*</exclude>
- <!-- Generated by maven-remote-resources-plugin -->
- <exclude>velocity.log</exclude>
- <!-- don't check anything in target -->
- <exclude>target/*</exclude>
- <!-- for some reason Rat doesn't seem to pick up that PPTs are binary -->
- <exclude>src/test/resources/Sling.ppt</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/core/src/test/java/org/apache/sling/cms/core/helpers/SlingCMSContextHelper.java b/core/src/test/java/org/apache/sling/cms/core/helpers/SlingCMSContextHelper.java
index c86d0ed..c77cdfa 100644
--- a/core/src/test/java/org/apache/sling/cms/core/helpers/SlingCMSContextHelper.java
+++ b/core/src/test/java/org/apache/sling/cms/core/helpers/SlingCMSContextHelper.java
@@ -31,10 +31,6 @@ public class SlingCMSContextHelper {
context.load().json("/content.json", "/content");
context.load().binaryResource("/apache.png", "/content/apache/sling-apache-org/index/apache.png/jcr:content");
- context.load().binaryResource("/sling.pdf", "/content/apache/sling-apache-org/index/sling.pdf/jcr:content");
- context.load().binaryResource("/Sling.docx", "/content/apache/sling-apache-org/index/Sling.docx/jcr:content");
- context.load().binaryResource("/Sling.pptx", "/content/apache/sling-apache-org/index/Sling.pptx/jcr:content");
- context.load().binaryResource("/Sling.ppt", "/content/apache/sling-apache-org/index/Sling.ppt/jcr:content");
context.registerAdapter(Resource.class, InputStream.class, new Function<Resource, InputStream>() {
public InputStream apply(Resource input) {
diff --git a/core/src/test/resources/Sling.docx b/core/src/test/resources/Sling.docx
deleted file mode 100644
index 73fba2a..0000000
Binary files a/core/src/test/resources/Sling.docx and /dev/null differ
diff --git a/core/src/test/resources/Sling.ppt b/core/src/test/resources/Sling.ppt
deleted file mode 100644
index 0e9a6d3..0000000
Binary files a/core/src/test/resources/Sling.ppt and /dev/null differ
diff --git a/core/src/test/resources/Sling.pptx b/core/src/test/resources/Sling.pptx
deleted file mode 100644
index 8ed0a34..0000000
Binary files a/core/src/test/resources/Sling.pptx and /dev/null differ
diff --git a/core/src/test/resources/sling.pdf b/core/src/test/resources/sling.pdf
deleted file mode 100644
index a443389..0000000
Binary files a/core/src/test/resources/sling.pdf and /dev/null differ
diff --git a/transformer/pom.xml b/transformer/pom.xml
index 43a91c2..f83d3fa 100644
--- a/transformer/pom.xml
+++ b/transformer/pom.xml
@@ -69,6 +69,30 @@
</goals>
</execution>
</executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Used by maven-remote-resources-plugin -->
+ <exclude>src/main/appended-resources/META-INF/*</exclude>
+ <!-- Generated by maven-remote-resources-plugin -->
+ <exclude>velocity.log</exclude>
+ <!-- don't check anything in target -->
+ <exclude>target/*</exclude>
+ <!-- for some reason Rat doesn't seem to pick up that PPTs are binary -->
+ <exclude>src/test/resources/Sling.ppt</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>