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 2023/03/08 12:58:01 UTC
[sling-org-apache-sling-testing-paxexam] 15/30: [checkstyle] (coding) DeclarationOrder
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-testing-paxexam.git
commit 957dae273c98bbfd660fbcaf9dc6549bc3378415
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Mar 8 09:17:03 2023 +0100
[checkstyle] (coding) DeclarationOrder
---
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 4 ++--
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 4 ++--
src/main/resources/templates/SlingVersionResolver.hbs | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index d587440..961422f 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -30,10 +30,10 @@ import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
@SuppressWarnings({"java:S1192", "java:S4143"})
public class SlingVersionResolver implements VersionResolver {
- private final Map<String, String> versions = new HashMap<>();
-
public static final String SLING_GROUP_ID = "org.apache.sling";
+ private final Map<String, String> versions = new HashMap<>();
+
public SlingVersionResolver() {
versions.put("biz.aQute.bnd:biz.aQute.bndlib", "3.5.0");
versions.put("biz.aQute.bnd:bndlib", "2.4.0");
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index 78941a0..659a330 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -54,13 +54,13 @@ import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
public abstract class TestSupport {
- private final String workingDirectory = String.format("%s/target/paxexam/%s/%s", PathUtils.getBaseDir(), getClass().getSimpleName(), UUID.randomUUID());
+ private static final String WORKING_DIRECTORY_PROPERTY_KEY = "sling.testing.paxexam.workingDirectory";
@Inject
@SuppressWarnings("checkstyle:VisibilityModifier")
protected ConfigurationAdmin configurationAdmin;
- private static final String WORKING_DIRECTORY_PROPERTY_KEY = "sling.testing.paxexam.workingDirectory";
+ private final String workingDirectory = String.format("%s/target/paxexam/%s/%s", PathUtils.getBaseDir(), getClass().getSimpleName(), UUID.randomUUID());
protected String workingDirectory() {
return workingDirectory;
diff --git a/src/main/resources/templates/SlingVersionResolver.hbs b/src/main/resources/templates/SlingVersionResolver.hbs
index 887f4b4..fa46fef 100644
--- a/src/main/resources/templates/SlingVersionResolver.hbs
+++ b/src/main/resources/templates/SlingVersionResolver.hbs
@@ -30,10 +30,10 @@ import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
@SuppressWarnings({"java:S1192", "java:S4143"})
public class SlingVersionResolver implements VersionResolver {
- private final Map<String, String> versions = new HashMap<>();
-
public static final String SLING_GROUP_ID = "org.apache.sling";
+ private final Map<String, String> versions = new HashMap<>();
+
public SlingVersionResolver() {
versions.put("biz.aQute.bnd:biz.aQute.bndlib", "3.5.0");
versions.put("biz.aQute.bnd:bndlib", "2.4.0");