Skip to content

Commit

Permalink
Merge pull request #182 from trydofor/develop
Browse files Browse the repository at this point in the history 
💚 delombok and javadoc #181
  • Loading branch information
@trydofor
trydofor authored Jan 14, 2024
2 parents 7169a23 + 7a0e018 commit 9597018
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
if: inputs.testCoverReport
run: >
mvn
-P ci
-P test
--quiet
-Duser.timezone=Asia/Shanghai
-Dtesting-json='{
Expand All @@ -121,7 +121,7 @@ jobs:
- name: Maven Deploy
run: >
mvn
-P ossrh,-example
-P ossrh,doc,-example
${{ steps.opt-revision.outputs.OPT_REVISION }}
-Dgpg.passphrase=${MVN_GPG_PASS}
clean deploy
Expand Down
2 changes: 1 addition & 1 deletion observe/docs
Submodule docs updated 2 files
+1 −1 src/9-example/README.md
+1 −1 src/zh/9-example/README.md
125 changes: 101 additions & 24 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,20 @@
<nexus-staging-plugin.version>1.6.13</nexus-staging-plugin.version> <!-- https://github.com/sonatype/nexus-maven-plugins/tree/main/staging/maven-plugin -->
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version> <!-- https://github.com/hazendaz/coveralls-maven-plugin -->
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version> <!-- https://www.jacoco.org/jacoco/trunk/doc/maven.html -->
<testing-json>{}</testing-json>
<dokka-maven-plugin.version>1.9.10</dokka-maven-plugin.version> <!-- https://kotlinlang.org/docs/dokka-maven.html#general-configuration -->
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version> <!-- https://github.com/awhitford/lombok.maven -->
<!-- java, kotlin sources -->
<source.srcMainJava>${project.basedir}/src/main/java</source.srcMainJava>
<source.srcMainKotlin>${project.basedir}/src/main/kotlin</source.srcMainKotlin>
<source.srcTestJava>${project.basedir}/src/test/java</source.srcTestJava>
<source.srcTestKotlin>${project.basedir}/src/test/kotlin</source.srcTestKotlin>
<!-- delombok: javadoc cannot find symbol -->
<source.srcMainDelombok>${project.build.directory}/delombok-main</source.srcMainDelombok>
<!-- test,doc,deploy -->
<testing-json>{}</testing-json> <!-- springboot surefire config -->
<argLine/> <!-- surefire:argLine -->
<surefireArgLine/> <!-- jacoco-agent:argLine -->
<wings.java-opens>
<javaopenArgLine>
--add-modules=java.se <!-- Hazelcast -->
--add-opens=java.base/java.io=ALL-UNNAMED <!-- FastJson -->
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED <!-- FastJson2 -->
Expand All @@ -89,7 +99,7 @@
--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED <!-- Boot -->
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED <!-- Hazelcast -->
--add-opens=jdk.unsupported/sun.misc=ALL-UNNAMED <!-- Boot -->
</wings.java-opens>
</javaopenArgLine>
</properties>

<licenses>
Expand Down Expand Up @@ -449,6 +459,12 @@
<version>${sentry.version}</version>
</dependency>
<!-- dev -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
Expand Down Expand Up @@ -516,7 +532,7 @@
<systemPropertyVariables>
<SPRING_APPLICATION_JSON>${testing-json}</SPRING_APPLICATION_JSON>
</systemPropertyVariables>
<argLine>-Xmx2g @{wings.java-opens} @{argLine} @{surefireArgLine}</argLine>
<argLine>-Xmx2g @{argLine} @{javaopenArgLine} @{surefireArgLine}</argLine>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -594,19 +610,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
Expand Down Expand Up @@ -665,8 +668,8 @@
</goals>
<configuration>
<sources>
<source>${project.basedir}/src/main/kotlin</source>
<source>${project.basedir}/src/main/java</source>
<source>${source.srcMainKotlin}</source>
<source>${source.srcMainJava}</source>
</sources>
</configuration>
</execution>
Expand Down Expand Up @@ -722,6 +725,19 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>${dokka-maven-plugin.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- build info -->
<plugin>
<groupId>io.github.git-commit-id</groupId>
Expand Down Expand Up @@ -801,8 +817,8 @@
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/test/java</sourceDir>
<sourceDir>${source.srcTestKotlin}</sourceDir>
<sourceDir>${source.srcTestJava}</sourceDir>
</sourceDirs>
</configuration>
</execution>
Expand Down Expand Up @@ -860,8 +876,8 @@
</goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/main/java</sourceDir>
<sourceDir>${source.srcMainKotlin}</sourceDir>
<sourceDir>${source.srcMainJava}</sourceDir>
</sourceDirs>
</configuration>
</execution>
Expand Down Expand Up @@ -890,7 +906,7 @@
</profile>
<profile>
<!-- -DrepoToken=${{ secrets.COVERALLS_REPO_TOKEN }} -->
<id>ci</id>
<id>test</id>
<properties>
<maven.test.skip>false</maven.test.skip>
<surefire.timeout>0</surefire.timeout> <!-- going to kill self fork JVM -->
Expand Down Expand Up @@ -930,6 +946,67 @@
</plugins>
</build>
</profile>
<profile>
<id>doc</id>
<build>
<plugins>
<plugin>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-maven-plugin</artifactId>
<version>${lombok-maven-plugin.version}</version>
<configuration>
<addOutputDirectory>false</addOutputDirectory>
<sourceDirectory>${source.srcMainJava}</sourceDirectory>
<outputDirectory>${source.srcMainDelombok}</outputDirectory>
</configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>delombok</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
</dependencies>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<sourcepath>${source.srcMainDelombok}</sourcepath>
<doclint>none</doclint>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<configuration>
<sourceDirectories>
<dir>${source.srcMainDelombok}</dir>
<dir>${source.srcMainKotlin}</dir>
</sourceDirectories>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>ossrh</id>
<properties>
Expand Down
6 changes: 0 additions & 6 deletions radiant/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
Expand Down Expand Up @@ -94,10 +92,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down
6 changes: 0 additions & 6 deletions wings/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
Expand Down Expand Up @@ -114,10 +112,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down

0 comments on commit 9597018

Please sign in to comment.