mindol1004/spring-boot-rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#BAEL-10229 Restore parent-kotlin's parent (parent-modules) instead of parent-boot-2

Browse Source
This commit is contained in:
Alessio Stalla
2019-10-25 17:57:56 +02:00
parent 0ec65d7bb8
commit 11ddb0d216
1 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
parent-kotlin/pom.xml
View File

@@ -1,60 +1,70 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>parent-kotlin</artifactId> <artifactId>parent-kotlin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>parent-kotlin</name> <name>parent-kotlin</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>Parent for all kotlin modules</description> <description>Parent for all kotlin modules</description>
<parent> <parent>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>parent-boot-2</artifactId> <artifactId>parent-modules</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../parent-boot-2</relativePath>
</parent> </parent>
<repositories> <repositories>
<repository> <repository>
<id>jcenter</id> <id>jcenter</id>
<url>http://jcenter.bintray.com</url> <url>http://jcenter.bintray.com</url>
</repository> </repository>
<repository> <repository>
<id>kotlin-ktor</id> <id>kotlin-ktor</id>
<url>https://dl.bintray.com/kotlin/ktor/</url> <url>https://dl.bintray.com/kotlin/ktor/</url>
</repository> </repository>
<repository> <repository>
<id>kotlin-eap</id> <id>kotlin-eap</id>
<url>http://dl.bintray.com/kotlin/kotlin-eap</url> <url>http://dl.bintray.com/kotlin/kotlin-eap</url>
</repository> </repository>
<repository> <repository>
<id>spring-milestone</id> <id>spring-milestone</id>
<name>Spring Milestone Repository</name> <name>Spring Milestone Repository</name>
<url>http://repo.spring.io/milestone</url> <url>http://repo.spring.io/milestone</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>kotlin-eap</id> <id>kotlin-eap</id>
<url>http://dl.bintray.com/kotlin/kotlin-eap</url> <url>http://dl.bintray.com/kotlin/kotlin-eap</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.2.0.M4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId> <artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId> <artifactId>kotlin-stdlib</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId> <artifactId>kotlin-reflect</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlinx</groupId> <groupId>org.jetbrains.kotlinx</groupId>
@@ -103,9 +113,9 @@
<sourceDir>${project.basedir}/src/main/java</sourceDir> <sourceDir>${project.basedir}/src/main/java</sourceDir>
</sourceDirs> </sourceDirs>
<jvmTarget>${java.version}</jvmTarget> <jvmTarget>${java.version}</jvmTarget>
<args> <args>
<arg>-Xjvm-default=enable</arg> <arg>-Xjvm-default=enable</arg>
</args> </args>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>