summaryrefslogtreecommitdiffstats
path: root/odlparent/client-parent/pom.xml
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-01-29 12:38:52 -0500
committerDan Timoney <dtimoney@att.com>2021-01-29 12:40:28 -0500
commit5700b8593826798ef4f9d0356f852698c1c91bef (patch)
tree14b751cd18d2e06ab347afd3acd4dec50ce59f2f /odlparent/client-parent/pom.xml
parentaa7c2484c692878d24753fe462069e94f6c3291b (diff)
Revert "ccsdk parents for alu-sr0"
This reverts upgrade to OpenDaylight Aluminum (commit b6288f99fbfcc73f115511696f98111ca32b8d2f.) Change-Id: I194efd26f792328f0ab79848664708715e94e240 Issue-ID: CCSDK-3012 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'odlparent/client-parent/pom.xml')
-rw-r--r--odlparent/client-parent/pom.xml51
1 files changed, 9 insertions, 42 deletions
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index cdf44089..c2427933 100644
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -32,6 +32,8 @@
<properties>
<!-- 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>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
@@ -53,10 +55,9 @@
<opendaylight.nexus.public-url>https://nexus.opendaylight.org/content/repositories/public/</opendaylight.nexus.public-url>
<opendaylight.nexus.snapshot-url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</opendaylight.nexus.snapshot-url>
- <java.version>11</java.version>
- <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
- <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
- <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <java.version.source>1.8</java.version.source>
+ <java.version.target>1.8</java.version.target>
+ <maven.compiler.version>3.6.1</maven.compiler.version>
<checkstyle.skip>true</checkstyle.skip>
@@ -65,7 +66,7 @@
<!-- Need to stick to JUnit 4.11 until https://github.com/jayway/powermock/issues/560
is fixed (either in PowerMock or with a new JUnit release) -->
<!-- Used everywhere -->
- <junit.version>4.13</junit.version>
+ <junit.version>4.11</junit.version>
<mockito.version>2.8.9</mockito.version>
<lombok.version>1.18.0</lombok.version>
<openpojo.version>0.8.10</openpojo.version>
@@ -348,48 +349,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
+ <version>${maven.compiler.version}</version>
<configuration>
- <release>${java.version}</release>
- <!--explicitly remove source and target-->
- <source combine.self="override"/>
- <target combine.self="override"/>
+ <source>${java.version.source}</source>
+ <target>${java.version.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <configuration>
- <!-- Sets the VM argument line used when unit tests are run. -->
- <argLine>${surefireArgLine}</argLine>
- <!-- Excludes integration tests when unit tests are run. -->
- <excludes>
- <exclude>**/IT*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven-failsafe-plugin.version}</version>
- <executions>
- <!-- Ensures that both integration-test and verify goals of the Failsafe Maven plugin are executed. -->
- <execution>
- <id>integration-tests</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <!-- Sets the VM argument line used when integration tests are run. -->
- <argLine>${failsafeArgLine}</argLine>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>