Skip to content

Commit 4c16ee0

Browse files
bvennersbvenners
committed
Merge branch 'isomarcte-updateVersions'
2 parents 482ae8b + c80fddd commit 4c16ee0

File tree

2 files changed

+45
-65
lines changed

2 files changed

+45
-65
lines changed

‎pom.xml

Lines changed: 42 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,21 @@
1717

1818
<properties>
1919
<scala.major.version>2.11</scala.major.version>
20-
<scala.minor.version>8</scala.minor.version>
20+
<scala.minor.version>7</scala.minor.version>
2121
<scala.version>${scala.major.version}.${scala.minor.version}</scala.version>
2222
<scalatest.version>2.2.6</scalatest.version>
23-
<maven.scala.plugin.version>2.14.1</maven.scala.plugin.version>
2423
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2524
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2625
<build.timestamp>${maven.build.timestamp}</build.timestamp>
2726
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
2827
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
2928
<maven.project.info.reports.plugin.version>2.9</maven.project.info.reports.plugin.version>
29+
<maven.plugin.api.version>3.3.9</maven.plugin.api.version>
30+
<maven.core.version>3.3.9</maven.core.version>
31+
<junit.version>4.12</junit.version>
32+
<maven.reporting.api.version>3.0</maven.reporting.api.version>
33+
<scala.maven.plugin.version>3.2.2</scala.maven.plugin.version>
34+
<maven.enforcer.plugin.version>1.4.1</maven.enforcer.plugin.version>
3035
</properties>
3136

3237
<licenses>
@@ -71,27 +76,17 @@
7176
<dependency>
7277
<groupId>org.apache.maven</groupId>
7378
<artifactId>maven-plugin-api</artifactId>
74-
<version>2.0.9</version>
79+
<version>${maven.plugin.api.version}</version>
7580
</dependency>
7681
<dependency>
7782
<groupId>org.apache.maven</groupId>
78-
<artifactId>maven-project</artifactId>
79-
<version>2.0.9</version>
83+
<artifactId>maven-core</artifactId>
84+
<version>${maven.core.version}</version>
8085
</dependency>
8186
<dependency>
8287
<groupId>org.apache.maven.reporting</groupId>
8388
<artifactId>maven-reporting-api</artifactId>
84-
<version>2.0.9</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.apache.maven.doxia</groupId>
88-
<artifactId>doxia-sink-api</artifactId>
89-
<version>1.0</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>org.codehaus.plexus</groupId>
93-
<artifactId>plexus-utils</artifactId>
94-
<version>3.0</version>
89+
<version>${maven.reporting.api.version}</version>
9590
</dependency>
9691
<dependency>
9792
<groupId>org.scalatest</groupId>
@@ -108,7 +103,7 @@
108103
<dependency>
109104
<groupId>junit</groupId>
110105
<artifactId>junit</artifactId>
111-
<version>4.8.1</version>
106+
<version>${junit.version}</version>
112107
<scope>test</scope>
113108
</dependency>
114109
</dependencies>
@@ -128,19 +123,22 @@
128123

129124
<plugins>
130125
<plugin>
131-
<groupId>org.scala-tools</groupId>
132-
<artifactId>maven-scala-plugin</artifactId>
133-
<version>${maven.scala.plugin.version}</version>
126+
<groupId>net.alchim31.maven</groupId>
127+
<artifactId>scala-maven-plugin</artifactId>
128+
<version>${scala.maven.plugin.version}</version>
129+
<configuration>
130+
<recompileMode>incremental</recompileMode>
131+
<scalaVersion>${scala.version}</scalaVersion>
132+
</configuration>
134133
<executions>
135134
<execution>
135+
<id>scala-test-compile</id>
136+
<phase>test-compile</phase>
136137
<goals>
137138
<goal>testCompile</goal>
138139
</goals>
139140
</execution>
140141
</executions>
141-
<configuration>
142-
<scalaVersion>${scala.version}</scalaVersion>
143-
</configuration>
144142
</plugin>
145143
<plugin>
146144
<artifactId>maven-compiler-plugin</artifactId>
@@ -182,11 +180,6 @@
182180
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
183181
<streamLogs>true</streamLogs>
184182
<settingsFile>src/it/settings.xml</settingsFile>
185-
<properties>
186-
<scala.version>${scala.version}</scala.version>
187-
<scalatest.version>${scalatest.version}</scalatest.version>
188-
<maven.scala.plugin.version>${maven.scala.plugin.version}</maven.scala.plugin.version>
189-
</properties>
190183
<goals>
191184
<goal>clean</goal>
192185
<goal>test</goal>
@@ -209,6 +202,27 @@
209202
</execution>
210203
</executions>
211204
</plugin>
205+
<plugin>
206+
<groupId>org.apache.maven.plugins</groupId>
207+
<artifactId>maven-enforcer-plugin</artifactId>
208+
<version>${maven.enforcer.plugin.version}</version>
209+
<executions>
210+
<execution>
211+
<id>enforce-maven</id>
212+
<goals>
213+
<goal>enforce</goal>
214+
</goals>
215+
<configuration>
216+
<rules>
217+
<requireMavenVersion>
218+
<!-- We get this from scala-maven-plugin -->
219+
<version>[3.0.4,)</version>
220+
</requireMavenVersion>
221+
</rules>
222+
</configuration>
223+
</execution>
224+
</executions>
225+
</plugin>
212226
</plugins>
213227
</build>
214228

@@ -266,27 +280,4 @@
266280
</plugin>
267281
</plugins>
268282
</reporting>
269-
270-
<profiles>
271-
<profile>
272-
<id>maven-3</id>
273-
<activation>
274-
<file>
275-
<!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-4760) -->
276-
<exists>${basedir}</exists>
277-
</file>
278-
</activation>
279-
<build>
280-
<pluginManagement>
281-
<plugins>
282-
<plugin>
283-
<groupId>org.apache.maven.plugins</groupId>
284-
<artifactId>maven-site-plugin</artifactId>
285-
<version>3.5.1</version>
286-
</plugin>
287-
</plugins>
288-
</pluginManagement>
289-
</build>
290-
</profile>
291-
</profiles>
292283
</project>

‎src/it/lift/pom.xml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,9 @@
7272
<testSourceDirectory>src/test/scala</testSourceDirectory>
7373
<plugins>
7474
<plugin>
75-
<groupId>org.scala-tools</groupId>
76-
<artifactId>maven-scala-plugin</artifactId>
77-
<version>@maven.scala.plugin.version@</version>
78-
<executions>
79-
<execution>
80-
<goals>
81-
<goal>compile</goal>
82-
<goal>testCompile</goal>
83-
</goals>
84-
</execution>
85-
</executions>
86-
<configuration>
87-
<scalaVersion>@scala.version@</scalaVersion>
88-
</configuration>
75+
<groupId>net.alchim31.maven</groupId>
76+
<artifactId>scala-maven-plugin</artifactId>
77+
<version>@scala.maven.plugin.version@</version>
8978
</plugin>
9079
<plugin>
9180
<groupId>org.mortbay.jetty</groupId>

0 commit comments

Comments
 (0)