Skip to content

Commit a52c2c1

Browse files
stefanseifertstefanseifert
committed
switch to bnd-maven-plugin, suppress javadoc errors
1 parent c9db169 commit a52c2c1

3 files changed

Lines changed: 74 additions & 27 deletions

File tree

‎pom.xml‎

Lines changed: 63 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<groupId>com.damnhandy</groupId>
1414
<artifactId>handy-uri-templates</artifactId>
1515
<version>2.1.9-SNAPSHOT</version>
16-
<packaging>bundle</packaging>
17-
<name>Handy URI Templates</name>
1816

17+
<name>Handy URI Templates</name>
1918
<description>
2019
Handy URI Templates is a RFC6570 compliant URI template processor. The library allows clients to
2120
utilize templatized URIs and inject replacement variables to expand the template into a URI. The library sports
@@ -24,6 +23,7 @@
2423

2524
<properties>
2625
<java.version>11</java.version>
26+
<bnd.version>7.2.3</bnd.version>
2727
<jackson.version>2.11.0</jackson.version>
2828
</properties>
2929

@@ -72,29 +72,67 @@
7272
<build>
7373
<plugins>
7474
<plugin>
75-
<groupId>org.apache.felix</groupId>
76-
<artifactId>maven-bundle-plugin</artifactId>
77-
<version>5.1.9</version>
78-
<extensions>true</extensions>
75+
<groupId>biz.aQute.bnd</groupId>
76+
<artifactId>bnd-maven-plugin</artifactId>
77+
<version>${bnd.version}</version>
78+
<configuration>
79+
<bnd>
80+
<!-- Do not set Bundle-Developers -->
81+
Bundle-Developers:
82+
<!-- Export all versioned packages by default -->
83+
-exportcontents: ${packages;VERSIONED}
84+
<!-- Use "SNAPSHOT" suffix for snapshot bundle versions -->
85+
-snapshot: SNAPSHOT
86+
<!-- Remove Private-Package header as it may contain lists of all SLING-INF folders -->
87+
-removeheaders: Private-Package
88+
<!-- reproducible builds (https://github.com/bndtools/bnd/issues/3521) -->
89+
-noextraheaders: true
90+
<!-- Do not create imports for java.* as this leads to failed builds with AEM cloud service -->
91+
-noimportjava: true
92+
</bnd>
93+
</configuration>
7994
<executions>
80-
<!-- Configure extra execution of 'manifest' in process-classes phase to make sure SCR metadata is generated before unit test runs -->
8195
<execution>
82-
<id>scr-metadata</id>
96+
<id>bnd-process</id>
8397
<goals>
84-
<goal>manifest</goal>
98+
<goal>bnd-process</goal>
8599
</goals>
86-
<configuration>
87-
<supportIncrementalBuild>true</supportIncrementalBuild>
88-
</configuration>
89100
</execution>
90101
</executions>
102+
</plugin>
103+
104+
<!-- TODO: enabled baseline plugin after first release -->
105+
<!--
106+
<plugin>
107+
<groupId>biz.aQute.bnd</groupId>
108+
<artifactId>bnd-baseline-maven-plugin</artifactId>
109+
<version>${bnd.version}</version>
110+
<configuration>
111+
<includeDistributionManagement>false</includeDistributionManagement>
112+
<fullReport>true</fullReport>
113+
</configuration>
114+
<executions>
115+
<execution>
116+
<id>bnd-baseline</id>
117+
<goals>
118+
<goal>baseline</goal>
119+
</goals>
120+
</execution>
121+
</executions>
122+
</plugin>
123+
-->
124+
125+
<!-- suppress javadoc warnings/errors -->
126+
<plugin>
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-javadoc-plugin</artifactId>
91129
<configuration>
92-
<instructions>
93-
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
94-
<Bundle-Name>${project.artifactId}</Bundle-Name>
95-
</instructions>
130+
<doclint>none</doclint>
131+
<failOnError>false</failOnError>
96132
</configuration>
97133
</plugin>
134+
135+
<!-- Match different test naming conventions -->
98136
<plugin>
99137
<groupId>org.apache.maven.plugins</groupId>
100138
<artifactId>maven-surefire-plugin</artifactId>
@@ -106,6 +144,7 @@
106144
</includes>
107145
</configuration>
108146
</plugin>
147+
109148
</plugins>
110149
</build>
111150

@@ -166,6 +205,14 @@
166205
<scope>compile</scope>
167206
</dependency>
168207

208+
<!-- OSGi Versioning -->
209+
<dependency>
210+
<groupId>org.osgi</groupId>
211+
<artifactId>org.osgi.annotation.versioning</artifactId>
212+
<version>1.1.2</version>
213+
<scope>provided</scope>
214+
</dependency>
215+
169216
</dependencies>
170217

171218
</project>

‎src/main/java/com/damnhandy/uri/template/jackson/datatype/package-info.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,31 @@
33
* <p>
44
* These classes allow the {@link com.damnhandy.uri.template.UriTemplate } class to
55
* better integrate with the Jackson JSON framework. This will enable JSON properties
6-
* to map directly to a {@link com.damnhandy.uri.template.UriTemplate }. This can be
6+
* to map directly to a {@link com.damnhandy.uri.template.UriTemplate }. This can be
77
* done by one of two ways:
88
* </p>
99
* <p>Via Object Mapper:</p>
1010
* <pre>
1111
* ObjectMapper mapper = new ObjectMapper();
1212
* mapper.registerModule(new UriTemplateModule());
1313
* </pre>
14-
*
14+
*
1515
* <p>Or via annotations on the desired property:</p>
16-
*
16+
*
1717
* <pre>
1818
* {@literal @}JsonDeserialize(using = UriTemplateDeserializer.class)
1919
* {@literal @}JsonSerialize(using = UriTemplateSerializer.class)
2020
* private UriTemplate template;
2121
* ...
2222
* </pre>
23-
*
23+
*
2424
* <p>
2525
* Both options will yield the same results, but the module registration is far more convenient.
2626
* </p>
27-
*
28-
*
27+
*
28+
*
2929
* @author <a href="ryan@damnhandy.com">Ryan J. McDonough</a>
3030
* @version $Revision: 1.1 $
3131
*/
32-
package com.damnhandy.uri.template.jackson.datatype;
33-
34-
32+
@org.osgi.annotation.versioning.Version("2.1.8")
33+
package com.damnhandy.uri.template.jackson.datatype;

‎src/main/java/com/damnhandy/uri/template/package-info.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
/**
22
* <h1>Handy URI Templates</h1>
3-
*
3+
*
44
* <p>
55
* This package contains the core classes for manipulating and processing different types
6-
* of URI Templates. At present, it is only supports <a href="http://tools.ietf.org/html/rfc6570">RFC6570 URI Templates</a>.
6+
* of URI Templates. At present, it is only supports <a href="http://tools.ietf.org/html/rfc6570">RFC6570 URI Templates</a>.
77
* </p>
88
* @since 1.0.0
99
* @author <a href="mailto:ryan@damnhandy.com">Ryan J. McDonough</a>
1010
*/
11+
@org.osgi.annotation.versioning.Version("2.1.8")
1112
package com.damnhandy.uri.template;

0 commit comments

Comments
 (0)