Skip to content

Commit c0e4e54

Browse files
authored
Update the kotlin-maven-plugin for tests and use EA maven profile (#3671)
* Update the kotlin-maven-plugin for tests * Add a profile for EA that excludes kotlin-querybean-generator * For build workflow use maven profile "default" To ensure the kotlin-querybean-generator, test modules run * For build workflow use maven profile "default" To ensure the kotlin-querybean-generator, test modules run
1 parent 92f3245 commit c0e4e54

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ jobs:
4040
# - name: Maven single test
4141
# run: mvn --batch-mode clean verify -Dtest="io.ebeaninternal.server.core.DefaultServer_getReferenceTest" -DfailIfNoTests=false
4242
- name: Build with Maven
43-
run: mvn -T 8 clean test
43+
run: mvn -T 8 clean test -Pdefault
4444

.github/workflows/jdk-ea.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ jobs:
3737
- name: Maven version
3838
run: mvn --version
3939
- name: Build with Maven
40-
run: mvn -T 8 test
40+
run: mvn test -Pea
4141

kotlin-querybean-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<plugin>
8484
<groupId>org.jetbrains.kotlin</groupId>
8585
<artifactId>kotlin-maven-plugin</artifactId>
86-
<version>${kotlin.version}</version>
86+
<version>2.2.10</version>
8787
<executions>
8888
<execution>
8989
<id>test-compile</id>

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,18 @@
9696
<module>composites</module>
9797
<module>ebean-jackson-mapper</module>
9898
<module>ebean-spring-txn</module>
99-
<module>kotlin-querybean-generator</module>
10099
<module>ebean-core-json</module>
101100
</modules>
102101

103102
<profiles>
103+
<profile>
104+
<id>ea</id>
105+
</profile>
104106
<profile>
105107
<id>central</id>
108+
<modules>
109+
<module>kotlin-querybean-generator</module>
110+
</modules>
106111
</profile>
107112
<profile>
108113
<id>h2v1</id>
@@ -125,6 +130,7 @@
125130
<activeByDefault>true</activeByDefault>
126131
</activation>
127132
<modules>
133+
<module>kotlin-querybean-generator</module>
128134
<module>tests</module>
129135
</modules>
130136
</profile>

tests/test-kotlin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<plugin>
7474
<groupId>org.jetbrains.kotlin</groupId>
7575
<artifactId>kotlin-maven-plugin</artifactId>
76-
<version>${kotlin.version}</version>
76+
<version>2.2.10</version>
7777
<configuration>
7878
<jvmTarget>${maven.compiler.target}</jvmTarget>
7979
</configuration>

0 commit comments

Comments
 (0)