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 2025/02/26 10:44:31 UTC

(sling-org-apache-sling-adapter-annotations) branch master updated (019f1ec -> 1553bfb)

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations.git


    from 019f1ec  SLING-12459 - Redirect sonarcloud notifications to commits@apache.sling.org
     new 1b18086  SLING-12677 Update to parent 62
     new 1553bfb  SLING-12677 apply spotless 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.


Summary of changes:
 .sling-module.json                                 |  5 ++
 pom.xml                                            | 80 ++++++++++------------
 src/it/annotations-it/pom.xml                      | 46 +++++++------
 .../adapters/AbstractNoOpAdapterFactory.java       | 26 +++----
 .../testing/adapters/DeprecatedAdapterFactory.java | 28 ++++----
 .../IntegerAndShortToLongAdapterFactory.java       | 32 ++++-----
 .../adapters/InvalidEmptyAdapterFactory.java       | 33 +++++----
 .../InvalidNoAdaptablesAdapterFactory.java         | 33 +++++----
 .../adapters/InvalidNoAdaptersAdapterFactory.java  | 33 +++++----
 .../LongToIntegerIfFitsAdapterFactory.java         | 31 ++++-----
 .../ShortToIntegerAndLongAdapterFactory.java       | 33 +++++----
 .../adapters/TextLengthIfFitsAdapterFactory.java   | 33 ++++-----
 src/it/annotations-it/verify.groovy                |  2 +
 .../adapter/annotations/AdapterCondition.java      | 26 +++----
 .../adapter/annotations/AdapterDeprecated.java     | 29 ++++----
 .../sling/adapter/annotations/SlingAdapter.java    | 26 +++----
 16 files changed, 261 insertions(+), 235 deletions(-)
 create mode 100644 .sling-module.json


(sling-org-apache-sling-adapter-annotations) 01/02: SLING-12677 Update to parent 62

Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations.git

commit 1b180867fd5b4a99ae10f180f897549810c8d78a
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Feb 26 10:45:46 2025 +0100

    SLING-12677 Update to parent 62
---
 .sling-module.json                  |  5 +++++
 pom.xml                             | 11 ++---------
 src/it/annotations-it/pom.xml       | 13 ++++++++++---
 src/it/annotations-it/verify.groovy |  2 ++
 4 files changed, 19 insertions(+), 12 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 b2d633b..337f0fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>49</version>
+        <version>62</version>
         <relativePath />
     </parent>
 
@@ -37,6 +37,7 @@
     <!-- compile with java 8 -->
     <properties>
         <sling.java.version>8</sling.java.version>
+        <project.build.outputTimestamp>2025-02-26T00:00:00Z</project.build.outputTimestamp>
     </properties>
 
     <build>
@@ -48,7 +49,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-invoker-plugin</artifactId>
-                <version>3.2.1</version>
                 <configuration>
                     <debug>false</debug>
                     <projectsDirectory>src/it</projectsDirectory>
@@ -62,13 +62,6 @@
                     <!-- this causes verbose output, probably good to have for CI builds? -->
                     <streamLogs>true</streamLogs>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy</artifactId>
-                        <version>3.0.7</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>integration-test</id>
diff --git a/src/it/annotations-it/pom.xml b/src/it/annotations-it/pom.xml
index a26ad3f..b6e8d24 100644
--- a/src/it/annotations-it/pom.xml
+++ b/src/it/annotations-it/pom.xml
@@ -24,8 +24,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>34</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>62</version>
         <relativePath/>
     </parent>
 
