Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jOOQ/jOOX
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: version-2.0.1
Choose a base ref
...
head repository: jOOQ/jOOX
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 7 commits
  • 3 files changed
  • 2 contributors

Commits on May 7, 2024

  1. Update build

    @lukaseder
    lukaseder committed May 7, 2024
    Copy the full SHA
    c87953a View commit details

Commits on Jul 1, 2024

  1. Update README.md to version 2.0.1

    @lukaseder
    lukaseder authored Jul 1, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c0d9d4e View commit details

Commits on Aug 1, 2024

  1. Avoid deprecated maven variables

    @lukaseder
    lukaseder committed Aug 1, 2024
    Copy the full SHA
    cb0facc View commit details

Commits on Oct 3, 2024

  1. Bump commons-io:commons-io from 2.8.0 to 2.14.0 in /jOOX 

    Bumps commons-io:commons-io from 2.8.0 to 2.14.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Oct 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0accdb1 View commit details

  2. Bump commons-io:commons-io from 2.8.0 to 2.14.0 in /jOOX-java-8 

    Bumps commons-io:commons-io from 2.8.0 to 2.14.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Oct 3, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9ed2bf View commit details

Commits on Oct 4, 2024

  1. Merge pull request #192 from jOOQ/dependabot/maven/jOOX/commons-io-co… 

    …mmons-io-2.14.0

Bump commons-io:commons-io from 2.8.0 to 2.14.0 in /jOOX
    @lukaseder
    lukaseder authored Oct 4, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e819016 View commit details

  2. Merge pull request #193 from jOOQ/dependabot/maven/jOOX-java-8/common… 

    …s-io-commons-io-2.14.0

Bump commons-io:commons-io from 2.8.0 to 2.14.0 in /jOOX-java-8
    @lukaseder
    lukaseder authored Oct 4, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cd9621c View commit details
Showing with 14 additions and 20 deletions.
  1. +2 −12 README.md
  2. +5 −3 jOOX-java-8/pom.xml
  3. +7 −5 jOOX/pom.xml
14 changes: 2 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.jooq</groupId>
<artifactId>joox</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
</dependency>
```

@@ -32,17 +32,7 @@
<dependency>
<groupId>org.jooq</groupId>
<artifactId>joox-java-8</artifactId>
<version>2.0.0</version>
</dependency>
```

**For use with Java 6+**

```xml
<dependency>
<groupId>org.jooq</groupId>
<artifactId>joox-java-6</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
</dependency>
```

8 changes: 5 additions & 3 deletions jOOX-java-8/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
<configuration>
<fork>true</fork>
<maxmem>512m</maxmem>
@@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>3.6.3</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -129,6 +129,8 @@
<encoding>UTF-8</encoding>
<show>protected</show>
<notree>true</notree>
<!-- Explicit configuration of javadoc language to avoid defaulting to build system's configuration -->
<locale>en</locale>

<!-- Avoid running into Java 8's very restrictive doclint issues -->
<additionalparam>-Xdoclint:none</additionalparam>
@@ -312,7 +314,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.14.0</version>
<scope>test</scope>
</dependency>
<dependency>
12 changes: 7 additions & 5 deletions jOOX/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
<configuration>
<fork>true</fork>
<maxmem>512m</maxmem>
@@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>3.6.3</version>
<inherited>true</inherited>
<executions>
<execution>
@@ -129,6 +129,8 @@
<encoding>UTF-8</encoding>
<show>protected</show>
<notree>true</notree>
<!-- Explicit configuration of javadoc language to avoid defaulting to build system's configuration -->
<locale>en</locale>

<!-- Avoid running into Java 8's very restrictive doclint issues -->
<additionalparam>-Xdoclint:none</additionalparam>
@@ -242,8 +244,8 @@
</goals>
<configuration>
<target>
<delete file="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
<zip basedir="${project.build.directory}/apidocs" destfile="${project.build.directory}/${artifactId}-${version}-javadoc.jar"/>
<delete file="${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar"/>
<zip basedir="${project.build.directory}/apidocs" destfile="${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar"/>
</target>
</configuration>
</execution>
@@ -312,7 +314,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.14.0</version>
<scope>test</scope>
</dependency>
<dependency>