Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for implemented/extended provider types #3325

Merged
merged 1 commit into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)

## Unreleased ([details][unreleased changes details])

6.6.0 - 2024-04-15
## Added

- #3323 - Add Provider Type Checker Plugin

## 6.6.0 - 2024-04-15

## Added

Expand Down
1 change: 1 addition & 0 deletions bundle/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ Import-Package: \
!org.bouncycastle.jce.*,\
!org.checkerframework.checker.nullness.qual,\
*
-classpath: $(basedir)/target/aem-sdk-api-info/
27 changes: 27 additions & 0 deletions bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,33 @@
<build>

<plugins>
<!-- extract only api-info.json from aem-sdk-api for provider type checks -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>extract-api-info-json-from-aem-sdk</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.adobe.aem</groupId>
<artifactId>aem-sdk-api</artifactId>
<version>${aem.sdk.api.version}</version>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/aem-sdk-api-info</outputDirectory>
</artifactItem>
</artifactItems>
<includes>META-INF/api-info.json</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
Expand Down
9 changes: 8 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<!-- the minimum AEM 6.5 version being supported -->
<aem.classic.api.version>6.5.10.0002</aem.classic.api.version>
<!-- the minimum AEMaaCS version being supported -->
<aem.sdk.api.version>2023.1.10675.20230113T110236Z-220900</aem.sdk.api.version>
<aem.sdk.api.version>2023.11.14227.20231108T162349Z-231100</aem.sdk.api.version>

<jacoco.version>0.8.11</jacoco.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version> <!-- >= 5.x requires Java 11 -->
Expand Down Expand Up @@ -247,6 +247,7 @@ Bundle-DocURL: https://adobe-consulting-services.github.io/acs-aem-commons/
# support processing of legacy Felix SCR annotations through the felix.scr.bnd plugin, look at https://github.com/apache/felix/blob/trunk/tools/org.apache.felix.scr.bnd/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java#L60
# paths require special handling: https://bnd.bndtools.org/chapters/820-instructions.html#file
-plugin.felixscr: org.apache.felix.scrplugin.bnd.SCRDescriptorBndPlugin;destdir="$(basedir)/target/classes";log=error
-plugin.providertype:org.apache.sling.providertype.bndplugin.ProviderTypeScanner
# support only DS 1.4 (https://github.com/bndtools/bnd/pull/3121/files)
-dsannotations-options: version;maximum=1.4.0,inherit
-metatypeannotations-options: version;maximum=1.4.0
Expand Down Expand Up @@ -276,6 +277,12 @@ Service-Component: OSGI-INF/*.xml
<artifactId>org.apache.felix.scr.bnd</artifactId>
<version>1.9.6</version>
</dependency>
<!-- enforce that provider types are not implemented/extended, https://github.com/apache/sling-org-apache-sling-providertype-bnd-plugin -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.providertype.bnd-plugin</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
Expand Down
Loading