@@ -50,7 +50,13 @@
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
-                <version>5.0.0</version>
+            </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -61,6 +67,7 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.adapter.annotations</artifactId>
             <version>${annotations.bundle.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/src/it/annotations-it/verify.groovy b/src/it/annotations-it/verify.groovy
index 845e851..06fd7aa 100644
--- a/src/it/annotations-it/verify.groovy
+++ b/src/it/annotations-it/verify.groovy
@@ -18,6 +18,8 @@
 // Verify the OSGI-INF xml files generated by the bnd plugin based
 // on our annotations
 
+import groovy.xml.XmlSlurper
+
 def INVALID_CONFIG = 'Configuration is invalid'
 
 // Utility functions


(sling-org-apache-sling-adapter-annotations) 02/02: SLING-12677 apply spotless formatting

Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations.git

commit 1553bfb75f0553f7ab7e1164e88af3f4ca068da0
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Feb 26 10:54:30 2025 +0100

    SLING-12677 apply spotless formatting
---
 pom.xml                                            | 69 +++++++++++-----------
 src/it/annotations-it/pom.xml                      | 47 +++++++--------
 .../adapters/AbstractNoOpAdapterFactory.java       | 26 ++++----
 .../testing/adapters/DeprecatedAdapterFactory.java | 28 +++++----
 .../IntegerAndShortToLongAdapterFactory.java       | 32 +++++-----
 .../adapters/InvalidEmptyAdapterFactory.java       | 33 ++++++-----
 .../InvalidNoAdaptablesAdapterFactory.java         | 33 ++++++-----
 .../adapters/InvalidNoAdaptersAdapterFactory.java  | 33 ++++++-----
 .../LongToIntegerIfFitsAdapterFactory.java         | 31 +++++-----
 .../ShortToIntegerAndLongAdapterFactory.java       | 33 ++++++-----
 .../adapters/TextLengthIfFitsAdapterFactory.java   | 33 ++++++-----
 .../adapter/annotations/AdapterCondition.java      | 26 ++++----
 .../adapter/annotations/AdapterDeprecated.java     | 29 ++++-----
 .../sling/adapter/annotations/SlingAdapter.java    | 26 ++++----
 14 files changed, 249 insertions(+), 230 deletions(-)

diff --git a/pom.xml b/pom.xml
index 337f0fc..1d3f5be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,15 +23,13 @@
     <version>2.0.1-SNAPSHOT</version>
 
     <name>Apache Sling Adapter Annotations</name>
-    <description>
-        OSGi DS 1.4 component property type annotations for Sling adapters
-    </description>
+    <description>OSGi DS 1.4 component property type annotations for Sling adapters</description>
 
     <scm>
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations.git</developerConnection>
-        <url>https://github.com/apache/sling-org-apache-sling-adapter-annotations.git</url>
         <tag>HEAD</tag>
+        <url>https://github.com/apache/sling-org-apache-sling-adapter-annotations.git</url>
     </scm>
 
     <!-- compile with java 8 -->
@@ -40,6 +38,38 @@
         <project.build.outputTimestamp>2025-02-26T00:00:00Z</project.build.outputTimestamp>
     </properties>
 
+    <dependencies>
+        <!-- all transitive dependencies should have scope "provided" to prevent classpath
+             pollution of referencing projects -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <version>1.4.0</version>
+            <!-- for annotation @ComponentPropertyType -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component</artifactId>
+            <version>1.4.0</version>
+            <!-- For link in Javadoc to default property types/annotations -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.api</artifactId>
+            <version>2.11.0</version>
+            <!-- For link in Javadoc to AdapterFactory- & AdapterManager-class -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation.bundle</artifactId>
+            <version>1.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -97,33 +127,4 @@
         </plugins>
     </build>
 
-    <dependencies>
-        <!-- all transitive dependencies should have scope "provided" to prevent classpath
-             pollution of referencing projects -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.service.component.annotations</artifactId>
-            <version>1.4.0</version><!-- for annotation @ComponentPropertyType -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.service.component</artifactId>
-            <version>1.4.0</version><!-- For link in Javadoc to default property types/annotations -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.api</artifactId>
-            <version>2.11.0</version><!-- For link in Javadoc to AdapterFactory- & AdapterManager-class -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.annotation.bundle</artifactId>
-            <version>1.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/src/it/annotations-it/pom.xml b/src/it/annotations-it/pom.xml
index b6e8d24..e30355e 100644
--- a/src/it/annotations-it/pom.xml
+++ b/src/it/annotations-it/pom.xml
@@ -17,25 +17,21 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
         <version>62</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.adapter.annotations.it</artifactId>
     <version>2.0.0</version>
 
     <name>Apache Sling Adapter Annotations IT</name>
-    <description>
-        Integration tests for OSGi DS 1.4 component property type annotations for Sling adapters
-    </description>
+    <description>Integration tests for OSGi DS 1.4 component property type annotations for Sling adapters</description>
 
     <properties>
         <sling.java.version>8</sling.java.version>
@@ -45,22 +41,6 @@
         <annotations.bundle.version>MUST_BE_SET_BY_INVOKER</annotations.bundle.version>
     </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>biz.aQute.bnd</groupId>
-                <artifactId>bnd-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>biz.aQute.bnd</groupId>
-                <artifactId>bnd-baseline-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <!-- The bundle under test -->
         <dependency>
@@ -73,7 +53,8 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component.annotations</artifactId>
-            <version>1.3.0</version><!-- to be compliant with DS 1.3 -->
+            <version>1.3.0</version>
+            <!-- to be compliant with DS 1.3 -->
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -95,4 +76,20 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/AbstractNoOpAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/AbstractNoOpAdapterFactory.java
index 9c82cdd..2fa752e 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/AbstractNoOpAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/AbstractNoOpAdapterFactory.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/DeprecatedAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/DeprecatedAdapterFactory.java
index 07dfec4..e658044 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/DeprecatedAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/DeprecatedAdapterFactory.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
@@ -30,6 +32,6 @@ public class DeprecatedAdapterFactory implements AdapterFactory {
     @Override
     @SuppressWarnings({"squid:S00119", "unchecked"})
     public <AdapterType> AdapterType getAdapter(final Object adaptable, final Class<AdapterType> type) {
-        return (AdapterType)((SlingHttpServletRequest)adaptable).getResource();
+        return (AdapterType) ((SlingHttpServletRequest) adaptable).getResource();
     }
 }
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/IntegerAndShortToLongAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/IntegerAndShortToLongAdapterFactory.java
index b848b53..95e76a3 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/IntegerAndShortToLongAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/IntegerAndShortToLongAdapterFactory.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
@@ -23,7 +25,5 @@ import org.osgi.service.component.annotations.Component;
 @Component(service = AdapterFactory.class)
 @SlingAdapter(
         adaptables = {Integer.class, Short.class},
-        adapters = Long.class
-)
-public class IntegerAndShortToLongAdapterFactory extends AbstractNoOpAdapterFactory {
-}
+        adapters = Long.class)
+public class IntegerAndShortToLongAdapterFactory extends AbstractNoOpAdapterFactory {}
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidEmptyAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidEmptyAdapterFactory.java
index 3135e71..154b646 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidEmptyAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidEmptyAdapterFactory.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
@@ -22,7 +24,8 @@ import org.apache.sling.api.adapter.AdapterFactory;
 import org.osgi.service.component.annotations.Component;
 
 @Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = {}, adapters = {})
