git.opendaylight Code Review - odlparent.git/commit

author	Lorand Jakab <lojakab@cisco.com>
	Wed, 14 Jun 2017 01:57:37 +0000 (04:57 +0300)
committer	Lorand Jakab <lojakab@cisco.com>
	Mon, 19 Jun 2017 08:23:55 +0000 (11:23 +0300)
commit	9dc34524911970231ba84a03261df2c43a7916da
tree	acf19bd1ed7ba31488a59b5e850956b7498de869	tree \| snapshot
parent	e178c83923d72b0fbc99be88ff4d73f7afdea7a0	commit \| diff

Remove '4' suffix in applicable artifact names

During the Karaf 4 migration, while both Karaf versions coexisted it
was necessary to have a different artifactId for Karaf 4 features and
feature repositories produced by odlparent. After Karaf 3 is removed,
this is no longer necessary, and this patch removes the '4' from
applicable directory, artifact and property names.

Change-Id: Ib6446a86a75a1a4b9637e73b71aca640a22807f4
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

83 files changed:

bundles4-test/pom.xml		diff \| blob \| history
feature-repo-parent/pom.xml		diff \| blob \| history
features-test/pom.xml	[moved from features4-test/pom.xml with 96% similarity]	diff \| blob \| history
features-test/src/main/java/org/opendaylight/odlparent/featuretest/Constants.java	[moved from features4-test/src/main/java/org/opendaylight/odlparent/featuretest/Constants.java with 100% similarity]	blob \| history
features-test/src/main/java/org/opendaylight/odlparent/featuretest/CustomBundleUrlStreamHandlerFactory.java	[moved from features4-test/src/main/java/org/opendaylight/odlparent/featuretest/CustomBundleUrlStreamHandlerFactory.java with 100% similarity]	blob \| history
features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunNotifier.java	[moved from features4-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunNotifier.java with 100% similarity]	blob \| history
features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunner.java	[moved from features4-test/src/main/java/org/opendaylight/odlparent/featuretest/PerFeatureRunner.java with 100% similarity]	blob \| history
features-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java	[moved from features4-test/src/main/java/org/opendaylight/odlparent/featuretest/PerRepoTestRunner.java with 100% similarity]	blob \| history
features-test/src/main/java/org/opendaylight/odlparent/featuretest/ReflectionUtil.java	[moved from features4-test/src/main/java/org/opendaylight/odlparent/featuretest/ReflectionUtil.java with 100% similarity]	blob \| history
features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java	[moved from features4-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java with 100% similarity]	blob \| history
features-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java	[moved from features4-test/src/main/java/org/opendaylight/odlparent/featuretest/Util.java with 100% similarity]	blob \| history
features-test/src/main/resources/singlefeaturetest.properties	[new file with mode: 0644]	blob
features-test/src/test/java/org/opendaylight/odlparent/featuretest/ReflectionUtilTest.java	[moved from features4-test/src/test/java/org/opendaylight/odlparent/featuretest/ReflectionUtilTest.java with 100% similarity]	blob \| history
features/features-akka/pom.xml	[moved from features4/features4-akka/pom.xml with 87% similarity]	diff \| blob \| history
features/features-odlparent/pom.xml	[moved from features4/features4-odlparent/pom.xml with 91% similarity]	diff \| blob \| history
features/odl-akka-all/pom.xml	[moved from features4/odl-akka-all/pom.xml with 86% similarity]	diff \| blob \| history
features/odl-akka-all/src/main/history/dependencies.xml	[new file with mode: 0644]	blob
features/odl-akka-clustering-2.4/pom.xml	[moved from features4/odl-akka-clustering-2.4/pom.xml with 92% similarity]	diff \| blob \| history
features/odl-akka-clustering-2.4/src/main/history/dependencies.xml	[moved from features4/odl-akka-clustering-2.4/src/main/history/dependencies.xml with 89% similarity]	diff \| blob \| history
features/odl-akka-leveldb-0.7/pom.xml	[moved from features4/odl-akka-leveldb-0.7/pom.xml with 91% similarity]	diff \| blob \| history
features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml	[moved from features4/odl-akka-leveldb-0.7/src/main/history/dependencies.xml with 80% similarity]	diff \| blob \| history
features/odl-akka-persistence-2.4/pom.xml	[moved from features4/odl-akka-persistence-2.4/pom.xml with 91% similarity]	diff \| blob \| history
features/odl-akka-persistence-2.4/src/main/history/dependencies.xml	[moved from features4/odl-akka-persistence-2.4/src/main/history/dependencies.xml with 60% similarity]	diff \| blob \| history
features/odl-akka-scala-2.11/pom.xml	[moved from features4/odl-akka-scala-2.11/pom.xml with 94% similarity]	diff \| blob \| history
features/odl-akka-scala-2.11/src/main/history/dependencies.xml	[moved from features4/odl-akka-scala-2.11/src/main/history/dependencies.xml with 93% similarity]	diff \| blob \| history
features/odl-akka-system-2.4/pom.xml	[moved from features4/odl-akka-system-2.4/pom.xml with 92% similarity]	diff \| blob \| history
features/odl-akka-system-2.4/src/main/history/dependencies.xml	[moved from features4/odl-akka-system-2.4/src/main/history/dependencies.xml with 79% similarity]	diff \| blob \| history
features/odl-guava-18/pom.xml	[moved from features4/odl-guava-18/pom.xml with 94% similarity]	diff \| blob \| history
features/odl-guava-18/src/main/history/dependencies.xml	[moved from features4/odl-guava-18/src/main/history/dependencies.xml with 91% similarity]	diff \| blob \| history
features/odl-guava-21/pom.xml	[moved from features4/odl-guava-21/pom.xml with 94% similarity]	diff \| blob \| history
features/odl-guava-21/src/main/history/dependencies.xml	[moved from features4/odl-guava-21/src/main/history/dependencies.xml with 91% similarity]	diff \| blob \| history
features/odl-karaf-feat-feature/pom.xml	[moved from features4/odl-karaf-feat-feature/pom.xml with 97% similarity]	diff \| blob \| history
features/odl-karaf-feat-feature/src/main/feature/feature.xml	[moved from features4/odl-karaf-feat-feature/src/main/feature/feature.xml with 100% similarity]	blob \| history
features/odl-karaf-feat-jdbc/pom.xml	[moved from features4/odl-karaf-feat-jdbc/pom.xml with 97% similarity]	diff \| blob \| history
features/odl-karaf-feat-jdbc/src/main/feature/feature.xml	[moved from features4/odl-karaf-feat-jdbc/src/main/feature/feature.xml with 95% similarity]	diff \| blob \| history
features/odl-karaf-feat-jetty/pom.xml	[moved from features4/odl-karaf-feat-jetty/pom.xml with 97% similarity]	diff \| blob \| history
features/odl-karaf-feat-jetty/src/main/feature/feature.xml	[moved from features4/odl-karaf-feat-jetty/src/main/feature/feature.xml with 100% similarity]	blob \| history
features/odl-karaf-feat-war/pom.xml	[moved from features4/odl-karaf-feat-war/pom.xml with 97% similarity]	diff \| blob \| history
features/odl-karaf-feat-war/src/main/feature/feature.xml	[moved from features4/odl-karaf-feat-war/src/main/feature/feature.xml with 100% similarity]	blob \| history
features/odl-lmax-3/pom.xml	[moved from features4/odl-lmax-3/pom.xml with 94% similarity]	diff \| blob \| history
features/odl-lmax-3/src/main/history/dependencies.xml	[moved from features4/odl-lmax-3/src/main/history/dependencies.xml with 92% similarity]	diff \| blob \| history
features/odl-netty-4/pom.xml	[moved from features4/odl-netty-4/pom.xml with 96% similarity]	diff \| blob \| history
features/odl-netty-4/src/main/history/dependencies.xml	[moved from features4/odl-netty-4/src/main/history/dependencies.xml with 97% similarity]	diff \| blob \| history
features/odl-triemap-0.2/pom.xml	[moved from features4/odl-triemap-0.2/pom.xml with 92% similarity]	diff \| blob \| history
features/odl-triemap-0.2/src/main/history/dependencies.xml	[moved from features4/odl-triemap-0.2/src/main/history/dependencies.xml with 91% similarity]	diff \| blob \| history
features/pom.xml	[moved from features4/pom.xml with 92% similarity]	diff \| blob \| history
features4-test/src/main/resources/singlefeaturetest.properties	[deleted file]	blob \| history
features4/odl-akka-all/src/main/history/dependencies.xml	[deleted file]	blob \| history
karaf/karaf4-parent/pom.xml		diff \| blob \| history
karaf/opendaylight-karaf-empty/pom.xml	[moved from karaf/opendaylight-karaf4-empty/pom.xml with 93% similarity]	diff \| blob \| history
karaf/opendaylight-karaf-resources/pom.xml	[moved from karaf/opendaylight-karaf4-resources/pom.xml with 98% similarity]	diff \| blob \| history
karaf/opendaylight-karaf-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg	[moved from karaf/opendaylight-karaf4-resources/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/configuration/context.xml	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/configuration/context.xml with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/configuration/logback.xml	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/configuration/logback.xml with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-logging.properties	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/configuration/tomcat-logging.properties with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/configuration/tomcat-server.xml	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/configuration/tomcat-server.xml with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/etc/custom.properties with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/etc/jetty.xml	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/etc/jetty.xml with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/etc/jre.properties	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/etc/jre.properties with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/etc/odl.java.security	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/etc/odl.java.security with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/etc/org.ops4j.pax.logging.cfg with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/etc/org.ops4j.pax.web.cfg	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/etc/org.ops4j.pax.web.cfg with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-etc-startup-properties-4.0.9.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-etc-startup-properties-4.0.9.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-instance.bat.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-instance.bat.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-instance.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-instance.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-javax-mail-4.0.7.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-javax-mail-4.0.7.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-javax-mail-4.0.9.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-javax-mail-4.0.9.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-karaf-4.0.7.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-karaf-4.0.7.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-karaf-4.0.9.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-karaf-4.0.9.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-karaf.bat.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-karaf.bat.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-paxweb.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-paxweb.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-quiesce-4.0.7.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-quiesce-4.0.7.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-quiesce-4.0.9.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-quiesce-4.0.9.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-setenv-4.0.7.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-setenv-4.0.7.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-setenv-4.0.9.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-setenv-4.0.9.patch with 100% similarity]	blob \| history
karaf/opendaylight-karaf-resources/src/main/resources/patches/karaf-setenv.bat.patch	[moved from karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-setenv.bat.patch with 100% similarity]	blob \| history
karaf/pom.xml		diff \| blob \| history
karaf4-plugin/pom.xml		diff \| blob \| history
odlparent-artifacts/pom.xml		diff \| blob \| history
odlparent/pom.xml		diff \| blob \| history
pom.xml		diff \| blob \| history
single-feature-parent/pom.xml		diff \| blob \| history
untested-single-feature-parent/pom.xml		diff \| blob \| history

odlparent

RSS Atom