diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2016-04-26 07:38:28 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2016-05-04 05:38:43 +0000 |
commit | fd5c022142f871c78d29708c89afc941518acbd0 (patch) | |
tree | 92b6dd493d97101475959fada84ada8b0ca1fe43 | |
parent | 4f849ffc9479c71011ca5690a2d8f98228c0a0a7 (diff) |
HONEYCOMB-25: Use java 8 for sources and target JVM
Change-Id: Icdd2e8a393bd6214a9b69364a8498075fe3be43f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r-- | common/api-parent/pom.xml | 8 | ||||
-rw-r--r-- | common/features-parent/pom.xml | 8 | ||||
-rw-r--r-- | common/impl-parent/pom.xml | 8 | ||||
-rw-r--r-- | common/it-parent/pom.xml | 8 | ||||
-rw-r--r-- | common/karaf-parent/pom.xml | 8 | ||||
-rw-r--r-- | v3po/data-impl/src/main/java/io/fd/honeycomb/v3po/data/impl/OperationalDataTree.java | 18 | ||||
-rw-r--r-- | vagrant/bootstrap.ubuntu1404.sh | 4 |
7 files changed, 49 insertions, 13 deletions
diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 54f2f6e9a..1c554db64 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -57,6 +57,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> diff --git a/common/features-parent/pom.xml b/common/features-parent/pom.xml index 432a4f7db..d88c2ac68 100644 --- a/common/features-parent/pom.xml +++ b/common/features-parent/pom.xml @@ -57,6 +57,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index 10ad690f5..46de36c8d 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -61,6 +61,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> diff --git a/common/it-parent/pom.xml b/common/it-parent/pom.xml index 3904c7d6b..0a2bf1b90 100644 --- a/common/it-parent/pom.xml +++ b/common/it-parent/pom.xml @@ -59,6 +59,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> diff --git a/common/karaf-parent/pom.xml b/common/karaf-parent/pom.xml index 1dd3d6665..98584c76c 100644 --- a/common/karaf-parent/pom.xml +++ b/common/karaf-parent/pom.xml @@ -57,6 +57,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> </plugins> </build> diff --git a/v3po/data-impl/src/main/java/io/fd/honeycomb/v3po/data/impl/OperationalDataTree.java b/v3po/data-impl/src/main/java/io/fd/honeycomb/v3po/data/impl/OperationalDataTree.java index 5d3b00646..175f22d34 100644 --- a/v3po/data-impl/src/main/java/io/fd/honeycomb/v3po/data/impl/OperationalDataTree.java +++ b/v3po/data-impl/src/main/java/io/fd/honeycomb/v3po/data/impl/OperationalDataTree.java @@ -34,7 +34,6 @@ import io.fd.honeycomb.v3po.translate.read.ReaderRegistry; import java.util.Collection; import java.util.Map; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction; @@ -212,16 +211,13 @@ public final class OperationalDataTree implements ReadableDataTree { @SuppressWarnings("unchecked") private Function<DataObject, NormalizedNode<?, ?>> toNormalizedNodeFunction(final InstanceIdentifier path) { - return new Function<DataObject, NormalizedNode<?, ?>>() { - @Override - public NormalizedNode<?, ?> apply(@Nullable final DataObject dataObject) { - LOG.trace("OperationalDataTree.toNormalizedNode(), path={}, dataObject={}", path, dataObject); - final Map.Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> entry = - serializer.toNormalizedNode(path, dataObject); - - LOG.trace("OperationalDataTree.toNormalizedNode(), normalizedNodeEntry={}", entry); - return entry.getValue(); - } + return dataObject -> { + LOG.trace("OperationalDataTree.toNormalizedNode(), path={}, dataObject={}", path, dataObject); + final Map.Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> entry = + serializer.toNormalizedNode(path, dataObject); + + LOG.trace("OperationalDataTree.toNormalizedNode(), normalizedNodeEntry={}", entry); + return entry.getValue(); }; } diff --git a/vagrant/bootstrap.ubuntu1404.sh b/vagrant/bootstrap.ubuntu1404.sh index 30af4097f..28dda9884 100644 --- a/vagrant/bootstrap.ubuntu1404.sh +++ b/vagrant/bootstrap.ubuntu1404.sh @@ -98,7 +98,7 @@ apt-get install -y linux-image-extra-`uname -r` echo "---" echo " Installing openjdk" echo "---" -apt-get install -y openjdk-7-jdk +apt-get install -y openjdk-8-jdk mkdir -p $APACHE_MAVEN_INSTALL_DIR if [ -d "$KARAF_PACKAGES_MOUNT" ] ; then APACHE_MAVEN_TARBALL="$KARAF_PACKAGES_MOUNT/$APACHE_MAVEN_TAR_GZ" @@ -135,7 +135,7 @@ if [ "$(grep M2_HOME $VAGRANT_BASH_ALIASES)" = "" ] ; then # Maven Environment variables export M2_HOME=/usr/local/apache-maven/apache-maven-3.3.9 export MAVEN_OPTS="-Xms256m -Xmx512m" # Very important to put the "m" on the end -export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 EOF chown vagrant:vagrant $VAGRANT_BASH_ALIASES fi |