Skip to content

Commit 346aa0d

Browse files
jjaderbergjjaderberg
authored
Merge pull request #358 from jjaderberg/helloscala212
Update Scala to 2.12 and refactor POM
2 parents 772f8ca + 726df70 commit 346aa0d

File tree

12 files changed

+315
-202
lines changed

12 files changed

+315
-202
lines changed

‎pom.xml‎

Lines changed: 278 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,30 @@
2727
</modules>
2828

2929
<properties>
30-
<project.rootdir>${project.basedir}</project.rootdir>
30+
<dep.antlr.generator.version>4.5.3</dep.antlr.generator.version>
31+
<dep.antlr.runtime.version>4.7</dep.antlr.runtime.version>
32+
<dep.apiguardian.version>1.0.0</dep.apiguardian.version>
33+
<dep.batik.version>1.8</dep.batik.version>
34+
<dep.cucumber.version>4.2.0</dep.cucumber.version>
35+
<dep.gherkin.version>5.0.0</dep.gherkin.version>
36+
<dep.hamcrest.version>1.3</dep.hamcrest.version>
37+
<dep.junit.platform.version>1.4.0</dep.junit.platform.version>
38+
<dep.junit.version>5.4.0</dep.junit.version>
39+
<dep.maven.compiler.plugin.version>3.5</dep.maven.compiler.plugin.version>
40+
<dep.maven.javadoc.plugin.version>3.0.0</dep.maven.javadoc.plugin.version>
41+
<dep.maven.source.plugin.version>3.0.0</dep.maven.source.plugin.version>
42+
<dep.maven.surefire.plugin.version>2.22.1</dep.maven.surefire.plugin.version>
43+
<dep.scala.maven.plugin.version>3.4.4</dep.scala.maven.plugin.version>
44+
<dep.scala.version>2.12.7</dep.scala.version>
45+
<dep.scalacheck.version>1.13.5</dep.scalacheck.version>
46+
<dep.scalatest.version>3.0.5</dep.scalatest.version>
47+
<dep.xmlgraphics-commons.version>2.0</dep.xmlgraphics-commons.version>
3148
<license.header>${project.rootdir}/ASL-2-header.txt</license.header>
49+
<maven.compiler.source>1.8</maven.compiler.source>
50+
<maven.compiler.target>1.8</maven.compiler.target>
3251
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
52+
<project.rootdir>${project.basedir}</project.rootdir>
53+
<scala.binary.version>2.12</scala.binary.version>
3354
</properties>
3455

3556
<developers>
@@ -41,42 +62,264 @@
4162
</developer>
4263
</developers>
4364

