Simplify scala project pom file

OpenFeign · Jan 25, 2024 · 62fec4e · 62fec4e
1 parent 80dae62
commit 62fec4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 39 deletions.
diff --git a/pom.xml b/pom.xml
@@ -171,7 +171,7 @@
     <jmh.version>1.37</jmh.version>
     <kotlin.version>1.9.22</kotlin.version>
     <dokka.version>1.9.10</dokka.version>
-    <scala.full.version>2.11.12</scala.full.version>
+    <scala.version>2.11.12</scala.version>
 
     <!-- Import-Package definitions for maven-bundle-plugin -->
     <osgi.import.package.root>*</osgi.import.package.root>

diff --git a/querydsl-scala/pom.xml b/querydsl-scala/pom.xml
@@ -21,7 +21,7 @@
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>${scala.full.version}</version>
+        <version>${scala.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -40,13 +40,13 @@
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
-      <version>${scala.full.version}</version>
+      <version>${scala.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-compiler</artifactId>
-      <version>${scala.full.version}</version>
+      <version>${scala.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -156,7 +156,7 @@
         <version>4.8.1</version>
         <configuration>
           <charset>${character.encoding}</charset>
-          <scalaVersion>${scala.full.version}</scalaVersion>
+          <scalaVersion>${scala.version}</scalaVersion>
           <args>
             <arg>-encoding</arg>
             <arg>${character.encoding}</arg>
@@ -173,13 +173,6 @@
           <!-- <recompileMode>incremental</recompileMode> -->
           <!-- <useZincServer>true</useZincServer> -->
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-compiler</artifactId>
-            <version>${scala.full.version}</version>
-          </dependency>
-        </dependencies>
         <executions>
           <execution>
             <id>scala-compile</id>
@@ -197,33 +190,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--
-              <plugin>
-                <groupId>io.github.openfeign.querydsl</groupId>
-                <artifactId>querydsl-maven-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                  <testClasspath>true</testClasspath>
-                  <targetFolder>target/genericExporter</targetFolder>
-                  <scala>true</scala>
-                  <packages>
-                    <package>com.querydsl.scala</package>
-                  </packages>
-                </configuration>
-                <dependencies>
-                  <dependency>
-                    <groupId>io.github.openfeign.querydsl</groupId>
-                    <artifactId>querydsl-scala</artifactId>
-                    <version>${project.version}</version>
-                  </dependency>
-                  <dependency>
-                    <groupId>org.scala-lang</groupId>
-                    <artifactId>scala-library</artifactId>
-                    <version>${scala.full.version}</version>
-                  </dependency>
-                </dependencies>
-              </plugin>
-            -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>