Skip to content

Commit 24027f9

Browse files
zantvoortzantvoort
committed
Finalize release.
Relates to #45
1 parent dbc539d commit 24027f9

7 files changed

Lines changed: 123 additions & 35 deletions

File tree

‎pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,17 @@
162162
</execution>
163163
</executions>
164164
</plugin>
165-
<!-- <plugin>-->
166-
<!-- <groupId>org.sonatype.central</groupId>-->
167-
<!-- <artifactId>central-publishing-maven-plugin</artifactId>-->
168-
<!-- <version>0.7.0</version>-->
169-
<!-- <extensions>true</extensions>-->
170-
<!-- <configuration>-->
171-
<!-- <publishingServerId>central</publishingServerId>-->
172-
<!-- <autoPublish>true</autoPublish>-->
173-
<!-- <waitUntil>uploaded</waitUntil>-->
174-
<!-- </configuration>-->
175-
<!-- </plugin>-->
165+
<plugin>
166+
<groupId>org.sonatype.central</groupId>
167+
<artifactId>central-publishing-maven-plugin</artifactId>
168+
<version>0.7.0</version>
169+
<extensions>true</extensions>
170+
<configuration>
171+
<publishingServerId>central</publishingServerId>
172+
<autoPublish>true</autoPublish>
173+
<waitUntil>uploaded</waitUntil>
174+
</configuration>
175+
</plugin>
176176
</plugins>
177177
</build>
178178
</project>

