diff options
| author |   Lukasz Muszkieta <lukasz.muszkieta@nokia.com> | 2020-07-27 12:41:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-07-27 12:41:12 +0000 |
| commit | 20f44bec2fc42ffe90373e267ac539dd6062d8ad (patch) | |
| tree | ee75fbf007cd9e27ec2cb5165506b31c34b2cbee | |
| parent | 09555cefb6bcf4e5136b63d502db7870a4a94e40 (diff) | |
| parent | 65ba7b2224d804f873901ab6279f097edbc18fd3 (diff) | |
Merge "Upgrade to Java11"
| -rw-r--r-- | pom.xml | 73 |
1 files changed, 49 insertions, 24 deletions
@@ -167,22 +167,68 @@ <format.skipExecute>false</format.skipExecute> </properties> </profile> + <profile> + <id>java11</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> + <configuration> + <forceJavacCompilerUse>true</forceJavacCompilerUse> + <source>11</source> + <target>11</target> + <release>11</release> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>java7</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + </plugins> + </build> + <activation> + <property> + <name>m2e.version</name> + </property> + <activeByDefault>true</activeByDefault> + </activation> + </profile> </profiles> <dependencies> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.9.8</version> + <version>2.11.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.9.8</version> + <version>2.11.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.9.8</version> + <version>2.11.1</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> </dependency> </dependencies> <reporting> @@ -234,17 +280,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.19.1</version> </plugin> - <!-- <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>${nexusproxy}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> @@ -255,16 +290,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> <version>2.9</version> </plugin> |