You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/08/27 05:27:26 UTC
[sling-org-apache-sling-scripting-groovy] branch master updated
(48a9b34 -> 424c381)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git.
from 48a9b34 Adding sonarqube badges as per SLING-9682
new 2b2fa56 suppress warnings for rule java:S100
new 424c381 SLING-9702 Enable code coverage with JaCoCo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 26 ++++++++++++++++++++++
.../GStringScriptEngineFactoryConfiguration.java | 1 +
.../scripting/groovy/it/GroovyTestSupport.java | 4 +++-
3 files changed, 30 insertions(+), 1 deletion(-)
[sling-org-apache-sling-scripting-groovy] 02/02: SLING-9702 Enable
code coverage with JaCoCo
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 424c381d8a759029d81588a4fcb0430e6b811c09
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Aug 27 07:25:50 2020 +0200
SLING-9702 Enable code coverage with JaCoCo
---
pom.xml | 26 ++++++++++++++++++++++
.../scripting/groovy/it/GroovyTestSupport.java | 4 +++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8eaf3f3..d0940a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,10 +77,36 @@
<name>bundle.filename</name>
<value>${basedir}/target/${project.build.finalName}.jar</value>
</property>
+ <property>
+ <name>jacoco.command</name>
+ <value>${jacoco.command}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-agent</id>
+ <configuration>
+ <propertyName>jacoco.command</propertyName>
+ </configuration>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
</plugin>
diff --git a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
index e92c724..ba2e338 100644
--- a/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
+++ b/src/test/java/org/apache/sling/scripting/groovy/it/GroovyTestSupport.java
@@ -42,6 +42,7 @@ import static org.apache.sling.testing.paxexam.SlingOptions.slingScripting;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
public class GroovyTestSupport extends TestSupport {
@@ -82,7 +83,8 @@ public class GroovyTestSupport extends TestSupport {
slingResourcePresence(),
mavenBundle().groupId("org.jsoup").artifactId("jsoup").versionAsInProject(),
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
- junitBundles()
+ junitBundles(),
+ vmOption(System.getProperty("jacoco.command"))
);
}
[sling-org-apache-sling-scripting-groovy] 01/02: suppress warnings
for rule java:S100
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-groovy.git
commit 2b2fa561aad3ba5eefaadab3488e9450f395092b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Aug 27 07:24:12 2020 +0200
suppress warnings for rule java:S100
---
.../groovy/internal/GStringScriptEngineFactoryConfiguration.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactoryConfiguration.java b/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactoryConfiguration.java
index 8688e76..3fb2484 100644
--- a/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactoryConfiguration.java
+++ b/src/main/java/org/apache/sling/scripting/groovy/internal/GStringScriptEngineFactoryConfiguration.java
@@ -23,6 +23,7 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
name = "Apache Sling Scripting Groovy GString ScriptEngineFactory",
description = "Script engine factory for Groovy's GString template engine."
)
+@SuppressWarnings("java:S100")
@interface GStringScriptEngineFactoryConfiguration {
@AttributeDefinition(