kwin commented on code in PR #2:
URL:
https://github.com/apache/sling-org-apache-sling-jcr-registration/pull/2#discussion_r905763021
##########
pom.xml:
##########
@@ -38,53 +37,41 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-jcr-registration.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Category>
- sling,jcr
- </Bundle-Category>
- <Import-Package>
- javax.transaction.xa;resolution:=optional,
- *
- </Import-Package>
- <DynamicImport-Package>
- *
- </DynamicImport-Package>
- <Embed-Dependency>
-
jackrabbit-core;inline=org/apache/jackrabbit/core/jndi/provider/*.class
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <tag>HEAD</tag>
+ </scm>
<dependencies>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.5.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <version>1.5.0</version>
Review Comment:
This is OSGi Compendium R8, please stick to DS 1.4 (R7), that version is
also managed in parent
##########
pom.xml:
##########
@@ -38,53 +37,41 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-jcr-registration.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Category>
- sling,jcr
- </Bundle-Category>
- <Import-Package>
- javax.transaction.xa;resolution:=optional,
- *
- </Import-Package>
- <DynamicImport-Package>
- *
- </DynamicImport-Package>
- <Embed-Dependency>
-
jackrabbit-core;inline=org/apache/jackrabbit/core/jndi/provider/*.class
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <tag>HEAD</tag>
+ </scm>
<dependencies>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>2.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.5.0</version>
Review Comment:
Isn't Log Service 1.4 sufficient (OSGi R7,
http://docs.osgi.org/specification/osgi.cmpn/7.0.0/service.log.html)?
##########
src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java:
##########
@@ -65,6 +63,8 @@
}
)
@Designate(ocd = RmiRegistrationSupport.Configuration.class)
+@ServiceVendor("The Apache Software Foundation")
Review Comment:
see above, please remove
##########
src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java:
##########
@@ -53,20 +55,17 @@
@Component(
configurationPolicy = ConfigurationPolicy.REQUIRE,
name =
"org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport",
- property = {
- "service.vendor=The Apache Software Foundation",
- "service.description=JNDI Repository Registration"
- },
reference = {
@Reference(name = "Repository", policy =
ReferencePolicy.DYNAMIC,
- bind = "bindRepository", unbind = "unbindRepository",
cardinality = ReferenceCardinality.MULTIPLE, service =
Repository.class),
@Reference(name = "Log", policy = ReferencePolicy.DYNAMIC,
bind = "bindLog", unbind = "unbindLog",
cardinality = ReferenceCardinality.OPTIONAL, service =
LogService.class),
}
)
@Designate(ocd = JndiRegistrationSupport.Configuration.class)
+@ServiceVendor("The Apache Software Foundation")
Review Comment:
We agreed that this is superfluous as the bundle vendor is already set
(which implicitly applies to all contained services)
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
