diff options
Diffstat (limited to 'maven-plugin')
| -rw-r--r-- | maven-plugin/dokka-maven-plugin.iml | 5 | ||||
| -rw-r--r-- | maven-plugin/pom.xml | 49 |
2 files changed, 14 insertions, 40 deletions
diff --git a/maven-plugin/dokka-maven-plugin.iml b/maven-plugin/dokka-maven-plugin.iml index 45a70200..984991e8 100644 --- a/maven-plugin/dokka-maven-plugin.iml +++ b/maven-plugin/dokka-maven-plugin.iml @@ -12,6 +12,7 @@ <excludeFolder url="file://$MODULE_DIR$/target/lib" /> <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> <excludeFolder url="file://$MODULE_DIR$/target/maven-status" /> + <excludeFolder url="file://$MODULE_DIR$/target/myrepo" /> <excludeFolder url="file://$MODULE_DIR$/target/surefire" /> </content> <orderEntry type="inheritedJdk" /> @@ -40,7 +41,7 @@ <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0.5" level="project" /> <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:3.0.22" level="project" /> <orderEntry type="library" name="Maven: org.apache.maven.plugin-tools:maven-plugin-annotations:3.4" level="project" /> - <orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.11" level="project" /> - <orderEntry type="library" name="Maven: org.jetbrains.dokka:dokka-fatjar:1.0" level="project" /> + <orderEntry type="library" name="Maven: org.jetbrains.dokka:dokka-fatjar:0.0.1-SNAPSHOT" level="project" /> + <orderEntry type="library" scope="RUNTIME" name="Maven: org.fusesource.jansi:jansi:1.11" level="project" /> </component> </module>
\ No newline at end of file diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index ad2117a8..71cc856d 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -44,27 +44,14 @@ </dependency> <dependency> - <groupId>org.fusesource.jansi</groupId> - <artifactId>jansi</artifactId> - <version>1.11</version> - </dependency> - - <dependency> <groupId>org.jetbrains.dokka</groupId> <artifactId>dokka-fatjar</artifactId> - <version>1.0</version> + <version>(,0.2)</version> <type>jar</type> <scope>compile</scope> </dependency> </dependencies> - <repositories> - <repository> - <id>my-local-repo</id> - <url>file://${basedir}/../out/repo</url> - </repository> - </repositories> - <build> <sourceDirectory>src/main/kotlin</sourceDirectory> @@ -116,39 +103,25 @@ <goalPrefix>dokka</goalPrefix> </configuration> </plugin> - - <!-- disable default jar building: we use assembly-plugin instead --> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>default-jar</id> - <phase>none</phase> - </execution> - </executions> - </plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.4</version> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.5.5</version> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <appendAssemblyId>false</appendAssemblyId> - </configuration> <executions> <execution> - <id>make-assembly</id> - <phase>package</phase> + <id>attach-sources</id> + <phase>verify</phase> <goals> - <goal>single</goal> + <goal>jar-no-fork</goal> </goals> </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.6</version> + </plugin> </plugins> </build> |