You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sling.apache.org by GitBox <gi...@apache.org> on 2020/05/18 07:44:57 UTC
[GitHub] [sling-org-apache-sling-superimposing] rombert commented on a change in pull request #1: API Upgrade
rombert commented on a change in pull request #1:
URL: https://github.com/apache/sling-org-apache-sling-superimposing/pull/1#discussion_r426424912
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <jdkLevel>1.8</jdkLevel>
+ <linkModules>true</linkModules>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Eclipse Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Clean Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- Maven Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.3.8</version>
+ </plugin>
+ <!-- BND Maven Plugin -->
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.1</version>
Review comment:
Please remove the version, it's managed in the parent pom. You should upgrade to the latest parent pom while at it ( org.apache.sling:sling-bundle-parent )
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <jdkLevel>1.8</jdkLevel>
+ <linkModules>true</linkModules>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Eclipse Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Clean Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- Maven Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.3.8</version>
+ </plugin>
+ <!-- BND Maven Plugin -->
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+ Export-Package: org.apache.sling.superimposing
+ Private-Package: org.apache.sling.superimposing.impl
+ DynamicImport-Package: org.apache.felix.webconsole
+ Sling-Nodetypes: SLING-INF/nodetypes/superimposing.cnd
+ </bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>5.0.1</version>
Review comment:
Please remove this version
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <jdkLevel>1.8</jdkLevel>
+ <linkModules>true</linkModules>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Eclipse Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Clean Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- Maven Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.3.8</version>
+ </plugin>
+ <!-- BND Maven Plugin -->
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <executions>
+ <execution>
Review comment:
This execution should come from the parent pom.
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <jdkLevel>1.8</jdkLevel>
+ <linkModules>true</linkModules>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Eclipse Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Clean Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- Maven Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.3.8</version>
+ </plugin>
+ <!-- BND Maven Plugin -->
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+ Export-Package: org.apache.sling.superimposing
Review comment:
We prefer bnd.bnd files instead of pom configurations
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <jdkLevel>1.8</jdkLevel>
+ <linkModules>true</linkModules>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Eclipse Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Clean Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- Maven Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.3.8</version>
+ </plugin>
+ <!-- BND Maven Plugin -->
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+ Export-Package: org.apache.sling.superimposing
+ Private-Package: org.apache.sling.superimposing.impl
+ DynamicImport-Package: org.apache.felix.webconsole
+ Sling-Nodetypes: SLING-INF/nodetypes/superimposing.cnd
+ </bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <configuration>
+ <failOnMissing>false</failOnMissing>
+ </configuration>
+ <executions>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Maven Resources Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.2</version>
+ </plugin>
+ <!-- Maven Jar Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.1.2</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
</plugin>
-
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.2.0</version>
+ <version>2.18.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.1.0</version>
+ <version>2.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings</artifactId>
- <version>1.0.0</version>
+ <version>1.3.8</version>
<scope>provided</scope>
</dependency>
-
+ <dependency>
Review comment:
Please check the indentation, it seems off compared to the rest of the pom.
##########
File path: src/main/java/org/apache/sling/superimposing/SuperimposingManager.java
##########
@@ -38,6 +54,6 @@
* Iterator is backed by a {@link java.util.concurrent.ConcurrentHashMap} and is safe to access
* even if superimposing resource providers are registered or unregistered at the same time.
*/
- Iterator<SuperimposingResourceProvider> getRegisteredProviders();
+ Iterator<SuperimposingResourceProviderImpl> getRegisteredProviders();
Review comment:
This seems incorrect - why are you now returning an implementation type from an interface? Didn't baselining complain?
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
Review comment:
You should not need the idea, eclipse and clean plugins declared here.
##########
File path: pom.xml
##########
@@ -25,8 +25,7 @@
</parent>
<artifactId>org.apache.sling.superimposing</artifactId>
- <version>0.2.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>1.0.0</version>
Review comment:
Please revert the version change, we change to non snapshots only when releasing
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
Review comment:
Set the `sling.java.version` pom property, you don't need to set this.
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
Review comment:
If you set the `sling.java.version` property you won't need this.
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <jdkLevel>1.8</jdkLevel>
+ <linkModules>true</linkModules>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Eclipse Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Clean Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- Maven Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.3.8</version>
+ </plugin>
+ <!-- BND Maven Plugin -->
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+ Export-Package: org.apache.sling.superimposing
+ Private-Package: org.apache.sling.superimposing.impl
+ DynamicImport-Package: org.apache.felix.webconsole
+ Sling-Nodetypes: SLING-INF/nodetypes/superimposing.cnd
+ </bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <configuration>
+ <failOnMissing>false</failOnMissing>
+ </configuration>
+ <executions>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Maven Resources Plugin -->
+ <plugin>
Review comment:
Please remove this plugin declaration
##########
File path: src/main/java/org/apache/sling/superimposing/SuperimposingManager.java
##########
@@ -21,12 +21,28 @@
import java.util.Iterator;
import org.apache.sling.superimposing.impl.SuperimposingResourceProviderImpl;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
/**
* Manages the resource registrations for the {@link SuperimposingResourceProviderImpl}.
* Provides read-only access to all registered providers.
*/
public interface SuperimposingManager {
+
+ String OBSERVATION_PATHS_PROPERTY = "observationPaths";
Review comment:
Please check the indentation.
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <jdkLevel>1.8</jdkLevel>
+ <linkModules>true</linkModules>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Eclipse Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Clean Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- Maven Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.3.8</version>
+ </plugin>
+ <!-- BND Maven Plugin -->
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+ Export-Package: org.apache.sling.superimposing
+ Private-Package: org.apache.sling.superimposing.impl
+ DynamicImport-Package: org.apache.felix.webconsole
+ Sling-Nodetypes: SLING-INF/nodetypes/superimposing.cnd
+ </bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <configuration>
+ <failOnMissing>false</failOnMissing>
+ </configuration>
+ <executions>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Maven Resources Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.2</version>
+ </plugin>
+ <!-- Maven Jar Plugin -->
+ <plugin>
Review comment:
Please remove this plugin declaration, it will be inherited from the parent pom.
##########
File path: pom.xml
##########
@@ -43,77 +42,203 @@
<build>
<plugins>
-
+ <!-- Maven Enforcer Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.5.4,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <message>Project must be compiled with Java 8 or higher</message>
+ <version>1.8.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
+ <!-- Maven Compiler Plugin -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>org.apache.sling.superimposing</Export-Package>
- <Private-Package>org.apache.sling.superimposing.impl</Private-Package>
- <DynamicImport-Package>org.apache.felix.webconsole</DynamicImport-Package>
- <Sling-Nodetypes>SLING-INF/nodetypes/superimposing.cnd</Sling-Nodetypes>
- </instructions>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
-
+ <!-- Maven IntelliJ IDEA Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <jdkLevel>1.8</jdkLevel>
+ <linkModules>true</linkModules>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Eclipse Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <!-- Maven Clean Plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <!-- Maven Sling Plugin -->
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
+ <version>2.3.8</version>
+ </plugin>
+ <!-- BND Maven Plugin -->
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+ Export-Package: org.apache.sling.superimposing
+ Private-Package: org.apache.sling.superimposing.impl
+ DynamicImport-Package: org.apache.felix.webconsole
+ Sling-Nodetypes: SLING-INF/nodetypes/superimposing.cnd
+ </bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>5.0.1</version>
+ <configuration>
+ <failOnMissing>false</failOnMissing>
+ </configuration>
+ <executions>
Review comment:
Please remove this execution, it should already be defined in the parent pom.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org