Skip to content

Commit ba267fc

Browse files
committed
Try to fix javadoc issue
1 parent 129895b commit ba267fc

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes
2929

3030
# Setup JDK and Maven
31-
- name: Set up JDK 9
31+
- name: Set up JDK 8
3232
uses: actions/setup-java@v1
3333
with:
34-
java-version: 9
34+
java-version: 1.8
3535
server-id: sonatype-nexus-staging
3636
server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
3737
server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central

example/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,6 @@
9393
</configuration>
9494
</plugin>
9595

96-
<plugin>
97-
<groupId>org.apache.felix</groupId>
98-
<artifactId>maven-bundle-plugin</artifactId>
99-
<extensions>true</extensions>
100-
<configuration>
101-
<instructions>
102-
<Export-Package>io.toolisticon.example.spiapexample</Export-Package>
103-
</instructions>
104-
</configuration>
105-
</plugin>
106-
107-
10896
<plugin>
10997
<groupId>org.jacoco</groupId>
11098
<artifactId>jacoco-maven-plugin</artifactId>

example/service/src/main/java/io/toolisticon/example/spiapexample/service/DivisionDecimalOperationImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/**
88
* Implements the division decimal operation.
9-
* <p/>
9+
*
1010
* It's ok not to set the id. The full qualified class name will be used as fallback value for id.
1111
*/
1212
@Service(DecimalCalculationOperation.class)

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<maven-processor-plugin.version>2.2.4</maven-processor-plugin.version>
102102
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
103103

104-
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
104+
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
105105

106106

107107
</properties>
@@ -203,6 +203,7 @@
203203
<source>${java.compile.source.version}</source>
204204
<target>${java.compile.target.version}</target>
205205
</configuration>
206+
<version>${maven-compiler-plugin.version}</version>
206207
</plugin>
207208

208209
<plugin>

processor/pom.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
</goals>
5757

5858

59-
6059
<configuration>
6160

6261
<!-- remove shaded dependenies from pom.xml -->
@@ -91,6 +90,19 @@
9190
</executions>
9291
</plugin>
9392

93+
<!-- needed to fix build due to generated classes in api -->
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-javadoc-plugin</artifactId>
97+
<version>${maven-javadoc-plugin.version}</version>
98+
<configuration>
99+
<show>private</show>
100+
<sourcepath>
101+
${project.basedir}/target/generated-sources/annotations;${project.basedir}/src/main/java
102+
</sourcepath>
103+
</configuration>
104+
</plugin>
105+
94106
<plugin>
95107
<artifactId>maven-compiler-plugin</artifactId>
96108
<configuration combine.self="append">

0 commit comments

Comments
 (0)