Skip to content

Commit 4c8f073

Browse files
committed
Make sure scala javadoc jar is deployed. Closes #231.
1 parent 8ce3267 commit 4c8f073

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

History.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC22...master)
2+
3+
* [Scala] Scala Javadoc problems with build ([#231](https://github.com/cucumber/cucumber-jvm/issues/231) Aslak Hellesøy)
4+
15
## [1.0.0.RC22](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC21...v1.0.0.RC22)
26

37
* [Java] Snippets for DataTable include a hint about using List<YourType>, so people discover this neat technique (Aslak Hellesøy)

scala/pom.xml

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<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/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34

45
<parent>
@@ -46,9 +47,9 @@
4647
<build>
4748
<plugins>
4849
<plugin>
49-
<groupId>org.scala-tools</groupId>
50-
<artifactId>maven-scala-plugin</artifactId>
51-
<version>2.15.2</version>
50+
<groupId>net.alchim31.maven</groupId>
51+
<artifactId>scala-maven-plugin</artifactId>
52+
<version>3.0.1</version>
5253
<configuration>
5354
<!--encoding>UTF-8</encoding-->
5455
<excludes>
@@ -72,8 +73,15 @@
7273
<sourceDir>${basedir}/target/generated-sources/i18n</sourceDir>
7374
</configuration>
7475
</execution>
76+
<execution>
77+
<id>attach-javadocs</id>
78+
<goals>
79+
<goal>doc-jar</goal>
80+
</goals>
81+
</execution>
7582
</executions>
7683
</plugin>
84+
7785
<plugin>
7886
<groupId>org.apache.maven.plugins</groupId>
7987
<artifactId>maven-antrun-plugin</artifactId>
@@ -86,7 +94,8 @@
8694
<phase>generate-sources</phase>
8795
<configuration>
8896
<target>
89-
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="maven.plugin.classpath" />
97+
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy"
98+
classpathref="maven.plugin.classpath"/>
9099

91100
<groovy><![CDATA[
92101
import groovy.text.SimpleTemplateEngine

0 commit comments

Comments
 (0)