Skip to content

Commit

Permalink
chore: update versions in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@slandelle
slandelle committed Apr 23, 2024
1 parent 0460fb4 commit bf702f0
Show file tree
Hide file tree
Showing 22 changed files with 632 additions and 639 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -135,7 +135,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
<last.scala2_12.release>2.12.18</last.scala2_12.release>
<last.scala2_13.release>2.13.11</last.scala2_13.release>
<last.scala2_13.release>2.13.13</last.scala2_13.release>
</properties>

<prerequisites>
Expand Down
4 changes: 2 additions & 2 deletions samples/prj_multi_modules/pom.xml
View file
Expand Up @@ -13,7 +13,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.12.10</version>
<version>2.13.13</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand All @@ -24,7 +24,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.3.0</version>
<version>4.9.0</version>
<executions>
<execution>
<goals>
Expand Down
141 changes: 70 additions & 71 deletions src/it/includesExcludes/pom.xml
View file
@@ -1,78 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<groupId>it.scala-maven-plugin</groupId>
<artifactId>includesExcludes</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test compilation using excludes/includes</name>
<description>Test compilation pulls version from dependency</description>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version.lastrelease}</version>
</dependency>
</dependencies>
<build>
<plugins>
<groupId>it.scala-maven-plugin</groupId>
<artifactId>includesExcludes</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test compilation using excludes/includes</name>
<description>Test compilation pulls version from dependency</description>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version.lastrelease}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<includes>
<include>**/*.scala</include>
<include>**/TestClass.java</include>
</includes>
<excludes>
<exclude>bad.scala</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<includes>
<include>**/*.scala</include>
<include>**/TestClass.java</include>
</includes>
<excludes>
<exclude>bad.scala</exclude>
</excludes>
</configuration>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<configuration>
<includes>
<include>**/*.scala</include>
<include>**/TestClass.java</include>
</includes>
<excludes>
<exclude>bad.scala</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<configuration>
<includes>
<include>**/*.scala</include>
<include>**/TestClass.java</include>
</includes>
<excludes>
<exclude>bad.scala</exclude>
</excludes>
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

</reportPlugins>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
116 changes: 58 additions & 58 deletions src/it/mismatchedScalaVersions/pom.xml
View file
@@ -1,71 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>it.scala-maven-plugin</groupId>
<artifactId>mismatchedScalaVersions</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test for Mismatched Scala versions and error message output!</name>
<description>Test for Java + Scala compilation</description>
<groupId>it.scala-maven-plugin</groupId>
<artifactId>mismatchedScalaVersions</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test for Mismatched Scala versions and error message output!</name>
<description>Test for Java + Scala compilation</description>

<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.7.1</version>
</dependency>
<dependency>
<artifactId>lift-util</artifactId>
<groupId>net.liftweb</groupId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java</artifactId>
<version>0.9.3</version>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.13.13</version>
</dependency>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-util_2.13</artifactId>
<version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java</artifactId>
<version>0.9.3</version>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<fork>false</fork>
<failOnMultipleScalaVersions>false</failOnMultipleScalaVersions>
</configuration>
</plugin>
</plugins>
</build>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
<fork>false</fork>
<failOnMultipleScalaVersions>false</failOnMultipleScalaVersions>
</configuration>
</plugin>
</plugins>
</build>

</project>
6 changes: 3 additions & 3 deletions src/it/multilanguage-kotlinscala/pom.xml
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>it.scala-maven-plugin</groupId>
Expand All @@ -23,9 +23,9 @@

<plugins>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>1.2.50</version>
<artifactId>kotlin-maven-plugin</artifactId>
<version>1.9.23</version>
<executions>
<execution>
<id>compile</id>
Expand Down
5 changes: 2 additions & 3 deletions src/it/test-incremental-compile/pom.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>it.scala-maven-plugin</groupId>
Expand Down Expand Up @@ -64,13 +64,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

</project>

0 comments on commit bf702f0

Please sign in to comment.