+@SlingAdapter(
+        adaptables = {},
+        adapters = {})
 @AdapterCondition(AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
-public class InvalidEmptyAdapterFactory extends AbstractNoOpAdapterFactory {
-}
+public class InvalidEmptyAdapterFactory extends AbstractNoOpAdapterFactory {}
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptablesAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptablesAdapterFactory.java
index 0c98d90..875ae5f 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptablesAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptablesAdapterFactory.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
@@ -22,7 +24,8 @@ import org.apache.sling.api.adapter.AdapterFactory;
 import org.osgi.service.component.annotations.Component;
 
 @Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = {}, adapters = Void.class)
+@SlingAdapter(
+        adaptables = {},
+        adapters = Void.class)
 @AdapterCondition(AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
-public class InvalidNoAdaptablesAdapterFactory extends AbstractNoOpAdapterFactory {
-}
+public class InvalidNoAdaptablesAdapterFactory extends AbstractNoOpAdapterFactory {}
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptersAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptersAdapterFactory.java
index d7cb8ca..c88588e 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptersAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptersAdapterFactory.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
@@ -22,7 +24,8 @@ import org.apache.sling.api.adapter.AdapterFactory;
 import org.osgi.service.component.annotations.Component;
 
 @Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = Void.class, adapters = {})
