Skip to content

Remove jOOQ codegen workaround #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ferdinand-swoboda wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove jOOQ codegen workaround #198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 1 addition & 59 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,6 @@
<goal>testCompile</goal>
</goals>
<phase>test-compile</phase>
<configuration>
<compilerArgs>
<!-- XXX: We disable `html` checks to work
around a jOOQ codegen issue; file a PR for
that. -->
<arg>-Xdoclint:-html</arg>
</compilerArgs>
</configuration>
</execution>
</executions>
</plugin>
Expand Down Expand Up @@ -435,14 +427,6 @@
<configuration>
<source>${version.jdk}</source>
<doclint>all,-missing</doclint>
<!-- XXX: The `jooq-codegen-maven` plugin
unconditionally registers the directory in which it
generates code as a (main) compile source root. But in
this project the generated code is actually _test_
code, so we must take care to exclude it during the
Javadoc generation process. Flag this issue with jOOQ
to get it resolved. -->
<sourcepath>${project.basedir}/src/main/java:${project.build.directory}/generated-sources/annotations</sourcepath>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -473,20 +457,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<!-- XXX: The `jooq-codegen-maven` plugin
unconditionally registers the directory in which it
generates code as a (main) compile source root. But in
this project the generated code is actually _test_
code, so we must take care not to package it as if it
were our primary source code. We do so using a
whitelist, because it appears that the
`maven-source-plugin` does not support _exclusion_ of
selected files. -->
<includes>
<include>**/folo/*.java</include>
</includes>
</configuration>
<executions>
<execution>
<id>generate-source-jar</id>
Expand All @@ -513,12 +483,7 @@
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>org.codehaus.mojo</groupId>c
<artifactId>license-maven-plugin</artifactId>
<version>2.3.0</version>
</plugin>
Expand Down Expand Up @@ -607,29 +572,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<!-- XXX: We require this plugin execution only because there
is no way to tell the `jooq-codegen-maven` that it generates
_test_ code. File an issue with jOOQ to discuss improving this.
(See also the `maven-javadoc-plugin` and `maven-source-plugin`
plugin customizations above.) -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-test-sources</id>
<goals>
<goal>add-test-source</goal>
</goals>
<phase>generate-test-sources</phase>
<configuration>
<sources>
<source>${project.build.directory}/generated-test-sources/jooq</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
Expand Down
Loading