Skip to content

Commit 0c53d33

Browse files
committed
Introduce package-info.java in module zookeeper for maven-bundle-plugin
1 parent e690829 commit 0c53d33

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

zookeeper/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,14 @@
117117

118118
<build>
119119
<plugins>
120+
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
122+
<artifactId>maven-javadoc-plugin</artifactId>
123+
<configuration>
124+
<skip>true</skip>
125+
</configuration>
126+
</plugin>
127+
120128
<plugin>
121129
<groupId>org.apache.maven.plugins</groupId>
122130
<artifactId>maven-dependency-plugin</artifactId>

zookeeper/src/main/java/org/apache/zookeeper/osgi/Osgi.java renamed to zookeeper/src/main/java/org/apache/zookeeper/package-info.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.zookeeper.osgi;
20-
2119
/**
22-
* <b>DON'T USE THIS.</b>
20+
* Module to bundle `zookeeper-client`, `zookeeper-server` and others together.
21+
*
22+
* <p>This module exists for two purposes:
23+
* <ol>
24+
* <li>keep compatibility with old zookeeper artifact</li>
25+
* <li>build osgi bundle jar</li>
26+
* </ol>
27+
*
28+
* <p><b>DON'T DELETE THIS FILE.</b>
2329
*
2430
* <p>`maven-bundle-plugin` does not include classes if there is no source code. I have no idea why.
2531
*
@@ -30,8 +36,6 @@
3036
* <p>We have to include above classes to this bundle without bring other classes from `zookeeper-jute`.
3137
* `Embed-Dependency` can't handle this as we can not embed `zookeeper-jute` while jar of `zookeeper-server`
3238
* does not contain those classes. So we have to resort to exclude/include from `Export-Package` as before.
33-
* But, it does not work if there is no source code, so we have this file for OSGI bundle, and it has to be
34-
* public otherwise `maven-javadoc-plugin` complains.
39+
* But, it does not work if there is no source code, so we have this file for OSGI bundle.
3540
*/
36-
public class Osgi {
37-
}
41+
package org.apache.zookeeper;

0 commit comments

Comments
 (0)