From: Dhruv Bhardwaj Date: Mon, 18 Jun 2018 03:44:47 +0000 (-0400) Subject: Relicensing a few files from EPL to Apache License X-Git-Tag: v0.2.0~53 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e969f1fea30d488565d5ba15ae785d4d1ed16f42;hp=876d910d031b8174de1259fa041243c44f7899ad;p=transportpce.git Relicensing a few files from EPL to Apache License Honeynode resused some files under EPL that come from a previous testtool development. This commit relicenses those files. FD.io honeycomb project uses the Apache License contrary to ODL. EPL headers in honeynode generated checkstyle errors during build phase. Change-Id: I76b02475146866e3c44802274069bdcc680c931f Signed-off-by: Dhruv Bhardwaj Signed-off-by: Martial COULIBALY --- diff --git a/tests/build.sh b/tests/build.sh index a9118397b..8bacbf413 100755 --- a/tests/build.sh +++ b/tests/build.sh @@ -17,9 +17,8 @@ rm -rf netconf mdsal && git submodule update --init (cd netconf/netconf/tools/netconf-testtool && mvn clean install -DskipTests) #Honeynode build -(cd honeynode && mvn clean install -Dcheckstyle.skip -DskipTests) +(cd honeynode && mvn clean install -DskipTests -s fd_io_honeycomb_settings.xml) chmod +x ./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc/honeynode-distribution-1.18.01/honeycomb-tpce ->>>>>>> 196dd32... Honeynode test tool rm -rf schemas && mkdir -p schemas #sample config for ordm 2.x are not yet ready #cp -r ../ordmodels/common/src/main/yang/org-openroadm-* schemas diff --git a/tests/honeynode/fd_io_honeycomb_settings.xml b/tests/honeynode/fd_io_honeycomb_settings.xml new file mode 100644 index 000000000..7e9c54ccd --- /dev/null +++ b/tests/honeynode/fd_io_honeycomb_settings.xml @@ -0,0 +1,107 @@ + + + + + + + + fd.io-release + + + fd.io-mirror + fd.io-mirror + https://nexus.fd.io/content/groups/public/ + + true + never + + + false + + + + + + fd.io-mirror + fd.io-mirror + https://nexus.fd.io/content/repositories/public/ + + true + never + + + false + + + + + + + fd.io-snapshots + + + fd.io-snapshot + fd.io-snapshot + https://nexus.fd.io/content/repositories/fd.io.snapshot/ + + false + + + true + + + + + + fd.io-snapshot + fd.io-snapshot + https://nexus.fd.io/content/repositories/fd.io.snapshot/ + + false + + + true + + + + + + opendaylight-snapshots + + + opendaylight-snapshot + opendaylight-snapshot + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + false + + + true + + + + + + opendaylight-shapshot + opendaylight-snapshot + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + false + + + true + + + + + + + + fd.io-release + fd.io-snapshots + opendaylight-snapshots + + + diff --git a/tests/honeynode/honeynode-common/pom.xml b/tests/honeynode/honeynode-common/pom.xml index 31d8fc842..78ed93281 100644 --- a/tests/honeynode/honeynode-common/pom.xml +++ b/tests/honeynode/honeynode-common/pom.xml @@ -1,9 +1,16 @@ - - + 4.0.0 @@ -28,7 +35,7 @@ org.slf4j slf4j-api - + org.opendaylight.controller sal-binding-broker-impl diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java index 880889158..2493df110 100644 --- a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java +++ b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java @@ -1,9 +1,17 @@ /* - * Copyright © 2016 AT&T and others. All rights reserved. + * Copyright (c) 2018 AT&T and/or its affiliates. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package io.fd.honeycomb.transportpce.binding.converter; diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java index b878cfa25..fc0d74e70 100644 --- a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java +++ b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java @@ -1,9 +1,17 @@ /* - * Copyright © 2016 AT&T and others. All rights reserved. + * Copyright (c) 2018 AT&T and/or its affiliates. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package io.fd.honeycomb.transportpce.binding.converter; diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java index 3a95b833b..70c45dca2 100644 --- a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java +++ b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java @@ -1,9 +1,17 @@ /* - * Copyright © 2016 AT&T and others. All rights reserved. + * Copyright (c) 2018 AT&T and/or its affiliates. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package io.fd.honeycomb.transportpce.binding.converter; diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java index 0c3a56cac..1de885733 100644 --- a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java +++ b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java @@ -1,9 +1,17 @@ /* - * Copyright © 2016 AT&T and others. All rights reserved. + * Copyright (c) 2018 AT&T and/or its affiliates. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package io.fd.honeycomb.transportpce.binding.converter.api; diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java index b92fe9d8c..9af16fa6f 100644 --- a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java +++ b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java @@ -1,9 +1,17 @@ /* - * Copyright © 2016 AT&T and others. All rights reserved. + * Copyright (c) 2018 AT&T and/or its affiliates. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package io.fd.honeycomb.transportpce.test.common; diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java index 2900e9e06..c7ebc0881 100644 --- a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java +++ b/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java @@ -1,9 +1,17 @@ /* - * Copyright © 2016 AT&T and others. All rights reserved. + * Copyright (c) 2018 AT&T and/or its affiliates. * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package io.fd.honeycomb.transportpce.test.common; diff --git a/tests/honeynode/honeynode-plugin-impl/pom.xml b/tests/honeynode/honeynode-plugin-impl/pom.xml index a6cd757f7..bd16c1b7a 100644 --- a/tests/honeynode/honeynode-plugin-impl/pom.xml +++ b/tests/honeynode/honeynode-plugin-impl/pom.xml @@ -42,7 +42,7 @@ honeynode-plugin-api ${project.version} - + ${project.groupId} minimal-distribution-core