Skip to content

Commit 861aff6

Browse files
committed
Merge branch 'dependabot/maven/net.alchim31.maven-scala-maven-plugin-4.8.1'
2 parents e0b1ed8 + 62fec4e commit 861aff6

File tree

2 files changed

+6
-40
lines changed

2 files changed

+6
-40
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<jmh.version>1.37</jmh.version>
172172
<kotlin.version>1.9.22</kotlin.version>
173173
<dokka.version>1.9.10</dokka.version>
174-
<scala.full.version>2.11.12</scala.full.version>
174+
<scala.version>2.11.12</scala.version>
175175

176176
<!-- Import-Package definitions for maven-bundle-plugin -->
177177
<osgi.import.package.root>*</osgi.import.package.root>

querydsl-scala/pom.xml

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency>
2222
<groupId>org.scala-lang</groupId>
2323
<artifactId>scala-library</artifactId>
24-
<version>${scala.full.version}</version>
24+
<version>${scala.version}</version>
2525
</dependency>
2626
</dependencies>
2727
</dependencyManagement>
@@ -40,13 +40,13 @@
4040
<dependency>
4141
<groupId>org.scala-lang</groupId>
4242
<artifactId>scala-library</artifactId>
43-
<version>${scala.full.version}</version>
43+
<version>${scala.version}</version>
4444
<scope>provided</scope>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.scala-lang</groupId>
4848
<artifactId>scala-compiler</artifactId>
49-
<version>${scala.full.version}</version>
49+
<version>${scala.version}</version>
5050
<scope>test</scope>
5151
</dependency>
5252

@@ -153,10 +153,10 @@
153153
<plugin>
154154
<groupId>net.alchim31.maven</groupId>
155155
<artifactId>scala-maven-plugin</artifactId>
156-
<version>3.4.6</version>
156+
<version>4.8.1</version>
157157
<configuration>
158158
<charset>${character.encoding}</charset>
159-
<scalaVersion>${scala.full.version}</scalaVersion>
159+
<scalaVersion>${scala.version}</scalaVersion>
160160
<args>
161161
<arg>-encoding</arg>
162162
<arg>${character.encoding}</arg>
@@ -173,13 +173,6 @@
173173
<!-- <recompileMode>incremental</recompileMode> -->
174174
<!-- <useZincServer>true</useZincServer> -->
175175
</configuration>
176-
<dependencies>
177-
<dependency>
178-
<groupId>org.scala-lang</groupId>
179-
<artifactId>scala-compiler</artifactId>
180-
<version>${scala.full.version}</version>
181-
</dependency>
182-
</dependencies>
183176
<executions>
184177
<execution>
185178
<id>scala-compile</id>
@@ -197,33 +190,6 @@
197190
</execution>
198191
</executions>
199192
</plugin>
200-
<!--
201-
<plugin>
202-
<groupId>io.github.openfeign.querydsl</groupId>
203-
<artifactId>querydsl-maven-plugin</artifactId>
204-
<version>${project.version}</version>
205-
<configuration>
206-
<testClasspath>true</testClasspath>
207-
<targetFolder>target/genericExporter</targetFolder>
208-
<scala>true</scala>
209-
<packages>
210-
<package>com.querydsl.scala</package>
211-
</packages>
212-
</configuration>
213-
<dependencies>
214-
<dependency>
215-
<groupId>io.github.openfeign.querydsl</groupId>
216-
<artifactId>querydsl-scala</artifactId>
217-
<version>${project.version}</version>
218-
</dependency>
219-
<dependency>
220-
<groupId>org.scala-lang</groupId>
221-
<artifactId>scala-library</artifactId>
222-
<version>${scala.full.version}</version>
223-
</dependency>
224-
</dependencies>
225-
</plugin>
226-
-->
227193
<plugin>
228194
<groupId>org.apache.maven.plugins</groupId>
229195
<artifactId>maven-surefire-plugin</artifactId>

0 commit comments

Comments
 (0)