65+
<dependencyManagement>
66+
<dependencies>
67+
68+
<dependency>
69+
<groupId>org.scala-lang</groupId>
70+
<artifactId>scala-library</artifactId>
71+
<version>${dep.scala.version}</version>
72+
</dependency>
73+
74+
<dependency>
75+
<groupId>org.opencypher</groupId>
76+
<artifactId>tck</artifactId>
77+
<version>${project.version}</version>
78+
</dependency>
79+
80+
<dependency>
81+
<groupId>org.antlr</groupId>
82+
<artifactId>antlr4-runtime</artifactId>
83+
<version>${dep.antlr.runtime.version}</version>
84+
</dependency>
85+
86+
<dependency>
87+
<groupId>org.antlr</groupId>
88+
<artifactId>antlr4</artifactId>
89+
<version>${dep.antlr.generator.version}</version>
90+
</dependency>
91+
92+
<dependency>
93+
<groupId>org.junit.jupiter</groupId>
94+
<artifactId>junit-jupiter-api</artifactId>
95+
<version>${dep.junit.version}</version>
96+
</dependency>
97+
98+
<dependency>
99+
<groupId>io.cucumber</groupId>
100+
<artifactId>gherkin</artifactId>
101+
<version>${dep.gherkin.version}</version>
102+
</dependency>
103+
104+
<dependency>
105+
<groupId>org.apiguardian</groupId>
106+
<artifactId>apiguardian-api</artifactId>
107+
<version>${dep.apiguardian.version}</version>
108+
</dependency>
109+
110+
<dependency>
111+
<groupId>io.cucumber</groupId>
112+
<artifactId>cucumber-scala_${scala.binary.version}</artifactId>
113+
<version>${dep.cucumber.version}</version>
114+
</dependency>
115+
116+
<dependency>
117+
<groupId>io.cucumber</groupId>
118+
<artifactId>cucumber-junit</artifactId>
119+
<version>${dep.cucumber.version}</version>
120+
</dependency>
121+
122+
<dependency>
123+
<groupId>org.apache.xmlgraphics</groupId>
124+
<artifactId>batik-svggen</artifactId>
125+
<version>${dep.batik.version}</version>
126+
<scope>test</scope>
127+
</dependency>
128+
129+
<dependency>
130+
<groupId>org.apache.xmlgraphics</groupId>
131+
<artifactId>batik-swing</artifactId>
132+
<version>${dep.batik.version}</version>
133+
<scope>test</scope>
134+
</dependency>
135+
136+
<dependency>
137+
<groupId>org.apache.xmlgraphics</groupId>
138+
<artifactId>xmlgraphics-commons</artifactId>
139+
<version>${dep.xmlgraphics-commons.version}</version>
140+
<scope>test</scope>
141+
</dependency>
142+
143+
<dependency>
144+
<groupId>org.scalatest</groupId>
145+
<artifactId>scalatest_${scala.binary.version}</artifactId>
146+
<version>${dep.scalatest.version}</version>
147+
<scope>test</scope>
148+
<exclusions>
149+
<exclusion>
150+
<groupId>org.scala-lang</groupId>
151+
<artifactId>scala-library</artifactId>
152+
</exclusion>
153+
</exclusions>
154+
</dependency>
155+
156+
<dependency>
157+
<groupId>org.scalacheck</groupId>
158+
<artifactId>scalacheck_${scala.binary.version}</artifactId>
159+
<version>${dep.scalacheck.version}</version>
160+
<scope>test</scope>
161+
</dependency>
162+
163+
<dependency>
164+
<groupId>org.junit.platform</groupId>
165+
<artifactId>junit-platform-launcher</artifactId>
166+
<version>${dep.junit.platform.version}</version>
167+
<scope>test</scope>
168+
</dependency>
169+
170+
<dependency>
171+
<groupId>org.junit.jupiter</groupId>
172+
<artifactId>junit-jupiter-engine</artifactId>
173+
<version>${dep.junit.version}</version>
174+
<scope>test</scope>
175+
</dependency>
176+
177+
<dependency>
178+
<groupId>junit</groupId>
179+
<artifactId>junit</artifactId>
180+
<version>4.12</version>
181+
<scope>test</scope>
182+
</dependency>
183+
184+
<dependency>
185+
<groupId>org.hamcrest</groupId>
186+
<artifactId>hamcrest-library</artifactId>
187+
<version>${dep.hamcrest.version}</version>
188+
<scope>test</scope>
189+
</dependency>
190+
191+
</dependencies>
192+
</dependencyManagement>
193+
44194
<build>
195+
196+
<pluginManagement>
197+
<plugins>
198+
199+
<plugin>
200+
<groupId>net.alchim31.maven</groupId>
201+
<artifactId>scala-maven-plugin</artifactId>
202+
<version>${dep.scala.maven.plugin.version}</version>
203+
<executions>
204+
<execution>
205+
<goals>
206+
<goal>compile</goal>
207+
<goal>testCompile</goal>
208+
<goal>add-source</goal>
209+
<goal>doc-jar</goal>
210+
</goals>
211+
</execution>
212+
</executions>
213+
<configuration>
214+
<scalaVersion>${dep.scala.version}</scalaVersion>
215+
<scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
216+
</configuration>
217+
</plugin>
218+
219+
<plugin>
220+
<artifactId>maven-surefire-plugin</artifactId>
221+
<version>${dep.maven.surefire.plugin.version}</version>
222+
<dependencies>
223+
<dependency>
224+
<groupId>org.junit.platform</groupId>
225+
<artifactId>junit-platform-launcher</artifactId>
226+
<version>${dep.junit.platform.version}</version>
227+
</dependency>
228+
<dependency>
229+
<groupId>org.junit.jupiter</groupId>
230+
<artifactId>junit-jupiter-engine</artifactId>
231+
<version>${dep.junit.version}</version>
232+
</dependency>
233+
<dependency>
234+
<groupId>org.junit.vintage</groupId>
235+
<artifactId>junit-vintage-engine</artifactId>
236+
<version>${dep.junit.version}</version>
237+
</dependency>
238+
</dependencies>
239+
</plugin>
240+
241+
<plugin>
242+
<groupId>org.neo4j.build.plugins</groupId>
243+
<artifactId>license-maven-plugin</artifactId>
244+
<version>3</version>
245+
<executions>
246+
<execution>
247+
<id>check-licenses</id>
248+
<phase>initialize</phase>
249+
<goals>
250+
<goal>check</goal>
251+
</goals>
252+
</execution>
253+
</executions>
254+
<configuration>
255+
<strictCheck>true</strictCheck>
256+
<header>${license.header}</header>
257+
<includes>
258+
<include>src/**/*.java</include>
259+
<include>src/**/*.scala</include>
260+
<include>**/*.feature</include>
261+
<include>grammar/*.xml</include>
262+
</includes>
263+
<mapping>
264+
<java>SLASHSTAR_STYLE</java>
265+
<scala>SLASHSTAR_STYLE</scala>
266+
<feature>SCRIPT_STYLE</feature>
267+
<xml>XML_STYLE</xml>
268+
</mapping>
269+
<timestampPropertyName>currentYear</timestampPropertyName>
270+
<properties>
271+
<inceptionYear>2015</inceptionYear>
272+
</properties>
273+
</configuration>
274+
</plugin>
275+
276+
<plugin>
277+
<groupId>org.apache.maven.plugins</groupId>
278+
<artifactId>maven-source-plugin</artifactId>
279+
<version>${dep.maven.source.plugin.version}</version>
280+
<executions>
281+
<execution>
282+
<id>attach-sources</id>
283+
<goals>
284+
<goal>jar</goal>
285+
</goals>
286+
</execution>
287+
</executions>
288+
</plugin>
289+
290+
<plugin>
291+
<groupId>org.apache.maven.plugins</groupId>
292+
<artifactId>maven-javadoc-plugin</artifactId>
293+
<version>${dep.maven.javadoc.plugin.version}</version>
294+
<executions>
295+
<execution>
296+
<id>attach-javadocs</id>
297+
<goals>
298+
<goal>jar</goal>
299+
</goals>
300+
</execution>
301+
</executions>
302+
</plugin>
303+
304+
<plugin>
305+
<groupId>org.apache.maven.plugins</groupId>
306+
<artifactId>maven-compiler-plugin</artifactId>
307+
<version>${dep.maven.compiler.plugin.version}</version>
308+
<configuration>
309+
<compilerArgs>
310+
<arg>-parameters</arg>
311+
</compilerArgs>
312+
</configuration>
313+
</plugin>
314+
315+
</plugins>
316+
</pluginManagement>
317+
45318
<plugins>
46-
<plugin>
47-
<groupId>org.neo4j.build.plugins</groupId>
48-
<artifactId>license-maven-plugin</artifactId>
49-
<version>3</version>
50-
<executions>
51-
<execution>
52-
<id>check-licenses</id>
53-
<phase>initialize</phase>
54-
<goals>
55-
<goal>check</goal>
56-
</goals>
57-
</execution>
58-
</executions>
59-
<configuration>
60-
<strictCheck>true</strictCheck>
61-
<header>${license.header}</header>
62-
<includes>
63-
<include>src/**/*.java</include>
64-
<include>src/**/*.scala</include>
65-
<include>**/*.feature</include>
66-
<include>grammar/*.xml</include>
67-
</includes>
68-
<mapping>
69-
<java>SLASHSTAR_STYLE</java>
70-
<scala>SLASHSTAR_STYLE</scala>
71-
<feature>SCRIPT_STYLE</feature>
72-
<xml>XML_STYLE</xml>
73-
</mapping>
74-
<timestampPropertyName>currentYear</timestampPropertyName>
75-
<properties>
76-
<inceptionYear>2015</inceptionYear>
77-
</properties>
78-
</configuration>
79-
</plugin>
319+
<plugin>
320+
<groupId>org.neo4j.build.plugins</groupId>
321+
<artifactId>license-maven-plugin</artifactId>
322+
</plugin>
80323
</plugins>
81324
</build>
82325

‎tck/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</parent>
1212

1313
<artifactId>tck</artifactId>
14-
<version>1.0-SNAPSHOT</version>
1514
<name>openCypher TCK Features and Graphs</name>
1615
<url>http://opencypher.org</url>
1716
<description>

0 commit comments

Comments
 (0)