‎storm-core/src/main/java/st/orm/core/template/Model.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ default void forEachValue(@Nonnull E record, @Nonnull BiConsumer<Column, Object>
126126
* Extracts column values from the given record and feeds them to a consumer in model column order,
127127
* limited to columns accepted by {@code columnFilter}.
128128
*
129-
* <p>See {@link #forEachValue(E, BiConsumer)} for details about ordering and the produced value types.
129+
* <p>See {@link #forEachValue(Data, BiConsumer)} for details about ordering and the produced value types.
130130
* In short: the produced values are JDBC-ready and already converted (refs and foreign keys unpacked to ids,
131131
* Java time converted to JDBC time types).</p>
132132
*
@@ -147,7 +147,7 @@ void forEachValue(
147147
*
148148
* <p>The returned map preserves iteration order. Its iteration order matches the model's stable column order.</p>
149149
*
150-
* <p>Values are the same JDBC-ready values as produced by {@link #forEachValue(E, BiConsumer)}.</p>
150+
* <p>Values are the same JDBC-ready values as produced by {@link #forEachValue(Data, BiConsumer)}.</p>
151151
*
152152
* @param record the record (entity or projection instance) to extract values from.
153153
* @param filter predicate that decides whether a column should be included.

‎storm-core/src/main/java/st/orm/core/template/impl/ModelImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public boolean isDefaultPrimaryKey(@Nullable ID pk) {
157157
* Extracts column values from the given record and feeds them to a consumer in model column order,
158158
* limited to columns accepted by {@code columnFilter}.
159159
*
160-
* <p>See {@link #forEachValue(E, BiConsumer)} for details about ordering and the produced value types.
160+
* <p>See {@link #forEachValue(Data, BiConsumer)} for details about ordering and the produced value types.
161161
* In short: the produced values are JDBC-ready and already converted (refs and foreign keys unpacked to ids,
162162
* Java time converted to JDBC time types).</p>
163163
*

‎storm-java21/src/main/java/st/orm/template/Model.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ default void forEachValue(@Nonnull E record, @Nonnull BiConsumer<Column, Object>
110110
* Extracts column values from the given record and feeds them to a consumer in model column order,
111111
* limited to columns accepted by {@code columnFilter}.
112112
*
113-
* <p>See {@link #forEachValue(E, BiConsumer)} for details about ordering and the produced value types.
113+
* <p>See {@link #forEachValue(Data, BiConsumer)} for details about ordering and the produced value types.
114114
* In short: the produced values are JDBC-ready and already converted (refs and foreign keys unpacked to ids,
115115
* Java time converted to JDBC time types).</p>
116116
*
@@ -127,8 +127,8 @@ default void forEachValue(@Nonnull E record, @Nonnull BiConsumer<Column, Object>
127127
*
128128
* <p>The returned map preserves iteration order. Its iteration order matches the model's stable column order.</p>
129129
*
130-
* <p>Values are the same JDBC-ready values as produced by {@link #forEachValue(E, BiConsumer)}.</p>
131-
*
130+
* <p>Values are the same JDBC-ready values as produced by {@link #forEachValue(Data, BiConsumer)}.</p>
131+
*o
132132
* @param record the record (entity or projection instance) to extract values from.
133133
* @param filter predicate that decides whether a column should be included.
134134
* @return a {@link Map} containing columns and their extracted (JDBC-ready) values in the order of the model.

‎storm-java21/src/main/java/st/orm/template/impl/ModelImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void forEachValue(@Nonnull E record, @Nonnull Predicate<Column> filter, @
122122
*
123123
* <p>The returned map preserves iteration order. Its iteration order matches the model's stable column order.</p>
124124
*
125-
* <p>Values are the same JDBC-ready values as produced by {@link #forEachValue(E, BiConsumer)}.</p>
125+
* <p>Values are the same JDBC-ready values as produced by {@link #forEachValue(Data, BiConsumer)}.</p>
126126
*
127127
* @param record the record (entity or projection instance) to extract values from.
128128
* @param filter predicate that decides whether a column should be included.

‎storm-kotlinx-serialization/pom.xml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,63 @@
105105
</dependency>
106106
</dependencies>
107107
</plugin>
108+
<plugin>
109+
<groupId>org.codehaus.mojo</groupId>
110+
<artifactId>build-helper-maven-plugin</artifactId>
111+
<version>3.6.0</version>
112+
<executions>
113+
<execution>
114+
<id>add-kotlin-main</id>
115+
<phase>generate-sources</phase>
116+
<goals><goal>add-source</goal></goals>
117+
<configuration>
118+
<sources>
119+
<source>src/main/kotlin</source>
120+
</sources>
121+
</configuration>
122+
</execution>
123+
<execution>
124+
<id>add-kotlin-test</id>
125+
<phase>generate-test-sources</phase>
126+
<goals><goal>add-test-source</goal></goals>
127+
<configuration>
128+
<sources>
129+
<source>src/test/kotlin</source>
130+
</sources>
131+
</configuration>
132+
</execution>
133+
</executions>
134+
</plugin>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-source-plugin</artifactId>
138+
<version>3.3.1</version>
139+
<executions>
140+
<execution>
141+
<id>attach-sources</id>
142+
<goals><goal>jar</goal></goals>
143+
</execution>
144+
</executions>
145+
</plugin>
146+
<plugin>
147+
<groupId>org.apache.maven.plugins</groupId>
148+
<artifactId>maven-javadoc-plugin</artifactId>
149+
<version>3.6.3</version>
150+
<configuration>
151+
<skip>true</skip>
152+
</configuration>
153+
</plugin>
154+
<plugin>
155+
<groupId>org.jetbrains.dokka</groupId>
156+
<artifactId>dokka-maven-plugin</artifactId>
157+
<version>2.0.0</version>
158+
<executions>
159+
<execution>
160+
<phase>prepare-package</phase>
161+
<goals><goal>javadocJar</goal></goals>
162+
</execution>
163+
</executions>
164+
</plugin>
108165
</plugins>
109166
</build>
110167
<dependencies>

‎storm-metamodel-ksp/pom.xml‎

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,32 +100,63 @@
100100
</archive>
101101
</configuration>
102102
</plugin>
103+
<plugin>
104+
<groupId>org.codehaus.mojo</groupId>
105+
<artifactId>build-helper-maven-plugin</artifactId>
106+
<version>3.6.0</version>
107+
<executions>
108+
<execution>
109+
<id>add-kotlin-main</id>
110+
<phase>generate-sources</phase>
111+
<goals><goal>add-source</goal></goals>
112+
<configuration>
113+
<sources>
114+
<source>src/main/kotlin</source>
115+
</sources>
116+
</configuration>
117+
</execution>
118+
<execution>
119+
<id>add-kotlin-test</id>
120+
<phase>generate-test-sources</phase>
121+
<goals><goal>add-test-source</goal></goals>
122+
<configuration>
123+
<sources>
124+
<source>src/test/kotlin</source>
125+
</sources>
126+
</configuration>
127+
</execution>
128+
</executions>
129+
</plugin>
103130
<plugin>
104131
<groupId>org.apache.maven.plugins</groupId>
105132
<artifactId>maven-source-plugin</artifactId>
106-
<version>3.3.0</version>
133+
<version>3.3.1</version>
107134
<executions>
108135
<execution>
109136
<id>attach-sources</id>
110-
<goals>
111-
<goal>jar</goal>
112-
</goals>
137+
<goals><goal>jar</goal></goals>
138+
</execution>
139+
</executions>
140+
</plugin>
141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-javadoc-plugin</artifactId>
144+
<version>3.6.3</version>
145+
<configuration>
146+
<skip>true</skip>
147+
</configuration>
148+
</plugin>
149+
<plugin>
150+
<groupId>org.jetbrains.dokka</groupId>
151+
<artifactId>dokka-maven-plugin</artifactId>
152+
<version>2.0.0</version>
153+
<executions>
154+
<execution>
155+
<phase>prepare-package</phase>
156+
<goals><goal>javadocJar</goal></goals>
113157
</execution>
114158
</executions>
115159
</plugin>
116-
<!-- <plugin>-->
117-
<!-- <groupId>org.jetbrains.dokka</groupId>-->
118-
<!-- <artifactId>dokka-maven-plugin</artifactId>-->
119-
<!-- <version>${kotlin.version}</version>-->
120-
<!-- <executions>-->
121-
<!-- <execution>-->
122-
<!-- <phase>package</phase>-->
123-
<!-- <goals>-->
124-
<!-- <goal>javadocJar</goal>-->
125-
<!-- </goals>-->
126-
<!-- </execution>-->
127-
<!-- </executions>-->
128-
<!-- </plugin>-->
129160
</plugins>
130161
</build>
131162
<dependencies>

0 commit comments

Comments
 (0)