Skip to content

Commit

Permalink
[#8857] Spring Boot example should reference custom jOOQ
Browse files Browse the repository at this point in the history
version
  • Loading branch information
knutwannheden committed Jun 26, 2019
1 parent 3eba94c commit 501dc03
Showing 1 changed file with 21 additions and 8 deletions.
29 changes: 21 additions & 8 deletions jOOQ-examples/jOOQ-spring-boot-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.1.6.RELEASE</version>
</parent>

<groupId>org.jooq</groupId>
Expand Down Expand Up @@ -34,6 +34,25 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jooq</artifactId>

<!-- Exclude the default jOOQ dependency if
1. You want a more or less recent jOOQ dependency
2. You want to depend on a commercial jOOQ distribution
-->
<exclusions>
<exclusion>
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Keep this explicit dependency only if you excluded jOOQ above -->
<dependency>
<groupId>org.jooq</groupId>
<artifactId>jooq</artifactId>
<version>${jooq.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -121,6 +140,7 @@
<plugin>
<groupId>org.jooq</groupId>
<artifactId>jooq-codegen-maven</artifactId>
<version>${jooq.version}</version>

<executions>
<execution>
Expand Down Expand Up @@ -157,13 +177,6 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down

3 comments on commit 501dc03

@lukaseder
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, did I miss anything? c5a3ef1

@knutwannheden
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I accidentally reverted your change as part of another commit.

@lukaseder
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see

Please sign in to comment.