Skip to content

Commit

Permalink
Merge pull request #75 from yuu-nkjm/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
yuu-nkjm authored Jul 4, 2023
2 parents 793240a + d9a616c commit 1a21ed9
Show file tree
Hide file tree
Showing 9 changed files with 586 additions and 477 deletions.
6 changes: 0 additions & 6 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Sorm4j sets Java objects into parameters of an SQL statement and executes the SQ

Sorm4j uses an object it simply wraps a `java.sql.Connection` object for object-relation mapping. Sorm4j has no runtime dependencies. It means this tool can be integrated with any code that depends on JDBC (including code that already uses another ORM tool).

Sorm4j requires Java 11 (or above) to run and build.
Sorm4j requires Java 17 (or above) after version 2.0.0 (Sorm4j version 1.4.16).


## Quickstart
Expand All @@ -21,7 +21,7 @@ The latest release is available at [Maven Central Repository](https://mvnreposit
<dependency>
<groupId>org.nkjmlab</groupId>
<artifactId>sorm4j</artifactId>
<version>1.4.15</version>
<version>2.0.0</version>
</dependency>
```
We assume the following customer table in example: `create table customer (id int primary key, name varchar, address varchar)`
Expand All @@ -36,7 +36,7 @@ public class Customer {
}
```

If you use after Java 16, you could also use Record class. For example:
You could also use Record class. For example:

```java
@OrmRecord
Expand Down
149 changes: 0 additions & 149 deletions pom.xml

This file was deleted.

6 changes: 3 additions & 3 deletions sorm4j-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.nkjmlab</groupId>
<artifactId>sorm4j-example</artifactId>
<version>1.4.16</version>
<version>2.0.0</version>
<description>Example of Sorm4j</description>

<properties>
<sorm4j-version>1.4.16</sorm4j-version>
<sorm4j-version>2.0.0</sorm4j-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<additionalparam>-Xdoclint:none</additionalparam>
<downloadSources>true</downloadSources>
Expand Down Expand Up @@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.11.0</version>
<configuration>
<release>17</release>
<encoding>UTF-8</encoding>
Expand Down
8 changes: 4 additions & 4 deletions sorm4j-jmh/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.nkjmlab</groupId>
<artifactId>sorm4j-jmh</artifactId>
<version>1.4.13</version>
<version>2.0.0</version>
<packaging>jar</packaging>
<name>Sorm4j benchmark</name>

<properties>
<sorm4j-version>1.4.16</sorm4j-version>
<sorm4j-version>2.0.0</sorm4j-version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- JMH version to use with this project. -->
<jmh.version>1.27</jmh.version>

<!-- Java source/target to use for compilation. -->
<javac.target>11</javac.target>
<javac.target>17</javac.target>

<!-- Name of the benchmark Uber-JAR to generate. -->
<uberjar.name>benchmarks</uberjar.name>
Expand Down Expand Up @@ -118,7 +118,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.17.0</version>
<configuration>
<compilerVersion>${javac.target}</compilerVersion>
<source>${javac.target}</source>
Expand Down
Loading

0 comments on commit 1a21ed9

Please sign in to comment.