diff options
| -rw-r--r-- | springboot/spring-boot-setup/pom.xml | 35 | ||||
| -rw-r--r-- | springboot/springboot25/pom.xml | 15 |
2 files changed, 7 insertions, 43 deletions
diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index fe5a295d..d41913b0 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -71,30 +71,6 @@ <encoding>UTF-8</encoding> </configuration> </execution> - <execution> - <id>create-springboot25-parent-pom</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../springboot25</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>pom-template.xml</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - <escapeString>\</escapeString> - <filters> - <filter>${basedir}/src/main/properties/springboot25.properties</filter> - </filters> - <encoding>UTF-8</encoding> - </configuration> - </execution> </executions> </plugin> <plugin> @@ -124,17 +100,6 @@ <destinationFile>../springboot2/pom.xml</destinationFile> </configuration> </execution> - <execution> - <id>rename-springboot25-parent-pom</id> - <phase>validate</phase> - <goals> - <goal>rename</goal> - </goals> - <configuration> - <sourceFile>../springboot25/pom-template.xml</sourceFile> - <destinationFile>../springboot25/pom.xml</destinationFile> - </configuration> - </execution> </executions> </plugin> </plugins> diff --git a/springboot/springboot25/pom.xml b/springboot/springboot25/pom.xml index 294bda86..ae8ba4d9 100644 --- a/springboot/springboot25/pom.xml +++ b/springboot/springboot25/pom.xml @@ -54,8 +54,6 @@ <jacoco.version>0.8.5</jacoco.version> <!-- properties from oparent --> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- sitePath may be overridden in the inheriting POM if desired --> @@ -79,10 +77,9 @@ <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - <java.version.source>1.8</java.version.source> - <java.version.target>1.8</java.version.target> + <java.version>11</java.version> <bundle.plugin.version>2.5.0</bundle.plugin.version> - <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version> + <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> <features.file>features.xml</features.file> <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath> <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> @@ -443,10 +440,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${maven.compile.plugin.version}</version> + <version>${maven-compiler-plugin.version}</version> <configuration> - <source>${java.version.source}</source> - <target>${java.version.target}</target> + <release>${java.version}</release> + <!--explicitly remove source and target--> + <source combine.self="override"/> + <target combine.self="override"/> </configuration> </plugin> <plugin> |