+@SlingAdapter(
+        adaptables = Void.class,
+        adapters = {})
 @AdapterCondition(AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
-public class InvalidNoAdaptersAdapterFactory extends AbstractNoOpAdapterFactory {
-}
+public class InvalidNoAdaptersAdapterFactory extends AbstractNoOpAdapterFactory {}
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/LongToIntegerIfFitsAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/LongToIntegerIfFitsAdapterFactory.java
index f134243..f83ecf2 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/LongToIntegerIfFitsAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/LongToIntegerIfFitsAdapterFactory.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
@@ -22,10 +24,7 @@ import org.apache.sling.api.adapter.AdapterFactory;
 import org.osgi.service.component.annotations.Component;
 
 @Component(service = AdapterFactory.class)
-@SlingAdapter(
-        adaptables = Long.class,
-        adapters = Integer.class
-)
+@SlingAdapter(adaptables = Long.class, adapters = Integer.class)
 @AdapterCondition(LongToIntegerIfFitsAdapterFactory.CONDITION)
 public class LongToIntegerIfFitsAdapterFactory extends AbstractNoOpAdapterFactory {
     public static final String CONDITION = "If the value is small enough to fit in an integer.";
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/ShortToIntegerAndLongAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/ShortToIntegerAndLongAdapterFactory.java
index 74d77e1..9f43b77 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/ShortToIntegerAndLongAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/ShortToIntegerAndLongAdapterFactory.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
@@ -21,6 +23,7 @@ import org.apache.sling.api.adapter.AdapterFactory;
 import org.osgi.service.component.annotations.Component;
 
 @Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = Short.class, adapters = {Integer.class, Long.class})
-public class ShortToIntegerAndLongAdapterFactory extends AbstractNoOpAdapterFactory {
-}
+@SlingAdapter(
+        adaptables = Short.class,
+        adapters = {Integer.class, Long.class})
+public class ShortToIntegerAndLongAdapterFactory extends AbstractNoOpAdapterFactory {}
diff --git a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/TextLengthIfFitsAdapterFactory.java b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/TextLengthIfFitsAdapterFactory.java
index 0af1e61..cc7c8b1 100644
--- a/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/TextLengthIfFitsAdapterFactory.java
+++ b/src/it/annotations-it/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/TextLengthIfFitsAdapterFactory.java
@@ -1,33 +1,34 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations.testing.adapters;
 
+import java.math.BigInteger;
+
 import org.apache.sling.adapter.annotations.AdapterCondition;
 import org.apache.sling.adapter.annotations.SlingAdapter;
 import org.apache.sling.api.adapter.AdapterFactory;
 import org.osgi.service.component.annotations.Component;
 
-import java.math.BigInteger;
-
 @Component(service = AdapterFactory.class)
 @SlingAdapter(
         adaptables = {CharSequence.class, String.class},
-        adapters = {Short.class, Integer.class, Long.class, BigInteger.class}
-)
+        adapters = {Short.class, Integer.class, Long.class, BigInteger.class})
 @AdapterCondition(TextLengthIfFitsAdapterFactory.CONDITION)
 public class TextLengthIfFitsAdapterFactory extends AbstractNoOpAdapterFactory {
     public static final String CONDITION = "If the text length fits in the requested type.";
diff --git a/src/main/java/org/apache/sling/adapter/annotations/AdapterCondition.java b/src/main/java/org/apache/sling/adapter/annotations/AdapterCondition.java
index f3e261e..1270aae 100644
--- a/src/main/java/org/apache/sling/adapter/annotations/AdapterCondition.java
+++ b/src/main/java/org/apache/sling/adapter/annotations/AdapterCondition.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations;
 
diff --git a/src/main/java/org/apache/sling/adapter/annotations/AdapterDeprecated.java b/src/main/java/org/apache/sling/adapter/annotations/AdapterDeprecated.java
index b2c2992..b707ba6 100644
--- a/src/main/java/org/apache/sling/adapter/annotations/AdapterDeprecated.java
+++ b/src/main/java/org/apache/sling/adapter/annotations/AdapterDeprecated.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations;
 
@@ -31,5 +33,4 @@ import org.osgi.service.component.annotations.ComponentPropertyType;
  * of this adapter is deprecated and may not work anymore in the future.
  */
 @ComponentPropertyType
-public @interface AdapterDeprecated {
-}
+public @interface AdapterDeprecated {}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/SlingAdapter.java b/src/main/java/org/apache/sling/adapter/annotations/SlingAdapter.java
index b9ab53b..2ec95ce 100644
--- a/src/main/java/org/apache/sling/adapter/annotations/SlingAdapter.java
+++ b/src/main/java/org/apache/sling/adapter/annotations/SlingAdapter.java
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.adapter.annotations;