azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move resources: fix copy-resources kotlin compiler maven plugins

Browse Source
This commit is contained in:
Sergey Rostov
2018-11-28 14:51:03 +03:00
parent 2fac72cd99
commit 5237079c5d
5 changed files with 173 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-serialization/pom.xml
+10 -52
View File
@@ -7,12 +7,8 @@
<properties>
<maven.version>3.0.5</maven.version>
<serialization.src>${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/src/</serialization.src>
<serialization.src.kt>${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler</serialization.src.kt>
<serialization.resources>${basedir}/../../../plugins/kotlin-serialization/kotlin-serialization-compiler/resources/</serialization.resources>
<serialization.maven.plugin.src>${basedir}/src/main/kotlin</serialization.maven.plugin.src>
<serialization.maven.plugin.resources>${basedir}/src/main/resources</serialization.maven.plugin.resources>
<serialization.target-src>${basedir}/target/src/main/kotlin</serialization.target-src>
<serialization.target-src.kt>${basedir}/target/src/main/kotlin/org/jetbrains/kotlinx/serialization/compiler</serialization.target-src.kt>
<serialization.target-resources>${basedir}/target/resource</serialization.target-resources>
</properties>
<parent>
@@ -43,56 +39,23 @@
</dependencies>
<build>
<sourceDirectory>${serialization.target-src}</sourceDirectory>
<resources>
<resource>
<directory>${serialization.target-resources}</directory>
</resource>
<resource><directory>${serialization.resources}</directory></resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.0</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>copy-maven-sources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>generate-sources</phase>
<goals><goal>add-source</goal></goals>
<configuration>
<outputDirectory>${serialization.target-src}</outputDirectory>
<resources>
<resource><directory>${serialization.maven.plugin.src}</directory></resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-sources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${serialization.target-src.kt}</outputDirectory>
<resources>
<resource><directory>${serialization.src.kt}</directory></resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${serialization.target-resources}/META-INF</outputDirectory>
<resources>
<resource><directory>${serialization.src}/META-INF</directory></resource>
<resource><directory>${serialization.maven.plugin.resources}/META-INF</directory></resource>
</resources>
<sources>
<source>${serialization.src}</source>
<source>${serialization.maven.plugin.src}</source>
</sources>
</configuration>
</execution>
</executions>
@@ -107,11 +70,6 @@
<id>compile</id>
<phase>compile</phase>
<goals> <goal>compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${serialization.target-src}</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>