You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2024/06/24 12:26:43 UTC
(sling-org-apache-sling-caconfig-bnd-plugin) branch feature/SLING-12361-parent-60 created (now c60f4f6)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/SLING-12361-parent-60
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
at c60f4f6 SLING-12361 apply spotless code formatting
This branch includes the following new commits:
new 875c3cc SLING-12361 Update to Parent 60, Java 11 Minimum Version, bnd 6.0.0
new c60f4f6 SLING-12361 apply spotless code formatting
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.
(sling-org-apache-sling-caconfig-bnd-plugin) 02/02: SLING-12361 apply spotless code formatting
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12361-parent-60
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
commit c60f4f6882117464ebb13d3785e5271e82270ddb
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Mon Jun 24 14:26:30 2024 +0200
SLING-12361 apply spotless code formatting
---
pom.xml | 10 +++++-----
.../bndplugin/ConfigurationClassScannerPlugin.java | 7 ++-----
src/test/java/dummy/example/pkg1/Config1.java | 4 +---
src/test/java/dummy/example/pkg1/Config2.java | 4 +---
src/test/java/dummy/example/pkg1/sub1/Config3.java | 4 +---
.../AbstractConfigurationClassScannerPlugin.java | 23 +++++++++++-----------
.../caconfig/bndplugin/GenerateHeaderTest.java | 10 +++++-----
7 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index 98319b9..fdab314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,21 +28,21 @@
</parent>
<artifactId>org.apache.sling.caconfig.bnd-plugin</artifactId>
- <packaging>jar</packaging>
<version>1.0.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Apache Sling Context-Aware Configuration bnd Plugin</name>
<description>This bnd plugin detected all configuration annotation classes and adds a bundle header 'Sling-ContextAware-Configuration-Classes' containing their names.</description>
- <properties>
- <project.build.outputTimestamp>2021-12-15T00:00:00Z</project.build.outputTimestamp>
- </properties>
-
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git</developerConnection>
<url>https://github.com/apache/sling-org-apache-sling-caconfig-bnd-plugin.git</url>
</scm>
+ <properties>
+ <project.build.outputTimestamp>2021-12-15T00:00:00Z</project.build.outputTimestamp>
+ </properties>
+
<dependencies>
<dependency>
<groupId>biz.aQute.bnd</groupId>
diff --git a/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java b/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
index c71949f..7f1c461 100644
--- a/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
+++ b/src/main/java/org/apache/sling/caconfig/bndplugin/ConfigurationClassScannerPlugin.java
@@ -23,8 +23,6 @@ import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.commons.lang3.StringUtils;
-
import aQute.bnd.osgi.Analyzer;
import aQute.bnd.osgi.Clazz;
import aQute.bnd.osgi.Clazz.QUERY;
@@ -32,6 +30,7 @@ import aQute.bnd.osgi.Instruction;
import aQute.bnd.service.AnalyzerPlugin;
import aQute.bnd.service.Plugin;
import aQute.service.reporter.Reporter;
+import org.apache.commons.lang3.StringUtils;
/**
* Scans the classpath of the bundle for annotation classes with the "Configuration" annotation
@@ -87,11 +86,9 @@ public class ConfigurationClassScannerPlugin implements AnalyzerPlugin, Plugin {
classNames.add(clazz.getClassName().getFQN());
}
}
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
reporter.exception(ex, "Error querying for classes with annotation: " + annotationClassName);
}
return classNames;
}
-
}
diff --git a/src/test/java/dummy/example/pkg1/Config1.java b/src/test/java/dummy/example/pkg1/Config1.java
index 9dd90b7..4c20d6d 100644
--- a/src/test/java/dummy/example/pkg1/Config1.java
+++ b/src/test/java/dummy/example/pkg1/Config1.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config1 {
-
-}
+public @interface Config1 {}
diff --git a/src/test/java/dummy/example/pkg1/Config2.java b/src/test/java/dummy/example/pkg1/Config2.java
index 322a1df..796a145 100644
--- a/src/test/java/dummy/example/pkg1/Config2.java
+++ b/src/test/java/dummy/example/pkg1/Config2.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config2 {
-
-}
+public @interface Config2 {}
diff --git a/src/test/java/dummy/example/pkg1/sub1/Config3.java b/src/test/java/dummy/example/pkg1/sub1/Config3.java
index 456413c..f521f12 100644
--- a/src/test/java/dummy/example/pkg1/sub1/Config3.java
+++ b/src/test/java/dummy/example/pkg1/sub1/Config3.java
@@ -21,6 +21,4 @@ package dummy.example.pkg1.sub1;
import org.apache.sling.caconfig.annotation.Configuration;
@Configuration
-public @interface Config3 {
-
-}
+public @interface Config3 {}
diff --git a/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java b/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
index 4e3e158..b1c4123 100644
--- a/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
+++ b/src/test/java/org/apache/sling/caconfig/bndplugin/AbstractConfigurationClassScannerPlugin.java
@@ -18,10 +18,6 @@
*/
package org.apache.sling.caconfig.bndplugin;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-
import java.io.File;
import java.util.Arrays;
import java.util.HashMap;
@@ -29,16 +25,19 @@ import java.util.HashSet;
import java.util.Set;
import java.util.jar.Manifest;
+import aQute.bnd.osgi.Builder;
+import aQute.bnd.osgi.Jar;
+import aQute.bnd.service.Plugin;
+import aQute.service.reporter.Reporter;
import org.apache.commons.lang3.StringUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
-import aQute.bnd.osgi.Builder;
-import aQute.bnd.osgi.Jar;
-import aQute.bnd.service.Plugin;
-import aQute.service.reporter.Reporter;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
@RunWith(MockitoJUnitRunner.class)
public abstract class AbstractConfigurationClassScannerPlugin {
@@ -53,11 +52,11 @@ public abstract class AbstractConfigurationClassScannerPlugin {
classesDirJar.setManifest(new Manifest());
builder.setJar(classesDirJar);
- builder.setSourcepath(new File[] { new File("src/test/java") } );
+ builder.setSourcepath(new File[] {new File("src/test/java")});
Plugin plugin = new ConfigurationClassScannerPlugin();
plugin.setReporter(mock(Reporter.class));
- plugin.setProperties(new HashMap<String,String>());
+ plugin.setProperties(new HashMap<String, String>());
builder.addBasicPlugin(plugin);
}
@@ -71,9 +70,9 @@ public abstract class AbstractConfigurationClassScannerPlugin {
protected final void assertHeader(Jar jar, String headerName, String... headerValues) throws Exception {
Set<String> expectedValues = new HashSet<>(Arrays.asList(headerValues));
- String[] actual = StringUtils.split(jar.getManifest().getMainAttributes().getValue(headerName), ",");
+ String[] actual =
+ StringUtils.split(jar.getManifest().getMainAttributes().getValue(headerName), ",");
Set<String> actualValues = new HashSet<>(Arrays.asList(actual));
assertEquals(expectedValues, actualValues);
}
-
}
diff --git a/src/test/java/org/apache/sling/caconfig/bndplugin/GenerateHeaderTest.java b/src/test/java/org/apache/sling/caconfig/bndplugin/GenerateHeaderTest.java
index 3ee5720..b093602 100644
--- a/src/test/java/org/apache/sling/caconfig/bndplugin/GenerateHeaderTest.java
+++ b/src/test/java/org/apache/sling/caconfig/bndplugin/GenerateHeaderTest.java
@@ -18,11 +18,10 @@
*/
package org.apache.sling.caconfig.bndplugin;
-import static org.apache.sling.caconfig.bndplugin.ConfigurationClassScannerPlugin.CONFIGURATION_CLASSES_HEADER;
-
+import aQute.bnd.osgi.Jar;
import org.junit.Test;
-import aQute.bnd.osgi.Jar;
+import static org.apache.sling.caconfig.bndplugin.ConfigurationClassScannerPlugin.CONFIGURATION_CLASSES_HEADER;
public class GenerateHeaderTest extends AbstractConfigurationClassScannerPlugin {
@@ -30,10 +29,11 @@ public class GenerateHeaderTest extends AbstractConfigurationClassScannerPlugin
public void testBuild() throws Exception {
Jar jar = builder.build();
- assertHeader(jar, CONFIGURATION_CLASSES_HEADER,
+ assertHeader(
+ jar,
+ CONFIGURATION_CLASSES_HEADER,
"dummy.example.pkg1.Config1",
"dummy.example.pkg1.Config2",
"dummy.example.pkg1.sub1.Config3");
}
-
}
(sling-org-apache-sling-caconfig-bnd-plugin) 01/02: SLING-12361 Update to Parent 60, Java 11 Minimum Version, bnd 6.0.0
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-12361-parent-60
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-bnd-plugin.git
commit 875c3cc06462058eaebbd14dbd1a233b0f8d5625
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Mon Jun 24 14:25:09 2024 +0200
SLING-12361 Update to Parent 60, Java 11 Minimum Version, bnd 6.0.0
---
.sling-module.json | 5 +++++
pom.xml | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+ "jenkins": {
+ "jdks": [17, 21]
+ }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 73ddbb7..98319b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>46</version>
+ <version>60</version>
<relativePath />
</parent>
@@ -47,7 +47,7 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
- <version>3.2.0</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>