From 7c6630bca7cb5f2406dcbff313923866cec7bb7e Mon Sep 17 00:00:00 2001 From: Khosrow Moossavi Date: Wed, 25 Jul 2018 13:39:37 -0400 Subject: [PATCH] Cleanup POMs (#2613) * Cleaup and code-formatting POM files * Remove obsolete mycila license-maven-plugin * Remove obsolete console-proxy/plugin project * Move console-proxy-rdbconsole under console-proxy parent * Use correct parent path for rdpconsole * Order alphabetally items in setnextversion.sh * Unifiy License header in POMs * Alphabetic order of modules definition * Extract all defined versions into parent pom * Remove obsolete files: version-info.in, configure-info.in * Remove redundant defaultGoal * Remove useless checkstyle plugin from checkstyle project * Order alphabetally items in pom.xml * Add aditional SPACEs to fix debian build * Don't execute checkstyle on parent projects * Use UTF-8 encoding in building checkstyle project * Extract plugin versions into properties * Execute PMD plugin on all the projects with -Penablefindbugs * Upgrade maven plugins to latest version * Make sure to always look for apache parent pom from repository * Fix incorrect version grep in debian packaging * Fix rebase conflicts * Fix rebase conflicts * Remove PMD for now to be fixed on another PR --- agent/pom.xml | 205 +- api/pom.xml | 140 +- client/pom.xml | 2359 ++++++++-------- configure-info.in | 20 - core/pom.xml | 110 +- debian/rules | 2 +- developer/pom.xml | 559 ++-- engine/api/pom.xml | 112 +- engine/components-api/pom.xml | 94 +- engine/network/pom.xml | 67 +- engine/orchestration/pom.xml | 150 +- engine/pom.xml | 111 +- engine/schema/pom.xml | 74 +- engine/service/pom.xml | 160 +- engine/storage/cache/pom.xml | 71 +- engine/storage/configdrive/pom.xml | 57 +- engine/storage/datamotion/pom.xml | 86 +- engine/storage/image/pom.xml | 62 +- engine/storage/integration-test/pom.xml | 364 +-- engine/storage/pom.xml | 126 +- engine/storage/snapshot/pom.xml | 96 +- engine/storage/volume/pom.xml | 108 +- framework/agent-lb/pom.xml | 16 +- framework/ca/pom.xml | 31 +- framework/cluster/pom.xml | 95 +- framework/config/pom.xml | 71 +- framework/db/pom.xml | 130 +- framework/direct-download/pom.xml | 15 +- framework/events/pom.xml | 77 +- framework/ipc/pom.xml | 124 +- framework/jobs/pom.xml | 126 +- framework/managed-context/pom.xml | 42 +- framework/pom.xml | 97 +- framework/quota/pom.xml | 95 +- framework/rest/pom.xml | 126 +- framework/security/pom.xml | 93 +- framework/spring/lifecycle/pom.xml | 28 +- framework/spring/module/pom.xml | 11 +- plugins/acl/dynamic-role-based/pom.xml | 34 +- plugins/acl/static-role-based/pom.xml | 34 +- .../explicit-dedication/pom.xml | 34 +- .../host-affinity/pom.xml | 17 +- .../host-anti-affinity/pom.xml | 34 +- plugins/alert-handlers/snmp-alerts/pom.xml | 75 +- plugins/alert-handlers/syslog-alerts/pom.xml | 67 +- plugins/api/discovery/pom.xml | 85 +- plugins/api/rate-limit/pom.xml | 61 +- plugins/api/solidfire-intg-test/pom.xml | 73 +- plugins/api/vmware-sioc/pom.xml | 67 +- plugins/ca/root-ca/pom.xml | 65 +- plugins/database/mysql-ha/pom.xml | 61 +- plugins/database/quota/pom.xml | 159 +- plugins/dedicated-resources/pom.xml | 31 +- .../implicit-dedication/pom.xml | 31 +- .../user-concentrated-pod/pom.xml | 31 +- .../user-dispersing/pom.xml | 31 +- plugins/event-bus/inmemory/pom.xml | 47 +- plugins/event-bus/kafka/pom.xml | 56 +- plugins/event-bus/rabbitmq/pom.xml | 56 +- plugins/ha-planners/skip-heurestics/pom.xml | 31 +- plugins/host-allocators/random/pom.xml | 31 +- plugins/hypervisors/baremetal/pom.xml | 45 +- plugins/hypervisors/hyperv/pom.xml | 318 +-- plugins/hypervisors/kvm/pom.xml | 180 +- plugins/hypervisors/ovm/pom.xml | 45 +- plugins/hypervisors/ovm3/pom.xml | 33 +- plugins/hypervisors/simulator/pom.xml | 16 +- plugins/hypervisors/ucs/pom.xml | 79 +- plugins/hypervisors/vmware/pom.xml | 113 +- plugins/hypervisors/xenserver/pom.xml | 92 +- plugins/integrations/cloudian/pom.xml | 88 +- plugins/integrations/prometheus/pom.xml | 67 +- plugins/metrics/pom.xml | 80 +- plugins/network-elements/bigswitch/pom.xml | 72 +- plugins/network-elements/brocade-vcs/pom.xml | 157 +- plugins/network-elements/cisco-vnmc/pom.xml | 54 +- plugins/network-elements/dns-notifier/pom.xml | 59 +- .../elastic-loadbalancer/pom.xml | 31 +- plugins/network-elements/f5/pom.xml | 70 +- plugins/network-elements/globodns/pom.xml | 43 +- .../internal-loadbalancer/pom.xml | 31 +- .../network-elements/juniper-contrail/pom.xml | 262 +- plugins/network-elements/juniper-srx/pom.xml | 53 +- plugins/network-elements/netscaler/pom.xml | 64 +- plugins/network-elements/nicira-nvp/pom.xml | 135 +- plugins/network-elements/nuage-vsp/pom.xml | 100 +- plugins/network-elements/opendaylight/pom.xml | 111 +- plugins/network-elements/ovs/pom.xml | 31 +- plugins/network-elements/palo-alto/pom.xml | 31 +- .../network-elements/stratosphere-ssp/pom.xml | 32 +- plugins/network-elements/vxlan/pom.xml | 31 +- .../ipmitool/pom.xml | 55 +- .../nested-cloudstack/pom.xml | 64 +- plugins/pom.xml | 406 +-- plugins/storage-allocators/random/pom.xml | 44 +- plugins/storage/image/default/pom.xml | 128 +- plugins/storage/image/s3/pom.xml | 75 +- plugins/storage/image/sample/pom.xml | 128 +- plugins/storage/image/swift/pom.xml | 128 +- plugins/storage/volume/cloudbyte/pom.xml | 153 +- plugins/storage/volume/default/pom.xml | 98 +- plugins/storage/volume/nexenta/pom.xml | 98 +- plugins/storage/volume/sample/pom.xml | 98 +- plugins/storage/volume/solidfire/pom.xml | 136 +- plugins/user-authenticators/ldap/pom.xml | 224 +- plugins/user-authenticators/md5/pom.xml | 31 +- plugins/user-authenticators/pbkdf2/pom.xml | 31 +- .../user-authenticators/plain-text/pom.xml | 31 +- plugins/user-authenticators/saml2/pom.xml | 86 +- .../user-authenticators/sha256salted/pom.xml | 31 +- pom.xml | 2414 +++++++++-------- quickcloud/pom.xml | 30 +- server/pom.xml | 468 ++-- services/console-proxy-rdp/rdpconsole/pom.xml | 64 - services/console-proxy/plugin/pom.xml | 29 - services/console-proxy/pom.xml | 61 +- .../rdpconsole/README.txt | 0 services/console-proxy/rdpconsole/pom.xml | 52 + .../rdpconsole/rdp-config.bat | 0 .../main/java/common/AwtKeyEventSource.java | 0 .../main/java/common/AwtMouseEventSource.java | 0 .../src/main/java/common/BitmapOrder.java | 0 .../src/main/java/common/BitmapRectangle.java | 0 .../main/java/common/BufferedImageCanvas.java | 0 .../common/BufferedImageCopyRectAdapter.java | 0 .../common/BufferedImagePixelsAdapter.java | 0 .../src/main/java/common/Client.java | 0 .../src/main/java/common/CopyRectOrder.java | 0 .../src/main/java/common/KeyOrder.java | 0 .../src/main/java/common/MouseOrder.java | 0 .../src/main/java/common/OrderType.java | 0 .../main/java/common/ScreenDescription.java | 0 .../main/java/common/SizeChangeListener.java | 0 .../java/common/adapter/AwtBellAdapter.java | 0 .../java/common/adapter/AwtCanvasAdapter.java | 0 .../common/adapter/AwtClipboardAdapter.java | 0 .../src/main/java/common/asn1/Any.java | 0 .../main/java/common/asn1/Asn1Constants.java | 0 .../main/java/common/asn1/Asn1Integer.java | 0 .../src/main/java/common/asn1/BerType.java | 0 .../src/main/java/common/asn1/BitString.java | 0 .../src/main/java/common/asn1/ObjectID.java | 0 .../main/java/common/asn1/OctetString.java | 0 .../src/main/java/common/asn1/Sequence.java | 0 .../src/main/java/common/asn1/SequenceOf.java | 0 .../src/main/java/common/asn1/Tag.java | 0 .../java/common/opt/IncrementalOption.java | 0 .../src/main/java/common/opt/IntOption.java | 0 .../opt/NoArgumentForOptionException.java | 0 .../src/main/java/common/opt/Option.java | 0 .../main/java/common/opt/OptionParser.java | 0 .../common/opt/OptionRequiredException.java | 0 .../java/common/opt/StringArrayOption.java | 0 .../common/opt/StringEnumerationOption.java | 0 .../main/java/common/opt/StringOption.java | 0 .../common/opt/UnknownOptionException.java | 0 .../src/main/java/rdpclient/RdpClient.java | 0 .../adapter/AwtRdpKeyboardAdapter.java | 0 .../rdpclient/adapter/AwtRdpMouseAdapter.java | 0 .../rdpclient/clip/ClipboardDataFormat.java | 0 .../java/rdpclient/clip/ClipboardState.java | 0 .../clip/ServerClipRdrChannelRouter.java | 0 .../clip/ServerClipboardCapabilitiesPDU.java | 0 .../clip/ServerFormatDataResponsePDU.java | 0 .../rdpclient/clip/ServerFormatListPDU.java | 0 .../rdpclient/clip/ServerMonitorReadyPDU.java | 0 .../rdpclient/debug/ClientPacketSniffer.java | 0 .../java/rdpclient/debug/PacketSniffer.java | 0 .../rdpclient/debug/ServerPacketSniffer.java | 0 .../hyperv/ClientPreConnectionBlob.java | 0 .../ntlmssp/ClientNtlmsspNegotiate.java | 0 .../ntlmssp/ClientNtlmsspPubKeyAuth.java | 0 .../ntlmssp/ClientNtlmsspUserCredentials.java | 0 .../java/rdpclient/ntlmssp/CryptoAlgos.java | 0 .../java/rdpclient/ntlmssp/NegoFlags.java | 0 .../java/rdpclient/ntlmssp/NtlmCompute.java | 0 .../java/rdpclient/ntlmssp/NtlmConstants.java | 0 .../java/rdpclient/ntlmssp/NtlmState.java | 0 .../java/rdpclient/ntlmssp/SecBuffer.java | 0 .../ntlmssp/ServerNtlmsspChallenge.java | 0 .../ntlmssp/ServerNtlmsspPubKeyPlus1.java | 0 .../ntlmssp/asn1/AlgorithmIdentifier.java | 0 .../java/rdpclient/ntlmssp/asn1/NegoData.java | 0 .../java/rdpclient/ntlmssp/asn1/NegoItem.java | 0 .../ntlmssp/asn1/SubjectPublicKeyInfo.java | 0 .../rdpclient/ntlmssp/asn1/TSCredentials.java | 0 .../ntlmssp/asn1/TSCspDataDetail.java | 0 .../ntlmssp/asn1/TSPasswordCreds.java | 0 .../rdpclient/ntlmssp/asn1/TSRequest.java | 0 .../ntlmssp/asn1/TSSmartCardCreds.java | 0 .../java/rdpclient/ntlmssp/package-info.java | 0 .../rdpclient/rdp/ClientConfirmActivePDU.java | 0 .../java/rdpclient/rdp/ClientFastPathPDU.java | 0 .../java/rdpclient/rdp/ClientInfoPDU.java | 0 .../rdp/ClientMCSAttachUserRequest.java | 0 ...oinRequestServerMCSChannelConfirmPDUs.java | 0 .../rdp/ClientMCSConnectInitial.java | 0 .../rdp/ClientMCSErectDomainRequest.java | 0 .../rdpclient/rdp/ClientSynchronizePDU.java | 0 .../main/java/rdpclient/rdp/ClientTpkt.java | 0 .../rdp/ClientX224ConnectionRequestPDU.java | 0 .../java/rdpclient/rdp/ClientX224DataPDU.java | 0 .../rdpclient/rdp/RLEBitmapDecompression.java | 0 .../main/java/rdpclient/rdp/RdpConstants.java | 0 .../src/main/java/rdpclient/rdp/RdpState.java | 0 .../rdpclient/rdp/ServerBitmapUpdate.java | 0 .../rdp/ServerControlPDUCooperate.java | 0 .../rdp/ServerControlPDUGrantedControl.java | 0 .../rdpclient/rdp/ServerDemandActivePDU.java | 0 .../java/rdpclient/rdp/ServerFastPath.java | 0 .../rdpclient/rdp/ServerIOChannelRouter.java | 0 .../rdp/ServerLicenseErrorPDUValidClient.java | 0 .../rdp/ServerMCSAttachUserConfirmPDU.java | 0 .../rdp/ServerMCSChannelJoinConfirmPDU.java | 0 .../rdp/ServerMCSConnectResponse.java | 0 .../main/java/rdpclient/rdp/ServerMCSPDU.java | 0 .../rdpclient/rdp/ServerPaletteUpdate.java | 0 .../rdpclient/rdp/ServerSynchronizePDU.java | 0 .../main/java/rdpclient/rdp/ServerTpkt.java | 0 .../rdp/ServerX224ConnectionConfirmPDU.java | 0 .../java/rdpclient/rdp/ServerX224DataPdu.java | 0 .../src/main/java/streamer/BaseElement.java | 0 .../src/main/java/streamer/BufferPool.java | 0 .../src/main/java/streamer/ByteBuffer.java | 0 .../src/main/java/streamer/DataSink.java | 0 .../src/main/java/streamer/DataSource.java | 0 .../src/main/java/streamer/Direction.java | 0 .../src/main/java/streamer/Element.java | 0 .../src/main/java/streamer/Event.java | 0 .../main/java/streamer/InputStreamSource.java | 0 .../src/main/java/streamer/Link.java | 0 .../src/main/java/streamer/OneTimeSwitch.java | 0 .../src/main/java/streamer/Order.java | 0 .../main/java/streamer/OutputStreamSink.java | 0 .../src/main/java/streamer/Pipeline.java | 0 .../src/main/java/streamer/PipelineImpl.java | 0 .../src/main/java/streamer/Queue.java | 0 .../src/main/java/streamer/SocketWrapper.java | 0 .../main/java/streamer/SocketWrapperImpl.java | 0 .../src/main/java/streamer/SyncLink.java | 0 .../main/java/streamer/apr/AprSocketSink.java | 0 .../java/streamer/apr/AprSocketSource.java | 0 .../streamer/apr/AprSocketWrapperImpl.java | 0 .../streamer/bco/BcoSocketWrapperImpl.java | 0 .../streamer/debug/AssertingByteBuffer.java | 0 .../src/main/java/streamer/debug/Dumper.java | 0 .../main/java/streamer/debug/FakeSink.java | 0 .../main/java/streamer/debug/FakeSource.java | 0 .../main/java/streamer/debug/MockServer.java | 0 .../main/java/streamer/debug/MockSink.java | 0 .../main/java/streamer/debug/MockSource.java | 0 .../src/main/java/streamer/ssl/SSLState.java | 0 .../ssl/TrustAllX509TrustManager.java | 0 .../java/streamer/ssl/UpgradeSocketToSSL.java | 0 .../src/main/java/vncclient/VncClient.java | 0 .../adapter/AwtVncKeyboardAdapter.java | 0 .../vncclient/adapter/AwtVncMouseAdapter.java | 0 .../java/vncclient/vnc/EncodingsMessage.java | 0 .../vnc/FrameBufferUpdateRequest.java | 0 .../vnc/RGB888LE32PixelFormatRequest.java | 0 .../main/java/vncclient/vnc/RfbConstants.java | 0 .../vncclient/vnc/Vnc33Authentication.java | 0 .../main/java/vncclient/vnc/Vnc33Hello.java | 0 .../java/vncclient/vnc/VncInitializer.java | 0 .../java/vncclient/vnc/VncMessageHandler.java | 0 .../src/main/resources/jaas_ntlm_config.txt | 0 .../rdpconsole/src/test/doc/README.txt | 0 .../src/test/doc/dev-rdp-config.bat | 0 .../src/test/doc/freerdp-debug-log.txt | 0 .../rdpconsole/src/test/doc/rdp-key.pem | 0 .../rdpconsole/src/test/doc/rdp.pfx | Bin .../src/test/java/common/ClientTest.java | 0 .../test/java/rdpclient/MockServerTest.java | 0 .../test/java/streamer/BaseElementTest.java | 0 .../test/java/streamer/ByteBufferTest.java | 0 services/console-proxy/server/pom.xml | 99 +- services/iam/plugin/pom.xml | 89 +- services/iam/pom.xml | 90 +- services/iam/server/pom.xml | 86 +- services/pom.xml | 73 +- services/secondary-storage/controller/pom.xml | 73 +- services/secondary-storage/pom.xml | 56 +- services/secondary-storage/server/pom.xml | 199 +- systemvm/pom.xml | 463 ++-- test/pom.xml | 22 +- tools/apidoc/pom.xml | 53 +- tools/build/build_asf.sh | 1 - tools/build/setnextversion.sh | 14 +- tools/checkstyle/pom.xml | 59 +- tools/devcloud-kvm/pom.xml | 290 +- tools/devcloud4/pom.xml | 224 +- tools/marvin/pom.xml | 572 ++-- tools/pom.xml | 56 +- tools/wix-cloudstack-maven-plugin/pom.xml | 158 +- usage/pom.xml | 418 +-- utils/pom.xml | 451 ++- version-info.in | 27 - vmware-base/pom.xml | 114 +- 298 files changed, 9487 insertions(+), 9407 deletions(-) delete mode 100644 configure-info.in delete mode 100644 services/console-proxy-rdp/rdpconsole/pom.xml delete mode 100644 services/console-proxy/plugin/pom.xml rename services/{console-proxy-rdp => console-proxy}/rdpconsole/README.txt (100%) create mode 100644 services/console-proxy/rdpconsole/pom.xml rename services/{console-proxy-rdp => console-proxy}/rdpconsole/rdp-config.bat (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/AwtKeyEventSource.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/AwtMouseEventSource.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/BitmapOrder.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/BitmapRectangle.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/BufferedImageCanvas.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/Client.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/CopyRectOrder.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/KeyOrder.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/MouseOrder.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/OrderType.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/ScreenDescription.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/SizeChangeListener.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/adapter/AwtBellAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/adapter/AwtClipboardAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/Any.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/Asn1Constants.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/Asn1Integer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/BerType.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/BitString.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/ObjectID.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/OctetString.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/Sequence.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/SequenceOf.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/asn1/Tag.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/IncrementalOption.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/IntOption.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/NoArgumentForOptionException.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/Option.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/OptionParser.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/OptionRequiredException.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/StringArrayOption.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/StringEnumerationOption.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/StringOption.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/common/opt/UnknownOptionException.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/RdpClient.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpKeyboardAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpMouseAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/clip/ClipboardState.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/clip/ServerClipRdrChannelRouter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/clip/ServerClipboardCapabilitiesPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/clip/ServerFormatDataResponsePDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/clip/ServerFormatListPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/clip/ServerMonitorReadyPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/debug/ClientPacketSniffer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/debug/PacketSniffer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/debug/ServerPacketSniffer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/hyperv/ClientPreConnectionBlob.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspNegotiate.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspPubKeyAuth.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspUserCredentials.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/CryptoAlgos.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/NegoFlags.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmCompute.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmConstants.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmState.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/SecBuffer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspChallenge.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspPubKeyPlus1.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/AlgorithmIdentifier.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoData.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoItem.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/SubjectPublicKeyInfo.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCredentials.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCspDataDetail.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSPasswordCreds.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSSmartCardCreds.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/ntlmssp/package-info.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientFastPathPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientInfoPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSConnectInitial.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSErectDomainRequest.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientTpkt.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientX224ConnectionRequestPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ClientX224DataPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/RLEBitmapDecompression.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/RdpConstants.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/RdpState.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUCooperate.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUGrantedControl.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerFastPath.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerLicenseErrorPDUValidClient.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSAttachUserConfirmPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSChannelJoinConfirmPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSConnectResponse.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerPaletteUpdate.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerSynchronizePDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerTpkt.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerX224ConnectionConfirmPDU.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/rdpclient/rdp/ServerX224DataPdu.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/BaseElement.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/BufferPool.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/ByteBuffer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/DataSink.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/DataSource.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/Direction.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/Element.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/Event.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/InputStreamSource.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/Link.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/OneTimeSwitch.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/Order.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/OutputStreamSink.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/Pipeline.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/PipelineImpl.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/Queue.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/SocketWrapper.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/SyncLink.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/debug/AssertingByteBuffer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/debug/Dumper.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/debug/FakeSink.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/debug/FakeSource.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/debug/MockServer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/debug/MockSink.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/debug/MockSource.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/ssl/SSLState.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/ssl/TrustAllX509TrustManager.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/streamer/ssl/UpgradeSocketToSSL.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/VncClient.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/adapter/AwtVncKeyboardAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/adapter/AwtVncMouseAdapter.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/vnc/EncodingsMessage.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/vnc/FrameBufferUpdateRequest.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/vnc/RGB888LE32PixelFormatRequest.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/vnc/RfbConstants.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/main/resources/jaas_ntlm_config.txt (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/doc/README.txt (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/doc/dev-rdp-config.bat (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/doc/freerdp-debug-log.txt (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/doc/rdp-key.pem (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/doc/rdp.pfx (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/java/common/ClientTest.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/java/rdpclient/MockServerTest.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/java/streamer/BaseElementTest.java (100%) rename services/{console-proxy-rdp => console-proxy}/rdpconsole/src/test/java/streamer/ByteBufferTest.java (100%) delete mode 100644 version-info.in diff --git a/agent/pom.xml b/agent/pom.xml index 61c1804fc9a..8d6e27803e2 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -1,120 +1,113 @@ - - 4.0.0 - cloud-agent - Apache CloudStack Agents - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - - - - org.apache.cloudstack - cloud-core - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - commons-io - commons-io - ${cs.commons-io.version} - - - commons-daemon - commons-daemon - - - - - - maven-antrun-plugin - - - generate-resource - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/dependencies - runtime - - - - - - + + 4.0.0 + cloud-agent + Apache CloudStack Agents + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + + + + org.apache.cloudstack + cloud-core + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + commons-io + commons-io + + + commons-daemon + commons-daemon + + + + + + maven-antrun-plugin + + + generate-resource + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/dependencies + runtime + + + + + + diff --git a/api/pom.xml b/api/pom.xml index e8cea9ceb16..4c1f0c41caa 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -1,85 +1,85 @@ - - 4.0.0 - cloud-api - Apache CloudStack API - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - com.google.code.gson - gson - - - javax.servlet - javax.servlet-api - ${cs.servlet.version} - - - org.apache.cloudstack - cloud-framework-db - ${project.version} - test - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - - org.apache.cloudstack - cloud-framework-ca - ${project.version} - - - org.apache.commons - commons-lang3 - ${cs.commons-lang3.version} - - + + 4.0.0 + cloud-api + Apache CloudStack API + org.apache.cloudstack - cloud-framework-direct-download - ${project.version} - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - + cloudstack + 4.12.0.0-SNAPSHOT + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + com.google.code.gson + gson + + + javax.servlet + javax.servlet-api + + + org.apache.cloudstack + cloud-framework-db + ${project.version} + test + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + + org.apache.cloudstack + cloud-framework-ca + ${project.version} + + + org.apache.commons + commons-lang3 + ${cs.commons-lang3.version} + + + org.apache.cloudstack + cloud-framework-direct-download + ${project.version} + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + diff --git a/client/pom.xml b/client/pom.xml index 63905b1dfb1..baf49add1b4 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -1,1185 +1,1198 @@ - - - 4.0.0 - cloud-client-ui - Apache CloudStack Client UI - jar - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - + + + 4.0.0 + cloud-client-ui + Apache CloudStack Client UI + jar + org.apache.cloudstack - cloud-plugin-api-solidfire-intg-test - ${project.version} - - - org.apache.cloudstack - cloud-plugin-network-globodns - ${project.version} - - - org.apache.cloudstack - cloud-plugin-database-quota - ${project.version} - - - org.apache.cloudstack - cloud-plugin-integrations-cloudian-connector - ${project.version} - - - org.apache.cloudstack - cloud-plugin-integrations-prometheus-exporter - ${project.version} - - - - - - ru.concerteza.buildnumber - maven-jgit-buildnumber-plugin - 1.2.6 - - - git-buildnumber - - extract-buildnumber - - prepare-package - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.apache.cloudstack.ServerDaemon - - - ${git.branch} - ${git.tag} - ${git.revision} - ${git.revision} - ${git.branch} - - - - - - org.eclipse.jetty - jetty-maven-plugin - ${cs.jetty-maven-plugin.version} - - - + cloudstack + 4.12.0.0-SNAPSHOT + + + + juniper-contrail + http://juniper.github.io/contrail-maven/snapshots + + + + + javax.servlet + javax.servlet-api + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlets + + + org.eclipse.jetty + jetty-webapp + + + org.eclipse.jetty + jetty-jmx + + + org.eclipse.jetty + jetty-util + + mysql mysql-connector-java - ${cs.mysql.version} - - - org.bouncycastle - bcprov-jdk15on - ${cs.bcprov.version} - - - org.bouncycastle - bcpkix-jdk15on - ${cs.bcprov.version} - - - - 0 - 9966 - stop-jetty - - - 8080 - 60000 - - - ${project.build.directory}/classes/META-INF/webapp/WEB-INF/web.xml - ${project.build.directory}/classes/META-INF/webapp/ - - /client - ${project.build.directory}/conf/;${project.build.directory}/common;${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/ - .*/cloud.*jar$|.*/classes/.* - - - - log4j.configuration - log4j-cloud.xml - - - - - - maven-antrun-plugin - - - generate-resource - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - process-noredist - process-resources - - run - - - - test - - - - - - process-noredist-spring-context - process-resources - - run - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - package - - copy - - - - - org.jasypt - jasypt - 1.9.2 - false - ${project.build.directory}/pythonlibs - - - org.bouncycastle - bcprov-jdk15on - false - ${project.build.directory}/lib - - - org.bouncycastle - bcpkix-jdk15on - false - ${project.build.directory}/lib - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - cloudstack-checkstyle - none - false - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.0.0 - - - rebuild-war - package - - shade - - - false - - - *:* - - - junit:junit - com.tngtech.java:junit-dataprovider - org.mockito:mockito-all - org.hamcrest:hamcrest-all - org.powermock:powermock-module-junit4 - org.powermock:powermock-api-mockito - org.springframework:spring-test - org.apache.tomcat.embed:tomcat-embed-core - org.apache.geronimo.specs:geronimo-servlet_3.0_spec - org.apache.geronimo.specs:geronimo-javamail_1.4_spec - org.bouncycastle:bcprov-jdk15on - org.bouncycastle:bcpkix-jdk15on - mysql:mysql-connector-java - - - - - - - org.apache.cloudstack.ServerDaemon - - - META-INF/spring.handlers - - - META-INF/spring.schemas - - - - - *:* - - META-INF/VERSION.txt - META-INF/LICENSE.txt - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - META-INF/MANIFEST.MF - META-INF/maven/** - - - - - - - - - - - - systemvm - - - systemvm - - - - - org.apache.cloudstack - cloud-systemvm - ${project.version} - pom + runtime - - - - - maven-antrun-plugin - 1.7 - - - - copy-systemvm - process-resources - - run - - - - - - - - - - - - - - - - - - buildw - - - buildw - - - - - - maven-antrun-plugin - - - generate-resource-windows - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - download-files - prepare-package - - run - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.5 - - target/client - ./target/generated-webapp/WEB-INF/web.xml - ./target/generated-webapp - - - true - - - ${git.revision} - ${git.branch} - - - - - + org.apache.cloudstack - Wix-cloudstack-maven-plugin + cloud-framework-spring-module ${project.version} - - - wix-cs + + + org.apache.cloudstack + cloud-framework-spring-lifecycle + ${project.version} + + + org.apache.cloudstack + cloud-plugin-storage-volume-solidfire + ${project.version} + + + org.apache.cloudstack + cloud-plugin-storage-volume-cloudbyte + ${project.version} + + + org.apache.cloudstack + cloud-server + ${project.version} + + + org.apache.cloudstack + cloud-plugin-acl-static-role-based + ${project.version} + + + org.apache.cloudstack + cloud-plugin-acl-dynamic-role-based + ${project.version} + + + org.apache.cloudstack + cloud-plugin-ca-rootca + ${project.version} + + + org.apache.cloudstack + cloud-plugin-dedicated-resources + ${project.version} + + + org.apache.cloudstack + cloud-plugin-api-limit-account-based + ${project.version} + + + org.apache.cloudstack + cloud-plugin-api-discovery + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-ldap + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-md5 + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-pbkdf2 + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-plaintext + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-saml2 + ${project.version} + + + org.apache.cloudstack + cloud-plugin-user-authenticator-sha256salted + ${project.version} + + + org.apache.cloudstack + cloud-plugin-metrics + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-nvp + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-contrail + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-palo-alto + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-netscaler + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-ovs + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-elb + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-bigswitch + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-ssp + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-internallb + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-vxlan + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-opendaylight + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-vcs + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-vsp + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-xenserver + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-baremetal + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-ucs + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-ovm + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-ovm3 + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-kvm + ${project.version} + + + org.mortbay.jetty + servlet-api + + + + + org.apache.cloudstack + cloud-plugin-hypervisor-hyperv + ${project.version} + + + org.apache.cloudstack + cloud-plugin-storage-allocator-random + ${project.version} + + + org.apache.cloudstack + cloud-plugin-planner-user-dispersing + ${project.version} + + + org.apache.cloudstack + cloud-plugin-planner-skip-heurestics + ${project.version} + + + org.apache.cloudstack + cloud-plugin-planner-user-concentrated-pod + ${project.version} + + + org.apache.cloudstack + cloud-plugin-planner-implicit-dedication + ${project.version} + + + org.apache.cloudstack + cloud-plugin-explicit-dedication + ${project.version} + + + org.apache.cloudstack + cloud-plugin-host-allocator-random + ${project.version} + + + org.apache.cloudstack + cloud-plugin-outofbandmanagement-driver-ipmitool + ${project.version} + + + org.apache.cloudstack + cloud-plugin-outofbandmanagement-driver-nested-cloudstack + ${project.version} + + + org.apache.cloudstack + cloud-mom-rabbitmq + ${project.version} + + + org.apache.cloudstack + cloud-mom-inmemory + ${project.version} + + + org.apache.cloudstack + cloud-mom-kafka + ${project.version} + + + org.apache.cloudstack + cloud-framework-agent-lb + ${project.version} + + + org.apache.cloudstack + cloud-framework-ca + ${project.version} + + + org.apache.cloudstack + cloud-framework-direct-download + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + org.apache.cloudstack + cloud-framework-quota + ${project.version} + + + org.apache.cloudstack + cloud-framework-rest + ${project.version} + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-components-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-network + ${project.version} + + + org.apache.cloudstack + cloud-engine-orchestration + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-cache + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-configdrive + ${project.version} + + + org.apache.cloudstack + cloud-controller-secondary-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-image + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-datamotion + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-snapshot + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + org.apache.cloudstack + cloud-plugin-storage-volume-default + ${project.version} + + + org.apache.cloudstack + cloud-plugin-storage-image-default + ${project.version} + + + org.apache.cloudstack + cloud-plugin-storage-image-s3 + ${project.version} + + + org.apache.cloudstack + cloud-plugin-storage-image-swift + ${project.version} + + + org.apache.cloudstack + cloud-plugin-syslog-alerts + ${project.version} + + + org.apache.cloudstack + cloud-plugin-snmp-alerts + ${project.version} + + + org.apache.cloudstack + cloud-plugin-host-anti-affinity + ${project.version} + + + org.apache.cloudstack + cloud-plugin-host-affinity + ${project.version} + + + org.apache.cloudstack + cloud-plugin-api-solidfire-intg-test + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-globodns + ${project.version} + + + org.apache.cloudstack + cloud-plugin-database-quota + ${project.version} + + + org.apache.cloudstack + cloud-plugin-integrations-cloudian-connector + ${project.version} + + + org.apache.cloudstack + cloud-plugin-integrations-prometheus-exporter + ${project.version} + + + + + + ru.concerteza.buildnumber + maven-jgit-buildnumber-plugin + 1.2.6 + + + git-buildnumber + + extract-buildnumber + + prepare-package + + + + + org.apache.maven.plugins + maven-jar-plugin - -var wix.SourceClient - ${basedir}/target - client - - WEBAPPS - target/client.wxs - ClientPath + + + org.apache.cloudstack.ServerDaemon + + + ${git.branch} + ${git.tag} + ${git.revision} + ${git.revision} + ${git.branch} + + - - heat - - - - wix-cs-setup-db - - -var wix.SetupPathDir - ${basedir}/target - setup - - CSMANAGEMENT - target/setupdb.wxs - SetupPath - - - heat - - - - wix-cs-utilities - - -var wix.UtilitiesPathDir - ${basedir}/target - scripts - - INSTALLDIR - target/utilities.wxs - UtilitiesPath - - - heat - - - - python-site-packages - - -var wix.PythonSitePackagesDir - ${basedir}/target - python-site-packages - - INSTALLDIR - target/python-site-packages.wxs - PythonSitePackagesPath - - - heat - - - - - - org.bitbucket.joxley - wix-maven-plugin - 1.1.1 - - - wix-acs - - ${basedir}/target - - WixFirewallExtension - WixUIExtension - WixUtilExtension - - -dSourceClient=SourceDir\client -dSetupPathDir=SourceDir\setup -dUtilitiesPathDir=SourceDir\scripts -dPythonSitePackagesDir=SourceDir\python-site-packages - - ../scripts/installer/windows/acs.wxs - ../scripts/installer/windows/WixInstallerDialog.wxs - ../scripts/installer/windows/Setup_Databases.wxs - target/client.wxs - target/setupdb.wxs - target/utilities.wxs - target/python-site-packages.wxs - - target - - target/acs.wixobj - target/client.wixobj - target/setupdb.wixobj - target/utilities.wixobj - target/WixInstallerDialog.wixobj - target/Setup_Databases.wixobj - target/python-site-packages.wixobj - - - en-us - - - target/en-us.wxl - - target/acs.msi - - - candle - light - - - - wix-final - - ${basedir}/target - - WixBalExtension - WixUtilExtension - - - ../scripts/installer/windows/dependencies.wxs - - target - - target/dependencies.wixobj - - - en-US - - - target/en-us.wxl - - target/acs-${project.version}.exe - - - candle - light - - - - + + + org.eclipse.jetty + jetty-maven-plugin + ${cs.jetty-maven-plugin.version} + + + + mysql + mysql-connector-java + ${cs.mysql.version} + + + org.bouncycastle + bcprov-jdk15on + ${cs.bcprov.version} + + + org.bouncycastle + bcpkix-jdk15on + ${cs.bcprov.version} + + + + 0 + 9966 + stop-jetty + + + 8080 + 60000 + + + ${project.build.directory}/classes/META-INF/webapp/WEB-INF/web.xml + ${project.build.directory}/classes/META-INF/webapp/ + + /client + ${project.build.directory}/conf/;${project.build.directory}/common;${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/ + .*/cloud.*jar$|.*/classes/.* + + + + log4j.configuration + log4j-cloud.xml + + + + + + maven-antrun-plugin + + + generate-resource + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + process-noredist + process-resources + + run + + + + test + + + + + + process-noredist-spring-context + process-resources + + run + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + package + + copy + + + + + org.jasypt + jasypt + ${cs.jasypt.version} + false + ${project.build.directory}/pythonlibs + + + org.bouncycastle + bcprov-jdk15on + false + ${project.build.directory}/lib + + + org.bouncycastle + bcpkix-jdk15on + false + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.0.0 + + + rebuild-war + package + + shade + + + false + + + *:* + + + junit:junit + com.tngtech.java:junit-dataprovider + org.mockito:mockito-all + org.hamcrest:hamcrest-all + org.powermock:powermock-module-junit4 + org.powermock:powermock-api-mockito + org.springframework:spring-test + org.apache.tomcat.embed:tomcat-embed-core + org.apache.geronimo.specs:geronimo-servlet_3.0_spec + org.apache.geronimo.specs:geronimo-javamail_1.4_spec + org.bouncycastle:bcprov-jdk15on + org.bouncycastle:bcpkix-jdk15on + mysql:mysql-connector-java + + + + + + + org.apache.cloudstack.ServerDaemon + + + META-INF/spring.handlers + + + META-INF/spring.schemas + + + + + *:* + + META-INF/VERSION.txt + META-INF/LICENSE.txt + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/MANIFEST.MF + META-INF/maven/** + + + + + + + - - - - simulator - - - simulator - - - - - org.apache.cloudstack - cloud-plugin-hypervisor-simulator - ${project.version} - - - - - f5 - - - noredist - - - - - org.apache.cloudstack - cloud-plugin-network-f5 - ${project.version} - - - - - srx - - - noredist - - - - - org.apache.cloudstack - cloud-plugin-network-srx - ${project.version} - - - - - vmware - - - noredist - - - - - org.apache.cloudstack - cloud-plugin-hypervisor-vmware - ${project.version} - - - org.apache.cloudstack - cloud-vmware-base - ${project.version} - - - org.apache.cloudstack - cloud-plugin-network-cisco-vnmc - ${project.version} - - - - - mysqlha - - - noredist - - - - - org.apache.cloudstack - cloud-plugin-database-mysqlha - ${project.version} - - - - - vmwaresioc - - - noredist - - - - - org.apache.cloudstack - cloud-plugin-api-vmware-sioc - ${project.version} - - - - - quickcloud - - - quickcloud - - - - - org.apache.cloudstack - cloud-quickcloud - ${project.version} - - - - + + + + systemvm + + + systemvm + + + + + org.apache.cloudstack + cloud-systemvm + ${project.version} + pom + + + + + + maven-antrun-plugin + 1.7 + + + + copy-systemvm + process-resources + + run + + + + + + + + + + + + + + + + + + buildw + + + buildw + + + + + + maven-antrun-plugin + + + generate-resource-windows + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + download-files + prepare-package + + run + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.5 + + target/client + ./target/generated-webapp/WEB-INF/web.xml + ./target/generated-webapp + + + true + + + ${git.revision} + ${git.branch} + + + + + + org.apache.cloudstack + Wix-cloudstack-maven-plugin + ${project.version} + + + wix-cs + + -var wix.SourceClient + ${basedir}/target + client + + WEBAPPS + target/client.wxs + ClientPath + + + heat + + + + wix-cs-setup-db + + -var wix.SetupPathDir + ${basedir}/target + setup + + CSMANAGEMENT + target/setupdb.wxs + SetupPath + + + heat + + + + wix-cs-utilities + + -var wix.UtilitiesPathDir + ${basedir}/target + scripts + + INSTALLDIR + target/utilities.wxs + UtilitiesPath + + + heat + + + + python-site-packages + + -var wix.PythonSitePackagesDir + ${basedir}/target + python-site-packages + + INSTALLDIR + target/python-site-packages.wxs + PythonSitePackagesPath + + + heat + + + + + + org.bitbucket.joxley + wix-maven-plugin + 1.1.1 + + + wix-acs + + ${basedir}/target + + WixFirewallExtension + WixUIExtension + WixUtilExtension + + -dSourceClient=SourceDir\client -dSetupPathDir=SourceDir\setup -dUtilitiesPathDir=SourceDir\scripts -dPythonSitePackagesDir=SourceDir\python-site-packages + + ../scripts/installer/windows/acs.wxs + ../scripts/installer/windows/WixInstallerDialog.wxs + ../scripts/installer/windows/Setup_Databases.wxs + target/client.wxs + target/setupdb.wxs + target/utilities.wxs + target/python-site-packages.wxs + + target + + target/acs.wixobj + target/client.wixobj + target/setupdb.wixobj + target/utilities.wixobj + target/WixInstallerDialog.wixobj + target/Setup_Databases.wixobj + target/python-site-packages.wixobj + + + en-us + + + target/en-us.wxl + + target/acs.msi + + + candle + light + + + + wix-final + + ${basedir}/target + + WixBalExtension + WixUtilExtension + + + ../scripts/installer/windows/dependencies.wxs + + target + + target/dependencies.wixobj + + + en-US + + + target/en-us.wxl + + target/acs-${project.version}.exe + + + candle + light + + + + + + + + + simulator + + + simulator + + + + + org.apache.cloudstack + cloud-plugin-hypervisor-simulator + ${project.version} + + + + + f5 + + + noredist + + + + + org.apache.cloudstack + cloud-plugin-network-f5 + ${project.version} + + + + + srx + + + noredist + + + + + org.apache.cloudstack + cloud-plugin-network-srx + ${project.version} + + + + + vmware + + + noredist + + + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + + + org.apache.cloudstack + cloud-vmware-base + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-cisco-vnmc + ${project.version} + + + + + mysqlha + + + noredist + + + + + org.apache.cloudstack + cloud-plugin-database-mysqlha + ${project.version} + + + + + vmwaresioc + + + noredist + + + + + org.apache.cloudstack + cloud-plugin-api-vmware-sioc + ${project.version} + + + + + quickcloud + + + quickcloud + + + + + org.apache.cloudstack + cloud-quickcloud + ${project.version} + + + + diff --git a/configure-info.in b/configure-info.in deleted file mode 100644 index f00cdf0dc64..00000000000 --- a/configure-info.in +++ /dev/null @@ -1,20 +0,0 @@ -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you 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. - -These are the configure-time variables used to compile this CloudStack: - -@CONFIGUREVARS@ diff --git a/core/pom.xml b/core/pom.xml index 2313b29be75..e95a72aab5b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,66 +1,54 @@ - - 4.0.0 - cloud-core - Apache CloudStack Core - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-security - ${project.version} - - - commons-codec - commons-codec - - - org.apache.commons - commons-compress - 1.15 - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - - - + + 4.0.0 + cloud-core + Apache CloudStack Core + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-security + ${project.version} + + + commons-codec + commons-codec + + + org.apache.commons + commons-compress + + diff --git a/debian/rules b/debian/rules index a41b3f9c2b8..bac57ed3930 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -VERSION := $(shell grep '^ ' pom.xml| cut -d'>' -f2 |cut -d'<' -f1) +VERSION := $(shell grep '' pom.xml | head -2 | tail -1 | cut -d'>' -f2 |cut -d'<' -f1) PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1) SYSCONFDIR = "/etc" DESTDIR = "debian/tmp" diff --git a/developer/pom.xml b/developer/pom.xml index 97ec9ed1b0f..ee6d7abb0c0 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -1,280 +1,287 @@ - - - 4.0.0 - cloud-developer - Apache CloudStack Developer Mode - pom - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - - - - org.apache.commons - commons-dbcp2 - - - org.apache.commons - commons-pool2 - - - org.jasypt - jasypt - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-server - ${project.version} - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - initialize - - read-project-properties - - - - ${basedir}/../utils/conf/db.properties - ${basedir}/../utils/conf/db.properties.override - - true - - - - - - maven-antrun-plugin - - - generate-resources - - run - - - - - - - - - - - - - - - - - - deploydb - - - deploydb - - - + 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. +--> + + 4.0.0 + cloud-developer + Apache CloudStack Developer Mode + pom + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + + + + org.apache.commons + commons-dbcp2 + + + org.apache.commons + commons-pool2 + + + org.jasypt + jasypt + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-server + ${project.version} + + + - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - mysql - mysql-connector-java - ${cs.mysql.version} - - - - - process-resources - create-schema - - java - - - - - com.cloud.upgrade.DatabaseCreator - true - - - ${basedir}/../utils/conf/db.properties - ${basedir}/../utils/conf/db.properties.override - - ${basedir}/target/db/create-schema.sql - ${basedir}/target/db/create-schema-premium.sql - - ${basedir}/target/db/templates.sql - - ${basedir}/developer-prefill.sql - ${basedir}/developer-prefill.sql.override - - com.cloud.upgrade.DatabaseUpgradeChecker - --database=cloud,usage - --rootpassword=${db.root.password} - - - - - - - catalina.home - ${basedir}/../utils - - - paths.script - ${basedir}/target/db - - - - + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${basedir}/../utils/conf/db.properties + ${basedir}/../utils/conf/db.properties.override + + true + + + + + + maven-antrun-plugin + + + generate-resources + + run + + + + + + + + + + + + - - - - - deploydb-saml - - - deploydb-saml - - - - - - org.codehaus.mojo - exec-maven-plugin - - - mysql - mysql-connector-java - ${cs.mysql.version} - - - 1.2.1 - - - process-resources - create-schema-simulator - - java - - - - - com.cloud.upgrade.DatabaseCreator - true - - - ${basedir}/../utils/conf/db.properties - ${basedir}/../utils/conf/db.properties.override - - ${basedir}/developer-saml.sql - - com.cloud.upgrade.DatabaseUpgradeChecker - --rootpassword=${db.root.password} - - - - catalina.home - ${basedir}/../utils - - - paths.script - ${basedir}/target/db - - - - - - - - - - deploydb-simulator - - - deploydb-simulator - - - - - - org.codehaus.mojo - exec-maven-plugin - - - mysql - mysql-connector-java - ${cs.mysql.version} - - - 1.2.1 - - - process-resources - create-schema-simulator - - java - - - - - com.cloud.upgrade.DatabaseCreator - true - - - ${basedir}/../utils/conf/db.properties - ${basedir}/../utils/conf/db.properties.override - - ${basedir}/target/db/create-schema-simulator.sql - ${basedir}/target/db/templates.simulator.sql - ${basedir}/target/db/hypervisor_capabilities.simulator.sql - - com.cloud.upgrade.DatabaseUpgradeChecker - --database=simulator - --rootpassword=${db.root.password} - - - - catalina.home - ${basedir}/../utils - - - paths.script - ${basedir}/target/db - - - - - - - - + + + + + deploydb + + + deploydb + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + mysql + mysql-connector-java + ${cs.mysql.version} + + + + + process-resources + create-schema + + java + + + + + com.cloud.upgrade.DatabaseCreator + true + + + ${basedir}/../utils/conf/db.properties + ${basedir}/../utils/conf/db.properties.override + + ${basedir}/target/db/create-schema.sql + ${basedir}/target/db/create-schema-premium.sql + + ${basedir}/target/db/templates.sql + + ${basedir}/developer-prefill.sql + ${basedir}/developer-prefill.sql.override + + com.cloud.upgrade.DatabaseUpgradeChecker + --database=cloud,usage + --rootpassword=${db.root.password} + + + + + + + catalina.home + ${basedir}/../utils + + + paths.script + ${basedir}/target/db + + + + + + + + + + deploydb-saml + + + deploydb-saml + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + mysql + mysql-connector-java + ${cs.mysql.version} + + + + + process-resources + create-schema-simulator + + java + + + + + com.cloud.upgrade.DatabaseCreator + true + + + ${basedir}/../utils/conf/db.properties + ${basedir}/../utils/conf/db.properties.override + + ${basedir}/developer-saml.sql + + com.cloud.upgrade.DatabaseUpgradeChecker + --rootpassword=${db.root.password} + + + + catalina.home + ${basedir}/../utils + + + paths.script + ${basedir}/target/db + + + + + + + + + + deploydb-simulator + + + deploydb-simulator + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + mysql + mysql-connector-java + ${cs.mysql.version} + + + + + process-resources + create-schema-simulator + + java + + + + + com.cloud.upgrade.DatabaseCreator + true + + + ${basedir}/../utils/conf/db.properties + ${basedir}/../utils/conf/db.properties.override + + ${basedir}/target/db/create-schema-simulator.sql + ${basedir}/target/db/templates.simulator.sql + ${basedir}/target/db/hypervisor_capabilities.simulator.sql + + com.cloud.upgrade.DatabaseUpgradeChecker + --database=simulator + --rootpassword=${db.root.password} + + + + catalina.home + ${basedir}/../utils + + + paths.script + ${basedir}/target/db + + + + + + + + diff --git a/engine/api/pom.xml b/engine/api/pom.xml index e0af91d2de1..b14fda1f938 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -1,54 +1,62 @@ - + - 4.0.0 - cloud-engine-api - Apache CloudStack Cloud Engine API - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-framework-db - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-rest - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-api + Apache CloudStack Cloud Engine API + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-framework-db + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-rest + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + diff --git a/engine/components-api/pom.xml b/engine/components-api/pom.xml index b690f8e1017..3fcc0088eba 100644 --- a/engine/components-api/pom.xml +++ b/engine/components-api/pom.xml @@ -1,62 +1,62 @@ - 4.0.0 - cloud-engine-components-api - Apache CloudStack Cloud Engine Internal Components API - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-core - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - org.apache.cloudstack - cloud-framework-events - ${project.version} - - - org.apache.cloudstack - cloud-framework-jobs - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-components-api + Apache CloudStack Cloud Engine Internal Components API + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-core + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + org.apache.cloudstack + cloud-framework-events + ${project.version} + + + org.apache.cloudstack + cloud-framework-jobs + ${project.version} + + diff --git a/engine/network/pom.xml b/engine/network/pom.xml index bf7c377b0b8..1898ca6068d 100644 --- a/engine/network/pom.xml +++ b/engine/network/pom.xml @@ -1,50 +1,47 @@ - 4.0.0 - cloud-engine-network - Apache CloudStack Cloud Engine API - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-components-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - - install - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-network + Apache CloudStack Cloud Engine API + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-components-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml index 5cb2e6d8801..70a4eccc767 100755 --- a/engine/orchestration/pom.xml +++ b/engine/orchestration/pom.xml @@ -1,90 +1,90 @@ - 4.0.0 - cloud-engine-orchestration - Apache CloudStack Cloud Engine Orchestration Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - org.apache.cloudstack - cloud-framework-events - ${project.version} - - - org.apache.cloudstack - cloud-engine-components-api - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-framework-agent-lb - ${project.version} - - - org.apache.cloudstack - cloud-server - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-orchestration + Apache CloudStack Cloud Engine Orchestration Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + org.apache.cloudstack + cloud-framework-events + ${project.version} + + + org.apache.cloudstack + cloud-engine-components-api + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-framework-agent-lb + ${project.version} + + + org.apache.cloudstack + cloud-server + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/engine/pom.xml b/engine/pom.xml index 5f36ba2f19c..fe4109b27c1 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -1,69 +1,70 @@ - - 4.0.0 - cloud-engine - Apache CloudStack Cloud Engine - pom - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - ../pom.xml - - - install - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - cloudstack-checkstyle - none - false - - - - - - - api - orchestration - schema - storage - storage/volume - storage/image - storage/datamotion - storage/cache - storage/snapshot - storage/configdrive - components-api - network - service - - - - integration-test - - storage/integration-test - - - + + 4.0.0 + cloud-engine + Apache CloudStack Cloud Engine + pom + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + false + + + + + + + + api + components-api + network + orchestration + schema + service + storage + storage/cache + storage/configdrive + storage/datamotion + storage/image + storage/snapshot + storage/volume + + + + integration-test + + storage/integration-test + + + diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml index ead2e01f367..78bb8f7493d 100644 --- a/engine/schema/pom.xml +++ b/engine/schema/pom.xml @@ -1,52 +1,52 @@ - 4.0.0 - cloud-engine-schema - Apache CloudStack Cloud Engine Schema Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - - org.apache.cloudstack - cloud-framework-db - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-schema + Apache CloudStack Cloud Engine Schema Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + + org.apache.cloudstack + cloud-framework-db + ${project.version} + + diff --git a/engine/service/pom.xml b/engine/service/pom.xml index 58487cf26ae..1b411a84851 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -1,95 +1,93 @@ - - 4.0.0 - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - - cloud-engine-service - war - Apache CloudStack Cloud Engine Service - http://www.cloudstack.org - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-engine-components-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-orchestration - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-network - ${project.version} - - - org.springframework - spring-context - - - org.springframework - spring-web - - - - engine - - - org.eclipse.jetty - jetty-maven-plugin - ${cs.jetty.version} - - 10 - - /engine - - - - 1736 - 60000 - - - - - - + + 4.0.0 + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + + cloud-engine-service + war + Apache CloudStack Cloud Engine Service + http://www.cloudstack.org + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-engine-components-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-orchestration + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-network + ${project.version} + + + org.springframework + spring-context + + + org.springframework + spring-web + + + + engine + + + org.eclipse.jetty + jetty-maven-plugin + ${cs.jetty.version} + + 10 + + /engine + + + + 1736 + 60000 + + + + + + diff --git a/engine/storage/cache/pom.xml b/engine/storage/cache/pom.xml index db82afaeca8..7b36645feba 100644 --- a/engine/storage/cache/pom.xml +++ b/engine/storage/cache/pom.xml @@ -1,33 +1,42 @@ - + - 4.0.0 - cloud-engine-storage-cache - Apache CloudStack Engine Storage Cache Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-storage-cache + Apache CloudStack Engine Storage Cache Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + diff --git a/engine/storage/configdrive/pom.xml b/engine/storage/configdrive/pom.xml index 83c882b23c7..16223f94f83 100644 --- a/engine/storage/configdrive/pom.xml +++ b/engine/storage/configdrive/pom.xml @@ -1,43 +1,42 @@ - - 4.0.0 - cloud-engine-storage-configdrive - Apache CloudStack Framework - Storage Config Drive Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-core - ${project.version} - - - + + 4.0.0 + cloud-engine-storage-configdrive + Apache CloudStack Framework - Storage Config Drive Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-core + ${project.version} + + diff --git a/engine/storage/datamotion/pom.xml b/engine/storage/datamotion/pom.xml index 47ef8427d26..9aceddd1411 100644 --- a/engine/storage/datamotion/pom.xml +++ b/engine/storage/datamotion/pom.xml @@ -1,41 +1,49 @@ - + - 4.0.0 - cloud-engine-storage-datamotion - Apache CloudStack Engine Storage Data Motion Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - runtime - - - org.apache.cloudstack - cloud-engine-storage-image - ${project.version} - runtime - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-storage-datamotion + Apache CloudStack Engine Storage Data Motion Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + runtime + + + org.apache.cloudstack + cloud-engine-storage-image + ${project.version} + runtime + + diff --git a/engine/storage/image/pom.xml b/engine/storage/image/pom.xml index f58155216a0..7d4f2cd0e84 100644 --- a/engine/storage/image/pom.xml +++ b/engine/storage/image/pom.xml @@ -1,29 +1,37 @@ - + - 4.0.0 - cloud-engine-storage-image - Apache CloudStack Engine Storage Image Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-storage-image + Apache CloudStack Engine Storage Image Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml index 3bceb24b734..5b64fdfa96c 100644 --- a/engine/storage/integration-test/pom.xml +++ b/engine/storage/integration-test/pom.xml @@ -1,182 +1,186 @@ - - - 4.0.0 - cloud-engine-storage-integration-test - Apache CloudStack Engine Storage integration test Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - test - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - test - - - org.apache.cloudstack - cloud-engine-storage-snapshot - ${project.version} - test - - - org.apache.cloudstack - cloud-engine-storage-image - ${project.version} - test - - - org.apache.cloudstack - cloud-engine-storage-datamotion - ${project.version} - test - - - org.apache.cloudstack - cloud-engine-storage-cache - ${project.version} - test - - - org.apache.cloudstack - cloud-plugin-hypervisor-xenserver - ${project.version} - test - - - org.apache.cloudstack - cloud-api - ${project.version} - test-jar - test - - - org.apache.cloudstack - cloud-plugin-hypervisor-vmware - ${project.version} - test - - - org.aspectj - aspectjrt - 1.7.1 - - - org.apache.cloudstack - cloud-plugin-hypervisor-kvm - ${project.version} - test - - - org.apache.cloudstack - cloud-plugin-storage-volume-default - ${project.version} - test - - - org.apache.cloudstack - cloud-secondary-storage - ${project.version} - test - - - org.apache.cloudstack - cloud-plugin-storage-image-default - ${project.version} - test - - - org.apache.cloudstack - cloud-plugin-storage-image-s3 - ${project.version} - test - - - org.apache.cloudstack - cloud-plugin-storage-image-swift - ${project.version} - test - - - org.apache.httpcomponents - httpclient - compile - - - org.testng - testng - 6.1.1 - test - + + + 4.0.0 + cloud-engine-storage-integration-test + Apache CloudStack Engine Storage integration test Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + test + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + test + + + org.apache.cloudstack + cloud-engine-storage-snapshot + ${project.version} + test + + + org.apache.cloudstack + cloud-engine-storage-image + ${project.version} + test + + + org.apache.cloudstack + cloud-engine-storage-datamotion + ${project.version} + test + + + org.apache.cloudstack + cloud-engine-storage-cache + ${project.version} + test + + + org.apache.cloudstack + cloud-plugin-hypervisor-xenserver + ${project.version} + test + + + org.apache.cloudstack + cloud-api + ${project.version} + test-jar + test + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + test + + + org.aspectj + aspectjrt + + + org.apache.cloudstack + cloud-plugin-hypervisor-kvm + ${project.version} + test + + + org.apache.cloudstack + cloud-plugin-storage-volume-default + ${project.version} + test + + + org.apache.cloudstack + cloud-secondary-storage + ${project.version} + test + + + org.apache.cloudstack + cloud-plugin-storage-image-default + ${project.version} + test + + + org.apache.cloudstack + cloud-plugin-storage-image-s3 + ${project.version} + test + + + org.apache.cloudstack + cloud-plugin-storage-image-swift + ${project.version} + test + + + org.apache.httpcomponents + httpclient + compile + + + org.testng + testng + test + + + + + + maven-compiler-plugin + + + + testCompile + + + + + + maven-antrun-plugin + + + generate-resource + generate-resources + + run + + + + + + + + + + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/engine/storage/pom.xml b/engine/storage/pom.xml index cd553e16770..7ef1abd60a2 100644 --- a/engine/storage/pom.xml +++ b/engine/storage/pom.xml @@ -1,61 +1,69 @@ - + - 4.0.0 - cloud-engine-storage - Apache CloudStack Engine Storage Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-core - ${project.version} - - - - org.apache.cloudstack - cloud-engine-components-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - org.apache.cloudstack - cloud-secondary-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-storage + Apache CloudStack Engine Storage Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-core + ${project.version} + + + + org.apache.cloudstack + cloud-engine-components-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + org.apache.cloudstack + cloud-secondary-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml index fa2aab2b4ac..1c9211f4dc1 100644 --- a/engine/storage/snapshot/pom.xml +++ b/engine/storage/snapshot/pom.xml @@ -1,48 +1,56 @@ - + - 4.0.0 - cloud-engine-storage-snapshot - Apache CloudStack Engine Storage Snapshot Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - test-jar - test - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-storage-snapshot + Apache CloudStack Engine Storage Snapshot Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + test-jar + test + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml index 57879703a79..37c9e7e5453 100644 --- a/engine/storage/volume/pom.xml +++ b/engine/storage/volume/pom.xml @@ -1,52 +1,60 @@ - + - 4.0.0 - cloud-engine-storage-volume - Apache CloudStack Engine Storage Volume Component - - org.apache.cloudstack - cloud-engine - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-image - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-engine-storage-volume + Apache CloudStack Engine Storage Volume Component + + org.apache.cloudstack + cloud-engine + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-image + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/framework/agent-lb/pom.xml b/framework/agent-lb/pom.xml index 8f16f2b085d..da033ec04dc 100644 --- a/framework/agent-lb/pom.xml +++ b/framework/agent-lb/pom.xml @@ -1,24 +1,23 @@ - + 4.0.0 Apache CloudStack Agent Management Servers Load Balancer cloud-framework-agent-lb @@ -28,5 +27,4 @@ 4.12.0.0-SNAPSHOT ../pom.xml - diff --git a/framework/ca/pom.xml b/framework/ca/pom.xml index c886bb027b5..f179fb97b0f 100644 --- a/framework/ca/pom.xml +++ b/framework/ca/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-framework-ca - Apache CloudStack Framework - Certificate Authority - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - + + 4.0.0 + cloud-framework-ca + Apache CloudStack Framework - Certificate Authority + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + diff --git a/framework/cluster/pom.xml b/framework/cluster/pom.xml index 2d0eb20c62e..c9b61d666d5 100644 --- a/framework/cluster/pom.xml +++ b/framework/cluster/pom.xml @@ -1,45 +1,54 @@ - + - 4.0.0 - cloud-framework-cluster - Apache CloudStack Framework - Clustering - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-framework-db - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - test-jar - test - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-framework-cluster + Apache CloudStack Framework - Clustering + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-framework-db + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + test-jar + test + + diff --git a/framework/config/pom.xml b/framework/config/pom.xml index 98be7aa6ce6..b3c2abec7c1 100644 --- a/framework/config/pom.xml +++ b/framework/config/pom.xml @@ -1,33 +1,42 @@ - + - 4.0.0 - cloud-framework-config - Apache CloudStack Framework - Configuration - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-framework-db - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-framework-config + Apache CloudStack Framework - Configuration + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-framework-db + ${project.version} + + diff --git a/framework/db/pom.xml b/framework/db/pom.xml index 7bf184c6d38..b2edee14523 100644 --- a/framework/db/pom.xml +++ b/framework/db/pom.xml @@ -1,63 +1,71 @@ - + - 4.0.0 - cloud-framework-db - Apache CloudStack Framework - Database - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - net.sf.ehcache - ehcache-core - - - org.eclipse.persistence - javax.persistence - - - org.apache.commons - commons-dbcp2 - - - commons-io - commons-io - ${cs.commons-io.version} - - - org.apache.commons - commons-pool2 - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - com/cloud/utils/testcase/*TestCase* - com/cloud/utils/db/*Test* - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-framework-db + Apache CloudStack Framework - Database + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + net.sf.ehcache + ehcache-core + + + org.eclipse.persistence + javax.persistence + + + org.apache.commons + commons-dbcp2 + + + commons-io + commons-io + + + org.apache.commons + commons-pool2 + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + com/cloud/utils/testcase/*TestCase* + com/cloud/utils/db/*Test* + + + + + diff --git a/framework/direct-download/pom.xml b/framework/direct-download/pom.xml index 62a18e9da5d..865dfefbaa8 100644 --- a/framework/direct-download/pom.xml +++ b/framework/direct-download/pom.xml @@ -1,24 +1,23 @@ - + 4.0.0 cloud-framework-direct-download Apache CloudStack Framework - Direct Download to Primary Storage diff --git a/framework/events/pom.xml b/framework/events/pom.xml index c39f1d880e0..4572af67b32 100644 --- a/framework/events/pom.xml +++ b/framework/events/pom.xml @@ -1,36 +1,45 @@ - + - 4.0.0 - cloud-framework-events - Apache CloudStack Framework - Event Notification - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - com.google.code.gson - gson - - - com.google.guava - guava - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-framework-events + Apache CloudStack Framework - Event Notification + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + com.google.code.gson + gson + + + com.google.guava + guava + + diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml index 3454c3012a7..c64a9a44fda 100644 --- a/framework/ipc/pom.xml +++ b/framework/ipc/pom.xml @@ -1,60 +1,68 @@ - + - 4.0.0 - cloud-framework-ipc - Apache CloudStack Framework - IPC - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - cglib - cglib-nodep - - - com.google.code.gson - gson - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-framework-ipc + Apache CloudStack Framework - IPC + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + cglib + cglib-nodep + + + com.google.code.gson + gson + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml index 530b0d5e9be..dccb9a563e1 100644 --- a/framework/jobs/pom.xml +++ b/framework/jobs/pom.xml @@ -1,77 +1,77 @@ - - 4.0.0 - cloud-framework-jobs - Apache CloudStack Framework - Jobs - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - org.apache.cloudstack - cloud-framework-db - ${project.version} - - - org.apache.cloudstack - cloud-framework-cluster - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - - org.apache.cloudstack - cloud-framework-events - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - commons-io - commons-io - ${cs.commons-io.version} - test - - + + 4.0.0 + cloud-framework-jobs + Apache CloudStack Framework - Jobs + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + org.apache.cloudstack + cloud-framework-db + ${project.version} + + + org.apache.cloudstack + cloud-framework-cluster + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + + org.apache.cloudstack + cloud-framework-events + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + commons-io + commons-io + test + + diff --git a/framework/managed-context/pom.xml b/framework/managed-context/pom.xml index 4081ad5be45..d960e2ff3bd 100644 --- a/framework/managed-context/pom.xml +++ b/framework/managed-context/pom.xml @@ -1,36 +1,36 @@ - 4.0.0 - cloud-framework-managed-context - Apache CloudStack Framework - Managed Context - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.slf4j - slf4j-api - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-framework-managed-context + Apache CloudStack Framework - Managed Context + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.slf4j + slf4j-api + + diff --git a/framework/pom.xml b/framework/pom.xml index 4f0f5cf5364..c4d554ac7d1 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -1,62 +1,63 @@ - - 4.0.0 - cloudstack-framework - Apache CloudStack Framework - pom - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - - - install - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - cloudstack-checkstyle - none - false - - - - - - - ipc - ca - rest - events - jobs - quota - cluster - db - config - managed-context - spring/lifecycle - spring/module - security - agent-lb - direct-download - + + 4.0.0 + cloudstack-framework + Apache CloudStack Framework + pom + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + false + + + + + + + + agent-lb + ca + cluster + config + db + direct-download + events + ipc + jobs + managed-context + quota + rest + security + spring/lifecycle + spring/module + diff --git a/framework/quota/pom.xml b/framework/quota/pom.xml index 29a48ba3495..6bbafdf38c1 100644 --- a/framework/quota/pom.xml +++ b/framework/quota/pom.xml @@ -1,73 +1,50 @@ - - 4.0.0 - cloud-framework-quota - Apache CloudStack Framework - Quota - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - junit - junit - ${cs.junit.version} - test - - - org.mockito - mockito-all - ${cs.mockito.version} - test - - - org.powermock - powermock-module-junit4 - ${cs.powermock.version} - - - org.powermock - powermock-api-mockito - ${cs.powermock.version} - test - - - org.apache.commons - commons-lang3 - ${cs.commons-lang3.version} - - - javax.mail - mail - - + + 4.0.0 + cloud-framework-quota + Apache CloudStack Framework - Quota + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.commons + commons-lang3 + + + javax.mail + mail + + diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index 114071332ed..798ed97e64b 100644 --- a/framework/rest/pom.xml +++ b/framework/rest/pom.xml @@ -1,78 +1,78 @@ - 4.0.0 - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - cloud-framework-rest - Apache CloudStack Framework - REST - - - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${cs.jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${cs.jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${cs.jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${cs.jackson.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${cs.jackson.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cs.cxf.version} - - - org.eclipse.jetty - jetty-server - - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - - - com.sun.xml.bind - jaxb-impl - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + cloud-framework-rest + Apache CloudStack Framework - REST + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${cs.jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${cs.jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${cs.jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${cs.jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${cs.jackson.version} + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cs.cxf.version} + + + org.eclipse.jetty + jetty-server + + + org.apache.geronimo.specs + geronimo-servlet_3.0_spec + + + com.sun.xml.bind + jaxb-impl + + + + diff --git a/framework/security/pom.xml b/framework/security/pom.xml index c6284edd097..42fa7b4a7fc 100644 --- a/framework/security/pom.xml +++ b/framework/security/pom.xml @@ -1,60 +1,61 @@ - - 4.0.0 - cloud-framework-security - Apache CloudStack Framework - Security - - org.apache.cloudstack - cloudstack-framework - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - commons-codec - commons-codec - - - org.apache.cloudstack - cloud-framework-db - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - + + 4.0.0 + cloud-framework-security + Apache CloudStack Framework - Security + + org.apache.cloudstack + cloudstack-framework + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + commons-codec + commons-codec + + + org.apache.cloudstack + cloud-framework-db + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + diff --git a/framework/spring/lifecycle/pom.xml b/framework/spring/lifecycle/pom.xml index 4f06922ab4d..85ac0a4c744 100644 --- a/framework/spring/lifecycle/pom.xml +++ b/framework/spring/lifecycle/pom.xml @@ -1,13 +1,21 @@ - + 4.0.0 diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml index 617e35ae188..90b3f9843b5 100644 --- a/framework/spring/module/pom.xml +++ b/framework/spring/module/pom.xml @@ -1,18 +1,18 @@ @@ -36,7 +36,6 @@ commons-io commons-io - ${cs.commons-io.version} org.springframework diff --git a/plugins/acl/dynamic-role-based/pom.xml b/plugins/acl/dynamic-role-based/pom.xml index 3dcc7591ffb..643b9b58d29 100644 --- a/plugins/acl/dynamic-role-based/pom.xml +++ b/plugins/acl/dynamic-role-based/pom.xml @@ -1,32 +1,30 @@ - - 4.0.0 - cloud-plugin-acl-dynamic-role-based - Apache CloudStack Plugin - ACL Dynamic Role Based - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-acl-dynamic-role-based + Apache CloudStack Plugin - ACL Dynamic Role Based + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/acl/static-role-based/pom.xml b/plugins/acl/static-role-based/pom.xml index c5e9af33fe4..5fd2a08d55b 100644 --- a/plugins/acl/static-role-based/pom.xml +++ b/plugins/acl/static-role-based/pom.xml @@ -1,32 +1,30 @@ - - 4.0.0 - cloud-plugin-acl-static-role-based - Apache CloudStack Plugin - ACL Static Role Based - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-acl-static-role-based + Apache CloudStack Plugin - ACL Static Role Based + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/affinity-group-processors/explicit-dedication/pom.xml b/plugins/affinity-group-processors/explicit-dedication/pom.xml index 3d19ca89fe1..3e81247a585 100644 --- a/plugins/affinity-group-processors/explicit-dedication/pom.xml +++ b/plugins/affinity-group-processors/explicit-dedication/pom.xml @@ -1,32 +1,30 @@ - - 4.0.0 - cloud-plugin-explicit-dedication - Apache CloudStack Plugin - Explicit Dedication Processor - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - install - + + 4.0.0 + cloud-plugin-explicit-dedication + Apache CloudStack Plugin - Explicit Dedication Processor + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/affinity-group-processors/host-affinity/pom.xml b/plugins/affinity-group-processors/host-affinity/pom.xml index 0af62c1f607..82eb4fc8ecd 100644 --- a/plugins/affinity-group-processors/host-affinity/pom.xml +++ b/plugins/affinity-group-processors/host-affinity/pom.xml @@ -1,28 +1,29 @@ - + 4.0.0 - Apache CloudStack Plugin - Host Affinity Processor cloud-plugin-host-affinity + Apache CloudStack Plugin - Host Affinity Processor - cloudstack-plugins org.apache.cloudstack + cloudstack-plugins 4.12.0.0-SNAPSHOT ../../pom.xml diff --git a/plugins/affinity-group-processors/host-anti-affinity/pom.xml b/plugins/affinity-group-processors/host-anti-affinity/pom.xml index 2ddbd7b2bb4..3dd2bc5f2ef 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/pom.xml +++ b/plugins/affinity-group-processors/host-anti-affinity/pom.xml @@ -1,32 +1,30 @@ - - 4.0.0 - cloud-plugin-host-anti-affinity - Apache CloudStack Plugin - Host Anti-Affinity Processor - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - install - + + 4.0.0 + cloud-plugin-host-anti-affinity + Apache CloudStack Plugin - Host Anti-Affinity Processor + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/alert-handlers/snmp-alerts/pom.xml b/plugins/alert-handlers/snmp-alerts/pom.xml index bab20be65f6..0bf3ca0b424 100644 --- a/plugins/alert-handlers/snmp-alerts/pom.xml +++ b/plugins/alert-handlers/snmp-alerts/pom.xml @@ -1,43 +1,40 @@ - - - cloudstack-plugins - org.apache.cloudstack - 4.12.0.0-SNAPSHOT - ../../pom.xml - - 4.0.0 - Apache CloudStack Plugin - SNMP Alerts - cloud-plugin-snmp-alerts + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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 - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.snmp4j - - - log4j - log4j - - + 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. +--> + + 4.0.0 + Apache CloudStack Plugin - SNMP Alerts + cloud-plugin-snmp-alerts + + cloudstack-plugins + org.apache.cloudstack + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.snmp4j + + + log4j + log4j + + diff --git a/plugins/alert-handlers/syslog-alerts/pom.xml b/plugins/alert-handlers/syslog-alerts/pom.xml index fc51b46447b..6cc37d7535d 100644 --- a/plugins/alert-handlers/syslog-alerts/pom.xml +++ b/plugins/alert-handlers/syslog-alerts/pom.xml @@ -1,39 +1,36 @@ - - - cloudstack-plugins - org.apache.cloudstack - 4.12.0.0-SNAPSHOT - ../../pom.xml - - 4.0.0 - Apache CloudStack Plugin - Syslog Alerts - cloud-plugin-syslog-alerts + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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 - - - log4j - log4j - - + 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. +--> + + 4.0.0 + Apache CloudStack Plugin - Syslog Alerts + cloud-plugin-syslog-alerts + + cloudstack-plugins + org.apache.cloudstack + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + log4j + log4j + + diff --git a/plugins/api/discovery/pom.xml b/plugins/api/discovery/pom.xml index dda5232429f..2ed7fc9cf60 100644 --- a/plugins/api/discovery/pom.xml +++ b/plugins/api/discovery/pom.xml @@ -1,58 +1,57 @@ - - 4.0.0 - cloud-plugin-api-discovery - Apache CloudStack Plugin - API Discovery - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx1024m - - org/apache/cloudstack/discovery/integration/* - - - - - + 4.0.0 + cloud-plugin-api-discovery + Apache CloudStack Plugin - API Discovery + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx1024m + + org/apache/cloudstack/discovery/integration/* + + + + + diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml index 30e297076d4..72c904c9d81 100644 --- a/plugins/api/rate-limit/pom.xml +++ b/plugins/api/rate-limit/pom.xml @@ -1,44 +1,45 @@ - - 4.0.0 - cloud-plugin-api-limit-account-based - Apache CloudStack Plugin - API Rate Limit - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - -Xmx2048m -XX:MaxPermSize=1024m - - org/apache/cloudstack/ratelimit/integration/* - - - - - + + 4.0.0 + cloud-plugin-api-limit-account-based + Apache CloudStack Plugin - API Rate Limit + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + + org.apache.maven.plugins + maven-surefire-plugin + + always + -Xmx2048m -XX:MaxPermSize=1024m + + org/apache/cloudstack/ratelimit/integration/* + + + + + diff --git a/plugins/api/solidfire-intg-test/pom.xml b/plugins/api/solidfire-intg-test/pom.xml index c0cfaaa3573..eca46211f11 100644 --- a/plugins/api/solidfire-intg-test/pom.xml +++ b/plugins/api/solidfire-intg-test/pom.xml @@ -1,50 +1,51 @@ - - 4.0.0 - cloud-plugin-api-solidfire-intg-test - Apache CloudStack Plugin - API SolidFire Integration Testing - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-plugin-storage-volume-solidfire - ${project.version} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx1024m - - org/apache/cloudstack/solidfire/integration/* - - - - - + + 4.0.0 + cloud-plugin-api-solidfire-intg-test + Apache CloudStack Plugin - API SolidFire Integration Testing + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-plugin-storage-volume-solidfire + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx1024m + + org/apache/cloudstack/solidfire/integration/* + + + + + diff --git a/plugins/api/vmware-sioc/pom.xml b/plugins/api/vmware-sioc/pom.xml index 2fb95bf36b9..0710ad284a0 100644 --- a/plugins/api/vmware-sioc/pom.xml +++ b/plugins/api/vmware-sioc/pom.xml @@ -1,47 +1,48 @@ - - 4.0.0 - cloud-plugin-api-vmware-sioc - Apache CloudStack Plugin - API VMware SIOC - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-plugin-hypervisor-vmware - ${project.version} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx1024m - - - - + + 4.0.0 + cloud-plugin-api-vmware-sioc + Apache CloudStack Plugin - API VMware SIOC + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx1024m + + + + diff --git a/plugins/ca/root-ca/pom.xml b/plugins/ca/root-ca/pom.xml index ffc77a53321..ffe3681f891 100644 --- a/plugins/ca/root-ca/pom.xml +++ b/plugins/ca/root-ca/pom.xml @@ -1,46 +1,47 @@ - - 4.0.0 - cloud-plugin-ca-rootca - Apache CloudStack Plugin - Inbuilt Root Certificate Authority - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-ca - ${project.version} - - + + 4.0.0 + cloud-plugin-ca-rootca + Apache CloudStack Plugin - Inbuilt Root Certificate Authority + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-ca + ${project.version} + + diff --git a/plugins/database/mysql-ha/pom.xml b/plugins/database/mysql-ha/pom.xml index baa2faeab68..95f85a6ed9c 100644 --- a/plugins/database/mysql-ha/pom.xml +++ b/plugins/database/mysql-ha/pom.xml @@ -1,28 +1,37 @@ - + - 4.0.0 - cloud-plugin-database-mysqlha - Apache CloudStack Plugin - MySQL HA Strategy - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - mysql - mysql-connector-java - provided - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-database-mysqlha + Apache CloudStack Plugin - MySQL HA Strategy + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + mysql + mysql-connector-java + provided + + diff --git a/plugins/database/quota/pom.xml b/plugins/database/quota/pom.xml index ca230d82460..649d3203d67 100644 --- a/plugins/database/quota/pom.xml +++ b/plugins/database/quota/pom.xml @@ -1,99 +1,66 @@ - + - 4.0.0 - cloud-plugin-database-quota - Apache CloudStack Plugin - Quota Service - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-framework-quota - ${project.version} - - - mysql - mysql-connector-java - provided - - - org.apache.commons - commons-lang3 - ${cs.commons-lang3.version} - - - joda-time - joda-time - ${cs.joda-time.version} - - - junit - junit - ${cs.junit.version} - test - - - org.hamcrest - hamcrest-library - ${cs.hamcrest.version} - test - - - org.mockito - mockito-all - ${cs.mockito.version} - test - - - org.powermock - powermock-module-junit4 - ${cs.powermock.version} - - - org.powermock - powermock-api-mockito - ${cs.powermock.version} - test - - - org.springframework - spring-test - ${org.springframework.version} - test - - - javax.inject - javax.inject - 1 - - + 4.0.0 + cloud-plugin-database-quota + Apache CloudStack Plugin - Quota Service + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-framework-quota + ${project.version} + + + mysql + mysql-connector-java + provided + + + org.apache.commons + commons-lang3 + + + joda-time + joda-time + ${cs.joda-time.version} + + diff --git a/plugins/dedicated-resources/pom.xml b/plugins/dedicated-resources/pom.xml index b99706c13c0..2c6f9f65101 100644 --- a/plugins/dedicated-resources/pom.xml +++ b/plugins/dedicated-resources/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-dedicated-resources - Apache CloudStack Plugin - Dedicated Resources - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../pom.xml - + + 4.0.0 + cloud-plugin-dedicated-resources + Apache CloudStack Plugin - Dedicated Resources + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../pom.xml + diff --git a/plugins/deployment-planners/implicit-dedication/pom.xml b/plugins/deployment-planners/implicit-dedication/pom.xml index 129856a589f..37dc712927b 100644 --- a/plugins/deployment-planners/implicit-dedication/pom.xml +++ b/plugins/deployment-planners/implicit-dedication/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-planner-implicit-dedication - Apache CloudStack Plugin - Implicit Dedication Planner - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-planner-implicit-dedication + Apache CloudStack Plugin - Implicit Dedication Planner + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml index 33f50cf5b86..8c0e8242672 100644 --- a/plugins/deployment-planners/user-concentrated-pod/pom.xml +++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-planner-user-concentrated-pod - Apache CloudStack Plugin - User Concentrated Pod Deployment Planner - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-planner-user-concentrated-pod + Apache CloudStack Plugin - User Concentrated Pod Deployment Planner + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml index 362767973d2..443d0322c3e 100644 --- a/plugins/deployment-planners/user-dispersing/pom.xml +++ b/plugins/deployment-planners/user-dispersing/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-planner-user-dispersing - Apache CloudStack Plugin - User Dispersing Deployment Planner - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-planner-user-dispersing + Apache CloudStack Plugin - User Dispersing Deployment Planner + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/event-bus/inmemory/pom.xml b/plugins/event-bus/inmemory/pom.xml index b277b726570..cf35bc1c382 100644 --- a/plugins/event-bus/inmemory/pom.xml +++ b/plugins/event-bus/inmemory/pom.xml @@ -1,40 +1,37 @@ - 4.0.0 - cloud-mom-inmemory - Apache CloudStack Plugin - In Memory Event Bus - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-framework-events - ${project.version} - - - - install - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-mom-inmemory + Apache CloudStack Plugin - In Memory Event Bus + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-framework-events + ${project.version} + + diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml index added90f737..975c5341ef5 100644 --- a/plugins/event-bus/kafka/pom.xml +++ b/plugins/event-bus/kafka/pom.xml @@ -1,45 +1,41 @@ - 4.0.0 - cloud-mom-kafka - Apache CloudStack Plugin - Kafka Event Bus - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-framework-events - ${project.version} - - - org.apache.kafka - kafka-clients - 0.11.0.1 - - - - install - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-mom-kafka + Apache CloudStack Plugin - Kafka Event Bus + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-framework-events + ${project.version} + + + org.apache.kafka + kafka-clients + + diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml index e407a1cac8c..51aa912ac1c 100644 --- a/plugins/event-bus/rabbitmq/pom.xml +++ b/plugins/event-bus/rabbitmq/pom.xml @@ -1,45 +1,41 @@ - 4.0.0 - cloud-mom-rabbitmq - Apache CloudStack Plugin - RabbitMQ Event Bus - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - com.rabbitmq - amqp-client - 5.1.1 - - - org.apache.cloudstack - cloud-framework-events - ${project.version} - - - - install - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-mom-rabbitmq + Apache CloudStack Plugin - RabbitMQ Event Bus + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-framework-events + ${project.version} + + + com.rabbitmq + amqp-client + + diff --git a/plugins/ha-planners/skip-heurestics/pom.xml b/plugins/ha-planners/skip-heurestics/pom.xml index f7bcc0515ca..5c1842aee90 100644 --- a/plugins/ha-planners/skip-heurestics/pom.xml +++ b/plugins/ha-planners/skip-heurestics/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-planner-skip-heurestics - Apache CloudStack Plugin - Skip Heurestics Planner - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-planner-skip-heurestics + Apache CloudStack Plugin - Skip Heurestics Planner + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml index e431e9c5ce9..5b36ee94657 100644 --- a/plugins/host-allocators/random/pom.xml +++ b/plugins/host-allocators/random/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-host-allocator-random - Apache CloudStack Plugin - Host Allocator Random - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-host-allocator-random + Apache CloudStack Plugin - Host Allocator Random + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/hypervisors/baremetal/pom.xml b/plugins/hypervisors/baremetal/pom.xml index 37612935b83..34c3b4eb160 100755 --- a/plugins/hypervisors/baremetal/pom.xml +++ b/plugins/hypervisors/baremetal/pom.xml @@ -1,37 +1,36 @@ - - 4.0.0 - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - cloud-plugin-hypervisor-baremetal - Apache CloudStack Plugin - Hypervisor Baremetal - - - commons-lang - commons-lang - 2.6 - - - + + 4.0.0 + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + cloud-plugin-hypervisor-baremetal + Apache CloudStack Plugin - Hypervisor Baremetal + + + commons-lang + commons-lang + + diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml index 41b7be34df2..6f32f9222f6 100644 --- a/plugins/hypervisors/hyperv/pom.xml +++ b/plugins/hypervisors/hyperv/pom.xml @@ -1,173 +1,173 @@ - - 4.0.0 - cloud-plugin-hypervisor-hyperv - Apache CloudStack Plugin - Hypervisor Hyper-V - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - false - true - - - - org.apache.cloudstack - cloud-agent - ${project.version} - - - org.apache.cloudstack - cloud-core - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - tests - test - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - java - com.cloud.agent.AgentShell - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - **/HypervDirectConnectResourceTest.* - - - none - - ${skipTests} - - - - maven-antrun-plugin - - - generate-resource - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - hyperv-agent - - - hyperv-agent - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - compile - - exec - - - - - bash - - ./buildagent.sh - ${skipTests} - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - none - - - **/HypervDirectConnectResourceTest.java - - ${skipFunctionalTests} - - - - - - + + 4.0.0 + cloud-plugin-hypervisor-hyperv + Apache CloudStack Plugin - Hypervisor Hyper-V + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + false + true + + + + org.apache.cloudstack + cloud-agent + ${project.version} + + + org.apache.cloudstack + cloud-core + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + tests + test + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + java + com.cloud.agent.AgentShell + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + **/HypervDirectConnectResourceTest.* + + + none + + ${skipTests} + + + + maven-antrun-plugin + + + generate-resource + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + hyperv-agent + + + hyperv-agent + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + compile + + exec + + + + + bash + + ./buildagent.sh + ${skipTests} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + none + + + **/HypervDirectConnectResourceTest.java + + ${skipFunctionalTests} + + + + + + diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 493dbfdb49a..2ae17ea1f07 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -1,88 +1,96 @@ - + - 4.0.0 - cloud-plugin-hypervisor-kvm - Apache CloudStack Plugin - Hypervisor KVM - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - commons-io - commons-io - ${cs.commons-io.version} - - - org.apache.cloudstack - cloud-agent - ${project.version} - - - org.libvirt - libvirt - ${cs.libvirt-java.version} - - - org.apache.cloudstack - cloud-plugin-network-ovs - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-configdrive - ${project.version} - - - com.ceph - rados - ${cs.rados-java.version} - - - net.java.dev.jna - jna - ${cs.jna.version} - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/dependencies - runtime - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/Qemu*.java - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-hypervisor-kvm + Apache CloudStack Plugin - Hypervisor KVM + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + commons-io + commons-io + + + org.apache.cloudstack + cloud-agent + ${project.version} + + + org.libvirt + libvirt + ${cs.libvirt-java.version} + + + org.apache.cloudstack + cloud-plugin-network-ovs + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-configdrive + ${project.version} + + + com.ceph + rados + ${cs.rados-java.version} + + + net.java.dev.jna + jna + ${cs.jna.version} + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/dependencies + runtime + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/Qemu*.java + + + + + diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml index c6fa7ece884..e0ca74b1b39 100644 --- a/plugins/hypervisors/ovm/pom.xml +++ b/plugins/hypervisors/ovm/pom.xml @@ -1,36 +1,37 @@ - - 4.0.0 - cloud-plugin-hypervisor-ovm - Apache CloudStack Plugin - Hypervisor OracleVM - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - net.java.dev.vcc.thirdparty - xen-api - ${cs.xapi.version} - - + + 4.0.0 + cloud-plugin-hypervisor-ovm + Apache CloudStack Plugin - Hypervisor OracleVM + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + net.java.dev.vcc.thirdparty + xen-api + ${cs.xapi.version} + + diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml index e642e3b0691..4e17741e3c4 100644 --- a/plugins/hypervisors/ovm3/pom.xml +++ b/plugins/hypervisors/ovm3/pom.xml @@ -1,26 +1,32 @@ - + 4.0.0 cloud-plugin-hypervisor-ovm3 Apache CloudStack Plugin - Hypervisor OracleVM3 - org.apache.cloudstack cloudstack-plugins 4.12.0.0-SNAPSHOT ../../pom.xml - org.apache.xmlrpc @@ -40,10 +46,8 @@ log4j log4j - ${cs.log4j.version} - @@ -56,7 +60,6 @@ - integration diff --git a/plugins/hypervisors/simulator/pom.xml b/plugins/hypervisors/simulator/pom.xml index 86ba5db059e..ac995619639 100644 --- a/plugins/hypervisors/simulator/pom.xml +++ b/plugins/hypervisors/simulator/pom.xml @@ -1,23 +1,23 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.apache.cloudstack @@ -28,9 +28,6 @@ cloud-plugin-hypervisor-simulator Apache CloudStack Plugin - Hypervisor Simulator Simulator Hypervisor for Cloudstack - - install - org.apache.cloudstack @@ -65,7 +62,6 @@ com.google.guava guava - ${cs.guava.version} diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml index de5bfe711fa..fb7d1f6f03c 100644 --- a/plugins/hypervisors/ucs/pom.xml +++ b/plugins/hypervisors/ucs/pom.xml @@ -1,39 +1,44 @@ - - + - 4.0.0 - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - cloud-plugin-hypervisor-ucs - Apache CloudStack Plugin - Hypervisor UCS - http://maven.apache.org - - UTF-8 - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + cloud-plugin-hypervisor-ucs + Apache CloudStack Plugin - Hypervisor UCS + http://maven.apache.org + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 0ffc89b6b98..654e80d4349 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -1,70 +1,71 @@ - - 4.0.0 - cloud-plugin-hypervisor-vmware - Apache CloudStack Plugin - Hypervisor VMware - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-vmware-base - ${project.version} - - - org.apache.cloudstack - cloud-secondary-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - compile - - - org.apache.cloudstack - cloud-engine-orchestration - ${project.version} - - - com.cloud.com.vmware - vmware-vim25 - ${cs.vmware.api.version} - compile - - - org.apache.axis - axis - - - org.apache.axis - axis-jaxrpc - - - wsdl4j - wsdl4j - - + + 4.0.0 + cloud-plugin-hypervisor-vmware + Apache CloudStack Plugin - Hypervisor VMware + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-vmware-base + ${project.version} + + + org.apache.cloudstack + cloud-secondary-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + compile + + + org.apache.cloudstack + cloud-engine-orchestration + ${project.version} + + + com.cloud.com.vmware + vmware-vim25 + ${cs.vmware.api.version} + compile + + + org.apache.axis + axis + + + org.apache.axis + axis-jaxrpc + + + wsdl4j + wsdl4j + + diff --git a/plugins/hypervisors/xenserver/pom.xml b/plugins/hypervisors/xenserver/pom.xml index 69d3fdf4492..c588a5c2831 100644 --- a/plugins/hypervisors/xenserver/pom.xml +++ b/plugins/hypervisors/xenserver/pom.xml @@ -1,44 +1,52 @@ - + - 4.0.0 - cloud-plugin-hypervisor-xenserver - Apache CloudStack Plugin - Hypervisor XenServer - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-plugin-network-ovs - ${project.version} - - - org.apache.httpcomponents - httpclient - compile - - - net.java.dev.vcc.thirdparty - xen-api - ${cs.xapi.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-hypervisor-xenserver + Apache CloudStack Plugin - Hypervisor XenServer + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-plugin-network-ovs + ${project.version} + + + org.apache.httpcomponents + httpclient + compile + + + net.java.dev.vcc.thirdparty + xen-api + ${cs.xapi.version} + + diff --git a/plugins/integrations/cloudian/pom.xml b/plugins/integrations/cloudian/pom.xml index 045abe2abed..1a397efd2a6 100644 --- a/plugins/integrations/cloudian/pom.xml +++ b/plugins/integrations/cloudian/pom.xml @@ -1,60 +1,58 @@ - - 4.0.0 - cloud-plugin-integrations-cloudian-connector - Apache CloudStack Plugin - Cloudian Connector - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.httpcomponents - httpclient - ${cs.httpclient.version} - - - com.fasterxml.jackson.core - jackson-databind - ${cs.jackson.version} - - - com.github.tomakehurst - wiremock-standalone - ${cs.wiremock.version} - test - - + 4.0.0 + cloud-plugin-integrations-cloudian-connector + Apache CloudStack Plugin - Cloudian Connector + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.httpcomponents + httpclient + + + com.fasterxml.jackson.core + jackson-databind + ${cs.jackson.version} + + + com.github.tomakehurst + wiremock-standalone + ${cs.wiremock.version} + test + + diff --git a/plugins/integrations/prometheus/pom.xml b/plugins/integrations/prometheus/pom.xml index b18d5d965c0..7620d2ee17d 100644 --- a/plugins/integrations/prometheus/pom.xml +++ b/plugins/integrations/prometheus/pom.xml @@ -1,48 +1,47 @@ - - 4.0.0 - cloud-plugin-integrations-prometheus-exporter - Apache CloudStack Plugin - Prometheus Exporter - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - + + 4.0.0 + cloud-plugin-integrations-prometheus-exporter + Apache CloudStack Plugin - Prometheus Exporter + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + diff --git a/plugins/metrics/pom.xml b/plugins/metrics/pom.xml index c0ff8bac56e..1e177bc759a 100644 --- a/plugins/metrics/pom.xml +++ b/plugins/metrics/pom.xml @@ -1,55 +1,53 @@ - - 4.0.0 - cloud-plugin-metrics - Apache CloudStack Plugin - Metrics - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx1024m - - - - + + 4.0.0 + cloud-plugin-metrics + Apache CloudStack Plugin - Metrics + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx1024m + + + + diff --git a/plugins/network-elements/bigswitch/pom.xml b/plugins/network-elements/bigswitch/pom.xml index 8cfb63a1454..ff3c365da2b 100644 --- a/plugins/network-elements/bigswitch/pom.xml +++ b/plugins/network-elements/bigswitch/pom.xml @@ -1,52 +1,30 @@ - - 4.0.0 - cloud-plugin-network-bigswitch - Apache CloudStack Plugin - BigSwitch Virtual Network Segment - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - - com.mycila - license-maven-plugin - - - cloudstack-checklicence - process-classes - - check - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - - + + 4.0.0 + cloud-plugin-network-bigswitch + Apache CloudStack Plugin - BigSwitch Virtual Network Segment + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/network-elements/brocade-vcs/pom.xml b/plugins/network-elements/brocade-vcs/pom.xml index d1a0473c182..17f6a05eb45 100644 --- a/plugins/network-elements/brocade-vcs/pom.xml +++ b/plugins/network-elements/brocade-vcs/pom.xml @@ -1,78 +1,83 @@ - + - 4.0.0 - cloud-plugin-network-vcs - Apache CloudStack Plugin - Network Brocade VCS - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.7.1 - - - interface - - generate - - - ${project.build.directory}/generated-sources/xjc1 - ${project.build.resources[0].directory} - - BrocadeInterfaceSchema.xsd - - com.cloud.network.schema.interfacevlan - - - - portprofile - - generate - - - ${project.build.directory}/generated-sources/xjc2 - ${project.build.resources[0].directory} - - BrocadePortProfileSchema.xsd - - com.cloud.network.schema.portprofile - - - - show-vcs - - generate - - - ${project.build.directory}/generated-sources/xjc3 - ${project.build.resources[0].directory} - - BrocadeShowVcsSchema.xsd - - com.cloud.network.schema.showvcs - - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-vcs + Apache CloudStack Plugin - Network Brocade VCS + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.7.1 + + + interface + + generate + + + ${project.build.directory}/generated-sources/xjc1 + ${project.build.resources[0].directory} + + BrocadeInterfaceSchema.xsd + + com.cloud.network.schema.interfacevlan + + + + portprofile + + generate + + + ${project.build.directory}/generated-sources/xjc2 + ${project.build.resources[0].directory} + + BrocadePortProfileSchema.xsd + + com.cloud.network.schema.portprofile + + + + show-vcs + + generate + + + ${project.build.directory}/generated-sources/xjc3 + ${project.build.resources[0].directory} + + BrocadeShowVcsSchema.xsd + + com.cloud.network.schema.showvcs + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/pom.xml b/plugins/network-elements/cisco-vnmc/pom.xml index 4b8e07345ac..9170e68bd06 100644 --- a/plugins/network-elements/cisco-vnmc/pom.xml +++ b/plugins/network-elements/cisco-vnmc/pom.xml @@ -1,42 +1,42 @@ - 4.0.0 - cloud-plugin-network-cisco-vnmc - Apache CloudStack Plugin - Cisco VNMC - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-plugin-hypervisor-vmware - ${project.version} - - - org.apache.cloudstack - cloud-vmware-base - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-cisco-vnmc + Apache CloudStack Plugin - Cisco VNMC + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + + + org.apache.cloudstack + cloud-vmware-base + ${project.version} + + diff --git a/plugins/network-elements/dns-notifier/pom.xml b/plugins/network-elements/dns-notifier/pom.xml index 6d38a172922..f1fa3d39ca9 100644 --- a/plugins/network-elements/dns-notifier/pom.xml +++ b/plugins/network-elements/dns-notifier/pom.xml @@ -1,46 +1,43 @@ - 4.0.0 - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - cloud-plugin-example-dns-notifier - Apache CloudStack Plugin - Dns Notifier Example - This is sample source code on how to write a plugin for CloudStack - - install - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + cloud-plugin-example-dns-notifier + Apache CloudStack Plugin - Dns Notifier Example + This is sample source code on how to write a plugin for CloudStack + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml index 9c578cbea6b..b3914746c1c 100644 --- a/plugins/network-elements/elastic-loadbalancer/pom.xml +++ b/plugins/network-elements/elastic-loadbalancer/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-network-elb - Apache CloudStack Plugin - Network Elastic Load Balancer - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-network-elb + Apache CloudStack Plugin - Network Elastic Load Balancer + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml index 5eafc3f7e4b..9b611a2efae 100644 --- a/plugins/network-elements/f5/pom.xml +++ b/plugins/network-elements/f5/pom.xml @@ -1,49 +1,49 @@ - - 4.0.0 - cloud-plugin-network-f5 - Apache CloudStack Plugin - F5 - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.axis - axis-jaxrpc - - - com.cloud.com.f5 - icontrol - 12.1 - - - org.apache.axis - axis - - - commons-discovery - commons-discovery - 0.5 - - + + 4.0.0 + cloud-plugin-network-f5 + Apache CloudStack Plugin - F5 + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.axis + axis-jaxrpc + + + com.cloud.com.f5 + icontrol + 12.1 + + + org.apache.axis + axis + + + commons-discovery + commons-discovery + + diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml index 62afd403961..64203879189 100644 --- a/plugins/network-elements/globodns/pom.xml +++ b/plugins/network-elements/globodns/pom.xml @@ -1,37 +1,36 @@ - 4.0.0 - cloud-plugin-network-globodns - Apache CloudStack Plugin - GloboDNS - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - com.globo.globodns - globodns-client - 0.0.23 - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-globodns + Apache CloudStack Plugin - GloboDNS + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + com.globo.globodns + globodns-client + + diff --git a/plugins/network-elements/internal-loadbalancer/pom.xml b/plugins/network-elements/internal-loadbalancer/pom.xml index fd99f67cb51..755456a660a 100644 --- a/plugins/network-elements/internal-loadbalancer/pom.xml +++ b/plugins/network-elements/internal-loadbalancer/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-network-internallb - Apache CloudStack Plugin - Network Internal Load Balancer - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-network-internallb + Apache CloudStack Plugin - Network Internal Load Balancer + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml index ec8a3ee9eae..94e3f010758 100644 --- a/plugins/network-elements/juniper-contrail/pom.xml +++ b/plugins/network-elements/juniper-contrail/pom.xml @@ -1,148 +1,142 @@ - - 4.0.0 - cloud-plugin-network-contrail - Apache CloudStack Plugin - Network Juniper Contrail - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - juniper-contrail - http://juniper.github.io/contrail-maven/snapshots - - - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-server - ${project.version} - - - org.apache.cloudstack - cloud-plugin-hypervisor-xenserver - ${project.version} - test - - - org.apache.cloudstack - cloud-plugin-network-internallb - ${project.version} - - - org.apache.cloudstack - cloud-engine-orchestration - ${project.version} - test - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - - org.apache.cloudstack - cloud-framework-events - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - xml-apis - xml-apis - - - - - org.apache.cloudstack - cloud-framework-spring-lifecycle - ${project.version} - test - - - org.eclipse.jetty - jetty-security - ${cs.jetty.version} - test - - - com.google.guava - guava - - - net.juniper.contrail - juniper-contrail-api - 1.0-SNAPSHOT - - - mysql - mysql-connector-java - provided - - - org.apache.commons - commons-exec - 1.3 - - - org.mockito - mockito-all - 1.10.19 - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - always - -Xmx1024m - - **/NetworkProviderTest.java - **/PublicNetworkTest.java - - - - - + + 4.0.0 + cloud-plugin-network-contrail + Apache CloudStack Plugin - Network Juniper Contrail + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + juniper-contrail + http://juniper.github.io/contrail-maven/snapshots + + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-server + ${project.version} + + + org.apache.cloudstack + cloud-plugin-hypervisor-xenserver + ${project.version} + test + + + org.apache.cloudstack + cloud-plugin-network-internallb + ${project.version} + + + org.apache.cloudstack + cloud-engine-orchestration + ${project.version} + test + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + + org.apache.cloudstack + cloud-framework-events + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + xml-apis + xml-apis + + + + + org.apache.cloudstack + cloud-framework-spring-lifecycle + ${project.version} + test + + + org.eclipse.jetty + jetty-security + ${cs.jetty.version} + test + + + com.google.guava + guava + + + net.juniper.contrail + juniper-contrail-api + 1.0-SNAPSHOT + + + mysql + mysql-connector-java + provided + + + org.apache.commons + commons-exec + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + always + -Xmx1024m + + **/NetworkProviderTest.java + **/PublicNetworkTest.java + + + + + diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml index ee8fbcbbbdb..b1adddbf366 100644 --- a/plugins/network-elements/juniper-srx/pom.xml +++ b/plugins/network-elements/juniper-srx/pom.xml @@ -1,40 +1,41 @@ - - 4.0.0 - cloud-plugin-network-srx - Apache CloudStack Plugin - Juniper SRX - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - com.cloud.com.f5 - icontrol - 1.0 - - - org.apache.axis - axis - - + + 4.0.0 + cloud-plugin-network-srx + Apache CloudStack Plugin - Juniper SRX + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + com.cloud.com.f5 + icontrol + 1.0 + + + org.apache.axis + axis + + diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index e920236f4fa..a541a897233 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -1,46 +1,46 @@ - - 4.0.0 - cloud-plugin-network-netscaler - Apache CloudStack Plugin - Network Netscaler - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - com.citrix.netscaler.nitro - nitro - ${cs.nitro.version} - - - com.citrix.netscaler.nitro - sdx_nitro - ${cs.nitro.version} - - - org.json - json - 20090211 - - + + 4.0.0 + cloud-plugin-network-netscaler + Apache CloudStack Plugin - Network Netscaler + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + com.citrix.netscaler.nitro + nitro + ${cs.nitro.version} + + + com.citrix.netscaler.nitro + sdx_nitro + ${cs.nitro.version} + + + org.json + json + + diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index 8d50cf79e93..7fb351a134a 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -1,87 +1,60 @@ - 4.0.0 - cloud-plugin-network-nvp - Apache CloudStack Plugin - Network Nicira NVP - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - - org.apache.cloudstack - cloud-utils - 4.12.0.0-SNAPSHOT - test-jar - test - - - - - - - com.mycila - license-maven-plugin - - - cloudstack-checklicence - process-classes - - check - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - - - - - - integration - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-nvp + Apache CloudStack Plugin - Network Nicira NVP + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + test-jar + test + + + + + integration + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + + + diff --git a/plugins/network-elements/nuage-vsp/pom.xml b/plugins/network-elements/nuage-vsp/pom.xml index 75ce01e9ec7..3f9987d6038 100644 --- a/plugins/network-elements/nuage-vsp/pom.xml +++ b/plugins/network-elements/nuage-vsp/pom.xml @@ -1,64 +1,46 @@ - - 4.0.0 - cloud-plugin-network-vsp - Apache CloudStack Plugin - Nuage VSP - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - nuage-vsp - http://cs.mv.nuagenetworks.net/releases/ - - - - 1.0.8 - - - - net.nuagenetworks.vsp - nuage-vsp-acs-client - ${nuage.vsp.client.version} - - - - - - com.mycila - license-maven-plugin - - - cloudstack-checklicence - process-classes - - check - - - - - - + + 4.0.0 + cloud-plugin-network-vsp + Apache CloudStack Plugin - Nuage VSP + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + nuage-vsp + http://cs.mv.nuagenetworks.net/releases/ + + + + 1.0.8 + + + + net.nuagenetworks.vsp + nuage-vsp-acs-client + ${nuage.vsp.client.version} + + diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml index 976ebc5ee48..09341eb4919 100644 --- a/plugins/network-elements/opendaylight/pom.xml +++ b/plugins/network-elements/opendaylight/pom.xml @@ -1,70 +1,51 @@ - - 4.0.0 - cloud-plugin-network-opendaylight - Apache CloudStack Plugin - Network Opendaylight - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - - - com.mycila - license-maven-plugin - - - cloudstack-checklicence - process-classes - - check - - - - - - - - - integration - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - + + 4.0.0 + cloud-plugin-network-opendaylight + Apache CloudStack Plugin - Network Opendaylight + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + integration + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + + + diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml index 53cf25544cc..5bf53cffac9 100644 --- a/plugins/network-elements/ovs/pom.xml +++ b/plugins/network-elements/ovs/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-network-ovs - Apache CloudStack Plugin - Open vSwitch - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-network-ovs + Apache CloudStack Plugin - Open vSwitch + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/network-elements/palo-alto/pom.xml b/plugins/network-elements/palo-alto/pom.xml index e22e76b6156..cd36a1f807a 100644 --- a/plugins/network-elements/palo-alto/pom.xml +++ b/plugins/network-elements/palo-alto/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-network-palo-alto - Apache CloudStack Plugin - Palo Alto - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-network-palo-alto + Apache CloudStack Plugin - Palo Alto + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/network-elements/stratosphere-ssp/pom.xml b/plugins/network-elements/stratosphere-ssp/pom.xml index 4e40fe3f88a..cdcc516556d 100644 --- a/plugins/network-elements/stratosphere-ssp/pom.xml +++ b/plugins/network-elements/stratosphere-ssp/pom.xml @@ -1,31 +1,31 @@ - 4.0.0 - cloud-plugin-network-ssp - Apache CloudStack Plugin - Stratosphere SSP - http://www.stratosphere.co.jp/ - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-network-ssp + Apache CloudStack Plugin - Stratosphere SSP + http://www.stratosphere.co.jp/ + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/network-elements/vxlan/pom.xml b/plugins/network-elements/vxlan/pom.xml index ccc7abf4c15..74809ad8da8 100644 --- a/plugins/network-elements/vxlan/pom.xml +++ b/plugins/network-elements/vxlan/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-network-vxlan - Apache CloudStack Plugin - Network VXLAN - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-network-vxlan + Apache CloudStack Plugin - Network VXLAN + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml index 0df7c0948f6..49a0f79945e 100644 --- a/plugins/outofbandmanagement-drivers/ipmitool/pom.xml +++ b/plugins/outofbandmanagement-drivers/ipmitool/pom.xml @@ -1,41 +1,42 @@ - - 4.0.0 - cloud-plugin-outofbandmanagement-driver-ipmitool - Apache CloudStack Plugin - Power Management Driver ipmitool - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - + + 4.0.0 + cloud-plugin-outofbandmanagement-driver-ipmitool + Apache CloudStack Plugin - Power Management Driver ipmitool + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml index 9b126db7f7c..2fc372ba419 100644 --- a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml +++ b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml @@ -1,46 +1,46 @@ - - 4.0.0 - cloud-plugin-outofbandmanagement-driver-nested-cloudstack - Apache CloudStack Plugin - Power Management Driver nested-cloudstack - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - br.com.autonomiccs - apache-cloudstack-java-client - 1.0.9 - - + + 4.0.0 + cloud-plugin-outofbandmanagement-driver-nested-cloudstack + Apache CloudStack Plugin - Power Management Driver nested-cloudstack + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + br.com.autonomiccs + apache-cloudstack-java-client + + diff --git a/plugins/pom.xml b/plugins/pom.xml index 394a71bb85a..7e693af5bbe 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -1,214 +1,228 @@ - - 4.0.0 - cloudstack-plugins - Apache CloudStack Plugin POM - pom - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloudstack-plugins + Apache CloudStack Plugin POM + pom + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + false + + + + + + + + acl/dynamic-role-based + acl/static-role-based - - install - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - cloudstack-checkstyle - none - false - - - - - - - api/rate-limit - api/solidfire-intg-test - api/discovery - acl/static-role-based - acl/dynamic-role-based - affinity-group-processors/host-affinity - affinity-group-processors/host-anti-affinity - affinity-group-processors/explicit-dedication - ca/root-ca - deployment-planners/user-concentrated-pod - deployment-planners/user-dispersing - deployment-planners/implicit-dedication - ha-planners/skip-heurestics - host-allocators/random - dedicated-resources - hypervisors/ovm - hypervisors/xenserver - hypervisors/kvm - event-bus/rabbitmq - event-bus/inmemory - event-bus/kafka - hypervisors/baremetal - hypervisors/ucs - hypervisors/hyperv - hypervisors/ovm3 - metrics - network-elements/elastic-loadbalancer - network-elements/ovs - network-elements/juniper-contrail - network-elements/palo-alto - network-elements/netscaler - network-elements/nicira-nvp - network-elements/nuage-vsp - network-elements/bigswitch - network-elements/brocade-vcs - network-elements/stratosphere-ssp - network-elements/opendaylight - outofbandmanagement-drivers/ipmitool - outofbandmanagement-drivers/nested-cloudstack - storage-allocators/random - user-authenticators/ldap - user-authenticators/md5 - user-authenticators/pbkdf2 - user-authenticators/plain-text - user-authenticators/saml2 - user-authenticators/sha256salted - network-elements/dns-notifier - storage/image/s3 - storage/image/swift - storage/image/default - storage/image/sample - storage/volume/nexenta - storage/volume/solidfire - storage/volume/cloudbyte - storage/volume/default - storage/volume/sample - alert-handlers/snmp-alerts - alert-handlers/syslog-alerts - network-elements/internal-loadbalancer - network-elements/vxlan - network-elements/globodns - database/quota - integrations/cloudian - integrations/prometheus - + affinity-group-processors/explicit-dedication + affinity-group-processors/host-affinity + affinity-group-processors/host-anti-affinity - - - org.apache.cloudstack - cloud-server - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - test-jar - test - - + alert-handlers/snmp-alerts + alert-handlers/syslog-alerts - - - f5 - - - noredist - - - - network-elements/f5 - - - - srx - - - noredist - - - - network-elements/juniper-srx - - - - vmware - - - noredist - - - - hypervisors/vmware - network-elements/cisco-vnmc - - - - vmware-sioc - - - noredist - - - - api/vmware-sioc - - - - mysqlha - - - noredist - - - - database/mysql-ha - - - - simulator - - - simulator - - - - hypervisors/simulator - - - + api/discovery + api/rate-limit + api/solidfire-intg-test + + ca/root-ca + + database/quota + + dedicated-resources + + deployment-planners/implicit-dedication + deployment-planners/user-concentrated-pod + deployment-planners/user-dispersing + + event-bus/inmemory + event-bus/kafka + event-bus/rabbitmq + + ha-planners/skip-heurestics + + host-allocators/random + + hypervisors/baremetal + hypervisors/hyperv + hypervisors/kvm + hypervisors/ovm3 + hypervisors/ovm + hypervisors/ucs + hypervisors/xenserver + + integrations/cloudian + integrations/prometheus + + metrics + + network-elements/bigswitch + network-elements/dns-notifier + network-elements/juniper-contrail + network-elements/elastic-loadbalancer + network-elements/globodns + network-elements/internal-loadbalancer + network-elements/netscaler + network-elements/nicira-nvp + network-elements/opendaylight + network-elements/ovs + network-elements/palo-alto + network-elements/stratosphere-ssp + network-elements/brocade-vcs + network-elements/nuage-vsp + network-elements/vxlan + + outofbandmanagement-drivers/ipmitool + outofbandmanagement-drivers/nested-cloudstack + + storage/image/default + storage/image/s3 + storage/image/sample + storage/image/swift + storage/volume/cloudbyte + storage/volume/default + storage/volume/nexenta + storage/volume/sample + storage/volume/solidfire + + storage-allocators/random + + user-authenticators/ldap + user-authenticators/md5 + user-authenticators/pbkdf2 + user-authenticators/plain-text + user-authenticators/saml2 + user-authenticators/sha256salted + + + + org.apache.cloudstack + cloud-server + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + test-jar + test + + + + + f5 + + + noredist + + + + network-elements/f5 + + + + srx + + + noredist + + + + network-elements/juniper-srx + + + + vmware + + + noredist + + + + hypervisors/vmware + network-elements/cisco-vnmc + + + + vmware-sioc + + + noredist + + + + api/vmware-sioc + + + + mysqlha + + + noredist + + + + database/mysql-ha + + + + simulator + + + simulator + + + + hypervisors/simulator + + + diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml index 38f0c45f200..511d31e5fac 100644 --- a/plugins/storage-allocators/random/pom.xml +++ b/plugins/storage-allocators/random/pom.xml @@ -1,37 +1,37 @@ - 4.0.0 - cloud-plugin-storage-allocator-random - Apache CloudStack Plugin - Storage Allocator Random - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-allocator-random + Apache CloudStack Plugin - Storage Allocator Random + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + diff --git a/plugins/storage/image/default/pom.xml b/plugins/storage/image/default/pom.xml index fd27388537e..e64efb21859 100644 --- a/plugins/storage/image/default/pom.xml +++ b/plugins/storage/image/default/pom.xml @@ -1,62 +1,70 @@ - + - 4.0.0 - cloud-plugin-storage-image-default - Apache CloudStack Plugin - Storage Image default provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-image - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-snapshot - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-image-default + Apache CloudStack Plugin - Storage Image default provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-image + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-snapshot + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/plugins/storage/image/s3/pom.xml b/plugins/storage/image/s3/pom.xml index 8852f3ac82f..1eac819959e 100644 --- a/plugins/storage/image/s3/pom.xml +++ b/plugins/storage/image/s3/pom.xml @@ -1,51 +1,52 @@ - - 4.0.0 - cloud-plugin-storage-image-s3 - Apache CloudStack Plugin - Storage Image S3 provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-image - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-snapshot - ${project.version} - - + + 4.0.0 + cloud-plugin-storage-image-s3 + Apache CloudStack Plugin - Storage Image S3 provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-image + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-snapshot + ${project.version} + + diff --git a/plugins/storage/image/sample/pom.xml b/plugins/storage/image/sample/pom.xml index 55402da6aba..1db337e084b 100644 --- a/plugins/storage/image/sample/pom.xml +++ b/plugins/storage/image/sample/pom.xml @@ -1,62 +1,70 @@ - + - 4.0.0 - cloud-plugin-storage-image-sample - Apache CloudStack Plugin - Storage Image sample provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-image - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-snapshot - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-image-sample + Apache CloudStack Plugin - Storage Image sample provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-image + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-snapshot + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/plugins/storage/image/swift/pom.xml b/plugins/storage/image/swift/pom.xml index b243cfaa890..5835c95541a 100644 --- a/plugins/storage/image/swift/pom.xml +++ b/plugins/storage/image/swift/pom.xml @@ -1,62 +1,70 @@ - + - 4.0.0 - cloud-plugin-storage-image-swift - Apache CloudStack Plugin - Storage Image Swift provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-image - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-snapshot - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-image-swift + Apache CloudStack Plugin - Storage Image Swift provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-image + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-snapshot + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml index 9794583c348..d3ae8d22d01 100644 --- a/plugins/storage/volume/cloudbyte/pom.xml +++ b/plugins/storage/volume/cloudbyte/pom.xml @@ -1,92 +1,73 @@ - 4.0.0 - cloud-plugin-storage-volume-cloudbyte - Apache CloudStack Plugin - Storage Volume CloudByte Provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - org.apache.cloudstack - cloud-plugin-storage-volume-default - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - mysql - mysql-connector-java - ${cs.mysql.version} - provided - - - com.google.code.gson - gson - ${cs.gson.version} - - - com.sun.jersey - jersey-bundle - 1.19.4 - - - - install - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - com.mycila - license-maven-plugin - - - cloudstack-checklicence - process-classes - - check - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-volume-cloudbyte + Apache CloudStack Plugin - Storage Volume CloudByte Provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + org.apache.cloudstack + cloud-plugin-storage-volume-default + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + mysql + mysql-connector-java + provided + + + com.google.code.gson + gson + + + com.sun.jersey + jersey-bundle + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/plugins/storage/volume/default/pom.xml b/plugins/storage/volume/default/pom.xml index dc84c27cedb..645fa37c4a2 100644 --- a/plugins/storage/volume/default/pom.xml +++ b/plugins/storage/volume/default/pom.xml @@ -1,47 +1,55 @@ - + - 4.0.0 - cloud-plugin-storage-volume-default - Apache CloudStack Plugin - Storage Volume default provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-volume-default + Apache CloudStack Plugin - Storage Volume default provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/plugins/storage/volume/nexenta/pom.xml b/plugins/storage/volume/nexenta/pom.xml index 5698f38ab46..add8f3dba25 100644 --- a/plugins/storage/volume/nexenta/pom.xml +++ b/plugins/storage/volume/nexenta/pom.xml @@ -1,47 +1,55 @@ - + - 4.0.0 - cloud-plugin-storage-volume-nexenta - Apache CloudStack Plugin - Storage Volume Nexenta Provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-volume-nexenta + Apache CloudStack Plugin - Storage Volume Nexenta Provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/plugins/storage/volume/sample/pom.xml b/plugins/storage/volume/sample/pom.xml index 7eb60fe5bb2..c66855bef12 100644 --- a/plugins/storage/volume/sample/pom.xml +++ b/plugins/storage/volume/sample/pom.xml @@ -1,47 +1,55 @@ - + - 4.0.0 - cloud-plugin-storage-volume-sample - Apache CloudStack Plugin - Storage Volume sample provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-volume-sample + Apache CloudStack Plugin - Storage Volume sample provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml index 07c31506863..0fbac7382f0 100644 --- a/plugins/storage/volume/solidfire/pom.xml +++ b/plugins/storage/volume/solidfire/pom.xml @@ -1,66 +1,74 @@ - + - 4.0.0 - cloud-plugin-storage-volume-solidfire - Apache CloudStack Plugin - Storage Volume SolidFire Provider - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../../pom.xml - - - - com.solidfire - solidfire-sdk-java - 1.2.0.29 - - - org.apache.cloudstack - cloud-plugin-storage-volume-default - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-volume - ${project.version} - - - com.google.code.gson - gson - - - org.aspectj - aspectjtools - test - - - - - - maven-surefire-plugin - - true - - - - integration-test - - test - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-storage-volume-solidfire + Apache CloudStack Plugin - Storage Volume SolidFire Provider + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../../pom.xml + + + + com.solidfire + solidfire-sdk-java + 1.2.0.29 + + + org.apache.cloudstack + cloud-plugin-storage-volume-default + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-volume + ${project.version} + + + com.google.code.gson + gson + + + org.aspectj + aspectjtools + test + + + + + + maven-surefire-plugin + + true + + + + integration-test + + test + + + + + + diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index 1f5ebddbea9..43151b603d0 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -1,112 +1,118 @@ - + - 4.0.0 - cloud-plugin-user-authenticator-ldap - Apache CloudStack Plugin - User Authenticator LDAP - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-plugin-user-authenticator-ldap + Apache CloudStack Plugin - User Authenticator LDAP + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + + org.codehaus.gmaven + gmaven-plugin + 1.3 + + 1.7 + + + + + compile + testCompile + + + + + test + + groovy/**/*.groovy + + + + + + + + + org.codehaus.gmaven.runtime + gmaven-runtime-1.7 + 1.3 + + + org.codehaus.groovy + groovy-all + + + + + org.codehaus.groovy + groovy-all + ${cs.groovy.version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Spec.groovy + **/*Test.java + + + + + com.btmatthews.maven.plugins + ldap-maven-plugin + 1.1.0 + + 11389 + ldap + false + dc=cloudstack,dc=org + 10389 + test/resources/cloudstack.org.ldif + + + + test + + + + + org.spockframework + spock-core + 1.1-groovy-2.4 + test + - - - - org.codehaus.gmaven - gmaven-plugin - 1.3 - - 1.7 - - - - - compile - testCompile - - - - - test - - groovy/**/*.groovy - - - - - - - - - org.codehaus.gmaven.runtime - gmaven-runtime-1.7 - 1.3 - - - org.codehaus.groovy - groovy-all - - - - - org.codehaus.groovy - groovy-all - 2.0.5 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Spec.groovy - **/*Test.java - - - - - - com.btmatthews.maven.plugins - ldap-maven-plugin - 1.1.0 - - 11389 - ldap - false - dc=cloudstack,dc=org - 10389 - test/resources/cloudstack.org.ldif - - - - - test - - - - - org.spockframework - spock-core - 1.1-groovy-2.4 - test - - - - - cglib - cglib-nodep - test - - + + + cglib + cglib-nodep + test + + diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml index 28ad8e30475..87b61a79dbd 100644 --- a/plugins/user-authenticators/md5/pom.xml +++ b/plugins/user-authenticators/md5/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-user-authenticator-md5 - Apache CloudStack Plugin - User Authenticator MD5 - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-user-authenticator-md5 + Apache CloudStack Plugin - User Authenticator MD5 + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/user-authenticators/pbkdf2/pom.xml b/plugins/user-authenticators/pbkdf2/pom.xml index 8a0db281546..a5d6b9e0e33 100644 --- a/plugins/user-authenticators/pbkdf2/pom.xml +++ b/plugins/user-authenticators/pbkdf2/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-user-authenticator-pbkdf2 - Apache CloudStack Plugin - User Authenticator PBKDF2-SHA-256 - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-user-authenticator-pbkdf2 + Apache CloudStack Plugin - User Authenticator PBKDF2-SHA-256 + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml index 77365cb35c1..d5989a489e8 100644 --- a/plugins/user-authenticators/plain-text/pom.xml +++ b/plugins/user-authenticators/plain-text/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-user-authenticator-plaintext - Apache CloudStack Plugin - User Authenticator Plain Text - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-user-authenticator-plaintext + Apache CloudStack Plugin - User Authenticator Plain Text + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml index c53fa6a48a8..769a36413c8 100644 --- a/plugins/user-authenticators/saml2/pom.xml +++ b/plugins/user-authenticators/saml2/pom.xml @@ -1,57 +1,57 @@ - - 4.0.0 - cloud-plugin-user-authenticator-saml2 - Apache CloudStack Plugin - User Authenticator SAML2 - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - org.opensaml - opensaml - ${cs.opensaml.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - - xerces - xercesImpl - 2.11.0 - test - - + + 4.0.0 + cloud-plugin-user-authenticator-saml2 + Apache CloudStack Plugin - User Authenticator SAML2 + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.opensaml + opensaml + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + + xerces + xercesImpl + ${cs.xercesImpl.version} + test + + diff --git a/plugins/user-authenticators/sha256salted/pom.xml b/plugins/user-authenticators/sha256salted/pom.xml index 0b9310146d2..9d45502703a 100644 --- a/plugins/user-authenticators/sha256salted/pom.xml +++ b/plugins/user-authenticators/sha256salted/pom.xml @@ -1,29 +1,30 @@ - - 4.0.0 - cloud-plugin-user-authenticator-sha256salted - Apache CloudStack Plugin - User Authenticator SHA256 Salted - - org.apache.cloudstack - cloudstack-plugins - 4.12.0.0-SNAPSHOT - ../../pom.xml - + + 4.0.0 + cloud-plugin-user-authenticator-sha256salted + Apache CloudStack Plugin - User Authenticator SHA256 Salted + + org.apache.cloudstack + cloudstack-plugins + 4.12.0.0-SNAPSHOT + ../../pom.xml + diff --git a/pom.xml b/pom.xml index cbe422e2079..7f8d3e0d747 100644 --- a/pom.xml +++ b/pom.xml @@ -1,1194 +1,1268 @@ + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> - 4.0.0 - - - org.apache - apache - 11 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - pom - Apache CloudStack - Apache CloudStack is an IaaS ("Infrastructure as a Service") cloud orchestration platform. - http://www.cloudstack.org - - scm:git:https://gitbox.apache.org/repos/asf/cloudstack.git - scm:git:https://gitbox.apache.org/repos/asf/cloudstack.git - - - jira - https://issues.apache.org/jira/browse/CLOUDSTACK - + + org.apache + apache + 11 + + - - 1.8 - UTF-8 - UTF-8 + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + pom + Apache CloudStack + Apache CloudStack is an IaaS ("Infrastructure as a Service") cloud orchestration platform. + http://www.cloudstack.org - 1.2.17 - 1.2.17 - 3.2.5 - 2.2.0 - 2.4.3 - 1.11 - 1.10 - 1.1.1 - 0.5 - - - 4.12 - 1.3 - 1.13.1 - 1.59 - 0.1.54 - 2.2.0 - 1.9.2 - 1.0.0-build221 - 2.6.11 - 1.7.2 - 18.0 - 23.6-jre - 6.2.0-3.1 - 4.5.4 - 4.4.8 - 3.1 - 5.1.34 - 1.4.10 - 3.1.3 - 1.5.0-b01 - 1.4 - 1.5.6 - 1.5.1 - 1.2.8 - 2.0.4 - 4.0.0 - 1.2 - 1.2.1 - 1.0-20081010.060147 - 6.7 - 5.0.2.RELEASE - 1.10.19 - 1.6.4 - 1.11.213 - 2.9.2 - 2.6 - 3.6 - 2.6 - 1.3.3 - 4.1 - 1.6 - 0.9.11 - 3.22.0-GA - 0.16 - build/replace.properties - 0.5.1 - 0.2.0 - target - 1.1.0 - 4.0.0 - 3.0.0 - 8.7 - 2.11 - 3.0.3 - 2.10.3 - 2.6.4 - 1.4.01 - 2.8.1 - 1.9.1 - 2.5.8_1 - 3.2.0 - 2.4.12 - 10.1 - 2.11.0 - 9.4.8.v20171121 - 9.2.22.v20170606 - + + scm:git:https://gitbox.apache.org/repos/asf/cloudstack.git + scm:git:https://gitbox.apache.org/repos/asf/cloudstack.git + - - - apache.cloudstack.site - ${site.deploy.url} - - + + Github + https://github.com/apache/cloudstack/issues + - 2012 + + + UTF-8 + UTF-8 - - - Apache CloudStack User List - users-subscribe@cloudstack.apache.org - users-unsubscribe@cloudstack.apache.org - users@cloudstack.apache.org - http://mail-archives.apache.org/mod_mbox/cloudstack-users - - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users - - - - Apache CloudStack Developer List - dev-subscribe@cloudstack.apache.org - dev-unsubscribe@cloudstack.apache.org - dev@cloudstack.apache.org - http://mail-archives.apache.org/mod_mbox/cloudstack-dev - - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev - - - - Apache CloudStack Commits List - commits-subscribe@cloudstack.apache.org - commits-unsubscribe@cloudstack.apache.org - commits@cloudstack.apache.org - http://mail-archives.apache.org/mod_mbox/cloudstack-commits - - http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits - - - + + 1.8 + target + build/replace.properties - - - The Apache CloudStack Team - dev@cloudstack.apache.org - http://cloudstack.apache.org/ - Apache Software Foundation - http://apache.org/ - - + + 1.8 + 3.0.0 + 3.0.0 + 2.7 + 3.7.0 + 3.1.0 + 2.21.0 + 3.0.5 + 3.1.0 + 3.9.0 + 2.9 + 2.5.3 + 3.1.0 + 3.7.1 + 2.21.0 - - Jenkins - http://builds.apache.org/ - + + 1.2.17 + 1.2.17 + 1.1.1 - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - + + 1.11 + 4.1 + 1.15 + 1.3 + 1.3.3 + 3.1 + 2.6 + 3.6 + 3.6 + 1.6 + 1.10 + 1.1.0 + 2.2.0 + 0.5 + 2.6 + 2.4.3 - - The Apache Software Foundation - http://www.apache.org/ - + + + 2.5.4 + 1.3 + 4.12 + 1.13.1 + 18.0 + 1.10.19 + 1.6.4 + 1.0-20081010.060147 + 1.0.1 + 6.1.1 + 2.11.0 + 2.11.0 - - tools/checkstyle - api - agent - core - server - usage - utils - engine - plugins - framework - client - services - quickcloud - + + 5.1.1 + 1.0.9 + 1.7.1 + 1.11.213 + 1.2.8 + 1.4 + 1.5.6 + 1.9.1 + 1.59 + 3.2.5 + 8.7 + 3.2.0 + 2.6.11 + 0.0.23 + 2.4.12 + 1.7.2 + 23.6-jre + 4.5.4 + 4.4.8 + 2.9.2 + 1.9.2 + 0.16 + 3.22.0-GA + 2.10.3 + 1.19.4 + 9.4.8.v20171121 + 9.2.22.v20170606 + 4.0.0 + 2.8.1 + 2.2.0 + 0.1.54 + 20090211 + 1.2 + 1.2.1 + 0.11.0.1 + 0.5.1 + 1.5.0-b01 + 5.1.34 + 2.0.4 + 10.1 + 2.6.4 + 0.2.0 + 1.5.1 + 0.9.11 + 2.5.8_1 + 4.0.0 + 8.0.30 + 1.0.0-build221 + 6.5 + 6.2.0-3.1 + 1.4.01 + 3.1.3 + 1.4.10 + 5.0.2.RELEASE + + + + + apache.cloudstack.site + ${site.deploy.url} + + + + 2012 + + + + Apache CloudStack User List + users-subscribe@cloudstack.apache.org + users-unsubscribe@cloudstack.apache.org + users@cloudstack.apache.org + http://mail-archives.apache.org/mod_mbox/cloudstack-users + + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-users + + + + Apache CloudStack Developer List + dev-subscribe@cloudstack.apache.org + dev-unsubscribe@cloudstack.apache.org + dev@cloudstack.apache.org + http://mail-archives.apache.org/mod_mbox/cloudstack-dev + + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-dev + + + + Apache CloudStack Commits List + commits-subscribe@cloudstack.apache.org + commits-unsubscribe@cloudstack.apache.org + commits@cloudstack.apache.org + http://mail-archives.apache.org/mod_mbox/cloudstack-commits + + http://mail-archives.apache.org/mod_mbox/incubator-cloudstack-commits + + + + + + + The Apache CloudStack Team + dev@cloudstack.apache.org + http://cloudstack.apache.org/ + Apache Software Foundation + http://apache.org/ + + + + + Jenkins + http://builds.apache.org/ + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + The Apache Software Foundation + http://www.apache.org/ + + + + tools/checkstyle + api + agent + core + server + usage + utils + engine + plugins + framework + client + services + quickcloud + + + + + + + br.com.autonomiccs + apache-cloudstack-java-client + ${cs.apache-cloudstack-java-client.version} + + + cglib + cglib-nodep + ${cs.cglib.version} + + + com.amazonaws + aws-java-sdk-core + ${cs.aws.sdk.version} + + + com.amazonaws + aws-java-sdk-s3 + ${cs.aws.sdk.version} + + + com.globo.globodns + globodns-client + ${cs.globodns-client.version} + + + com.google.code.gson + gson + ${cs.gson.version} + + + com.google.guava + guava + ${cs.guava.version} + + + com.googlecode.java-ipv6 + java-ipv6 + ${cs.java-ipv6.version} + + + com.jcraft + jsch + ${cs.jsch.version} + + + com.rabbitmq + amqp-client + ${cs.amqp-client.version} + + + com.sun.jersey + jersey-bundle + ${cs.jersey-bundle.version} + + + com.thoughtworks.xstream + xstream + ${cs.xstream.version} + + + com.trilead + trilead-ssh2 + ${cs.trilead.version} + + + commons-codec + commons-codec + ${cs.codec.version} + + + commons-configuration + commons-configuration + ${cs.configuration.version} + + + commons-daemon + commons-daemon + ${cs.daemon.version} + + + org.apache.commons + commons-dbcp2 + ${cs.dbcp.version} + + + org.apache.commons + commons-pool2 + + + + + commons-discovery + commons-discovery + ${cs.discovery.version} + + + commons-fileupload + commons-fileupload + ${cs.commons-fileupload.version} + + + commons-io + commons-io + ${cs.commons-io.version} + + + commons-lang + commons-lang + ${cs.lang.version} + + + commons-net + commons-net + ${cs.commons-net.version} + + + org.apache.commons + commons-pool2 + ${cs.pool.version} + + + commons-validator + commons-validator + ${cs.commons-validator.version} + + + javax.mail + mail + ${cs.mail.version} + + + javax.servlet + javax.servlet-api + ${cs.servlet.version} + + + jstl + jstl + ${cs.jstl.version} + + + log4j + apache-log4j-extras + ${cs.log4j.extras.version} + + + log4j + log4j + + + + + log4j + log4j + ${cs.log4j.version} + + + mysql + mysql-connector-java + ${cs.mysql.version} + provided,test + + + net.sf.ehcache + ehcache-core + ${cs.ehcache.version} + + + org.apache.axis + axis + ${cs.axis.version} + + + org.apache.axis + axis-jaxrpc + ${cs.axis.version} + + + org.apache.commons + commons-collections4 + ${cs.commons-collections.version} + + + org.apache.commons + commons-compress + ${cs.commons-compress.version} + + + org.apache.commons + commons-exec + ${cs.commons-exec.version} + + + org.apache.commons + commons-lang3 + ${cs.commons-lang3.version} + + + org.apache.httpcomponents + httpclient + ${cs.httpclient.version} + + + org.apache.httpcomponents + httpcore + ${cs.httpcore.version} + + + org.apache.kafka + kafka-clients + ${cs.kafka-clients.version} + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.snmp4j + ${cs.servicemix.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${cs.tomcat-embed-core.version} + + + org.apache.xmlgraphics + batik-css + ${cs.batik.version} + + + org.apache.xmlgraphics + batik-ext + ${cs.batik.version} + + + org.apache.xmlgraphics + batik-util + ${cs.batik.version} + + + org.aspectj + aspectjrt + ${cs.aspectjrt.version} + + + org.aspectj + aspectjtools + 1.8.13 + + + org.aspectj + aspectjweaver + 1.8.13 + + + org.bouncycastle + bcpkix-jdk15on + ${cs.bcprov.version} + + + org.bouncycastle + bcprov-jdk15on + ${cs.bcprov.version} + + + org.codehaus.groovy + groovy-all + ${cs.groovy.version} + + + org.eclipse.jetty + jetty-jmx + ${cs.jetty.version} + + + org.eclipse.jetty + jetty-server + ${cs.jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${cs.jetty.version} + + + org.eclipse.jetty + jetty-util + ${cs.jetty.version} + + + org.eclipse.jetty + jetty-webapp + ${cs.jetty.version} + + + org.eclipse.persistence + javax.persistence + ${cs.jpa.version} + + + org.jasypt + jasypt + ${cs.jasypt.version} + + + org.javassist + javassist + ${cs.javassist.version} + + + org.json + json + ${cs.json.version} + + + org.opensaml + opensaml + ${cs.opensaml.version} + + + org.owasp.esapi + esapi + 2.1.0.1 + + + + org.reflections + reflections + ${cs.reflections.version} + + + org.slf4j + slf4j-api + 1.7.22 + + + org.slf4j + slf4j-log4j12 + 1.7.22 + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-web + ${org.springframework.version} + + + org.testng + testng + ${cs.testng.version} + + + wsdl4j + wsdl4j + 1.6.3 + + + - - - org.codehaus.groovy - groovy-all - ${cs.groovy.version} - - - org.bouncycastle - bcprov-jdk15on - ${cs.bcprov.version} - - - org.bouncycastle - bcpkix-jdk15on - ${cs.bcprov.version} - - - org.apache.xmlgraphics - batik-css - ${cs.batik.version} - - - org.apache.xmlgraphics - batik-ext - ${cs.batik.version} - - - org.apache.xmlgraphics - batik-util - ${cs.batik.version} - - - org.apache.commons - commons-collections4 - ${cs.commons-collections.version} - - - mysql - mysql-connector-java - ${cs.mysql.version} - provided,test - - - log4j - log4j - ${cs.log4j.version} - - - org.springframework - spring-context - ${org.springframework.version} - - - cglib - cglib-nodep - ${cs.cglib.version} - - - org.apache.commons - commons-dbcp2 - ${cs.dbcp.version} - - - org.apache.commons - commons-pool2 - - - - - net.sf.ehcache - ehcache-core - ${cs.ehcache.version} - - - commons-codec - commons-codec - ${cs.codec.version} - - - commons-fileupload - commons-fileupload - ${cs.commons-fileupload.version} - - - org.apache.commons - commons-pool2 - ${cs.pool.version} - - - commons-validator - commons-validator - ${cs.commons-validator.version} - - - com.jcraft - jsch - ${cs.jsch.version} - - - org.jasypt - jasypt - ${cs.jasypt.version} - - - com.trilead - trilead-ssh2 - ${cs.trilead.version} - - - com.amazonaws - aws-java-sdk-core - ${cs.aws.sdk.version} - - - com.amazonaws - aws-java-sdk-s3 - ${cs.aws.sdk.version} - - - log4j - apache-log4j-extras - ${cs.log4j.extras.version} - - - log4j - log4j - - - - - com.googlecode.java-ipv6 - java-ipv6 - ${cs.java-ipv6.version} - - - commons-configuration - commons-configuration - ${cs.configuration.version} - - - commons-io - commons-io - ${cs.commons-io.version} - - - - org.reflections - reflections - ${cs.reflections.version} - - - org.javassist - javassist - ${cs.javassist.version} - - - org.owasp.esapi - esapi - 2.1.0.1 - - - org.eclipse.persistence - javax.persistence - ${cs.jpa.version} - - - org.springframework - spring-web - ${org.springframework.version} - - - javax.servlet - javax.servlet-api - ${cs.servlet.version} - - - org.apache.httpcomponents - httpcore - ${cs.httpcore.version} - - - org.apache.httpcomponents - httpclient - ${cs.httpclient.version} - - - com.thoughtworks.xstream - xstream - ${cs.xstream.version} - - - javax.mail - mail - ${cs.mail.version} - - - jstl - jstl - ${cs.jstl.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - com.google.code.gson - gson - ${cs.gson.version} - - - com.google.guava - guava - ${cs.guava.version} - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.snmp4j - ${cs.servicemix.version} - - - org.aspectj - aspectjtools - 1.8.13 - - - org.aspectj - aspectjweaver - 1.8.13 - - - org.apache.axis - axis - ${cs.axis.version} - - - commons-daemon - commons-daemon - ${cs.daemon.version} - - - org.apache.axis - axis-jaxrpc - ${cs.axis.version} - - - wsdl4j - wsdl4j - 1.6.3 - - - org.slf4j - slf4j-api - 1.7.22 - - - org.slf4j - slf4j-log4j12 - 1.7.22 - - - org.eclipse.jetty - jetty-server - ${cs.jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${cs.jetty.version} - - - org.eclipse.jetty - jetty-webapp - ${cs.jetty.version} - - - org.eclipse.jetty - jetty-jmx - ${cs.jetty.version} - - - org.eclipse.jetty - jetty-util - ${cs.jetty.version} - + + + org.hamcrest + hamcrest-all + ${cs.hamcrest.version} + test + + + org.mockito + mockito-all + ${cs.mockito.version} + test + + + hamcrest-core + org.hamcrest + + + + + junit + junit + ${cs.junit.version} + test + + + hamcrest-core + org.hamcrest + + + + + com.tngtech.java + junit-dataprovider + ${cs.junit.dataprovider.version} + test + + + org.powermock + powermock-module-junit4 + ${cs.powermock.version} + + + org.powermock + powermock-api-mockito + ${cs.powermock.version} + test + + + org.springframework + spring-test + ${org.springframework.version} + test + + + javax.inject + javax.inject + 1 + - - - - org.hamcrest - hamcrest-all - ${cs.hamcrest.version} - test - - - org.mockito - mockito-all - ${cs.mockito.version} - test - - - hamcrest-core - org.hamcrest - - - - - junit - junit - ${cs.junit.version} - test - - - hamcrest-core - org.hamcrest - - - - - com.tngtech.java - junit-dataprovider - ${cs.junit.dataprovider.version} - test - - - org.powermock - powermock-module-junit4 - ${cs.powermock.version} - - - org.powermock - powermock-api-mockito - ${cs.powermock.version} - test - - - org.springframework - spring-test - ${org.springframework.version} - test - - - javax.inject - javax.inject - 1 - - - - - install - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - cloudstack-checkstyle - none - false - - - - - com.mycila - license-maven-plugin - - - cloudstack-checklicence - none - - check - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - cloudstack-findbugs - none - - check - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${cs.checkstyle.version} - - - org.apache.cloudstack - checkstyle - ${project.version} - - - com.puppycrawl.tools - checkstyle - ${cs.checkstyle-lib.version} - - - - - cloudstack-checkstyle - validate - - check - - - - - true - cloud-style.xml - true - true - - ${project.basedir} - - **\/*.java - **\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/XmlToHtmlConverter*,**\/generated-sources\/**\/* - - - - com.mycila - license-maven-plugin - ${cs.mycila.license.version} - - - cloudstack-checklicence - process-classes - - check - - - - - true - true -
LICENSE.header
- - XML_STYLE - DOUBLESLASH_STYLE - SEMICOLON_STYLE - - false - - **/target/** - .settings/** - .checkstyle - .project - .classpath - .pmd* - - - - - maven-clean-plugin - - true - - - ${cs.target.dir} - - **/* - - - - dist - - **/* - - - - ${basedir} - - ${cs.target.dir} - dist - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.1 - - - default - - perform - - - pom.xml - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - + + install + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + false + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + cloudstack-findbugs + none + + check + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${cs.checkstyle-plugin.version} + + + org.apache.cloudstack + checkstyle + ${project.version} + + + com.puppycrawl.tools + checkstyle + ${cs.checkstyle-lib.version} + + + + + cloudstack-checkstyle + validate + + check + + + + + true + cloud-style.xml + true + true + + ${project.basedir} + + **\/*.java + **\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/XmlToHtmlConverter*,**\/generated-sources\/**\/* + + + + maven-clean-plugin + + true + + + ${cs.target.dir} + + **/* + + + + dist + + **/* + + + + ${basedir} + + ${cs.target.dir} + dist + + + + + + + org.apache.maven.plugins + maven-release-plugin + ${cs.release-plugin.version} + + + default + + perform + + + pom.xml + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-antrun-plugin + [1.7,) + + run + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.0,) + + copy-dependencies + + + + + + + + + org.codehaus.gmaven + gmaven-plugin + [1.3,) + + compile + testCompile + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + [2.11,) + + check + + + + + + + + + + + org.apache.maven.plugins maven-antrun-plugin - [1.7,) - - run - - - - - - - - + ${cs.antrun-plugin.version} + + + org.apache.rat + apache-rat-plugin + + + + check + + + + + 0 + false + + + **/*.log + **/*.patch + **/.classpath + **/.project + **/.idea/** + **/*.iml + **/.settings/** + **/*.crt + **/*.csr + **/*.key + **/authorized_keys + **/*.war + **/*.mar + **/*.jar + **/*.iso + **/*.tgz + **/*.zip + **/target/** + **/.vagrant + **/*.json + **/.checkstyle + **/*.md + .java-version + .python-version + .idea/ + .metadata/** + .git/** + .gitignore + CHANGES.md + CONTRIBUTING.md + README.md + INSTALL.md + build/build.number + debian/cloudstack-agent.dirs + debian/cloudstack-usage.dirs + debian/compat + debian/control + debian/dirs + debian/rules + debian/source/format + dist/console-proxy/js/jquery.js + plugins/hypervisors/hyperv/conf/agent.properties + plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln + plugins/hypervisors/hyperv/DotNet/ServerResource/packages/** + plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/** + plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/** + plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/** + plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config + plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config + plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj + plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.settings + scripts/installer/windows/acs_license.rtf + scripts/vm/systemvm/id_rsa.cloud + services/console-proxy/server/conf/agent.properties + services/console-proxy/server/conf/environment.properties + services/console-proxy/server/js/jquery.js + services/secondary-storage/conf/agent.properties + services/secondary-storage/conf/environment.properties + systemvm/agent/conf/agent.properties + systemvm/agent/conf/environment.properties + systemvm/agent/js/jquery.js + systemvm/agent/js/jquery.flot.navigate.js + systemvm/debian/** + test/integration/component/test_host_ha.sh + test/systemvm/README.md + tools/appliance/*/template.json + tools/cli/cloudmonkey.egg-info/* + tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf + tools/docker/Dockerfile + tools/docker/supervisord.conf + tools/logo/apache_cloudstack.png + tools/marvin/Marvin.egg-info/* + tools/marvin/marvin/sandbox/advanced/sandbox.cfg + tools/ngui/static/bootstrap/* + tools/ngui/static/js/lib/* + tools/transifex/.tx/config + ui/css/token-input-facebook.css + ui/l10n/* + ui/lib/flot/jquery.colorhelpers.js + ui/lib/flot/jquery.flot.crosshair.js + ui/lib/flot/jquery.flot.fillbetween.js + ui/lib/flot/jquery.flot.image.js + ui/lib/flot/jquery.flot.js + ui/lib/flot/jquery.flot.navigate.js + ui/lib/flot/jquery.flot.pie.js + ui/lib/flot/jquery.flot.resize.js + ui/lib/flot/jquery.flot.selection.js + ui/lib/flot/jquery.flot.stack.js + ui/lib/flot/jquery.flot.symbol.js + ui/lib/flot/jquery.flot.threshold.js + ui/lib/jquery-ui/css/jquery-ui.css + ui/lib/jquery-ui/index.html + ui/lib/jquery-ui/js/jquery-ui.js + ui/lib/jquery.cookies.js + ui/lib/jquery.easing.js + ui/lib/jquery.js + ui/lib/jquery.md5.js + ui/lib/jquery.validate.js + ui/lib/jquery.tokeninput.js + ui/lib/qunit/qunit.css + ui/lib/qunit/qunit.js + ui/lib/reset.css + ui/lib/require.js + utils/testsmallfileinactive + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${cs.compiler-plugin.version} + + ${cs.jdk.version} + ${cs.jdk.version} + true + 128m + 512m + -XDignore.symbol.file=true + + + + org.apache.maven.plugins + maven-jar-plugin + ${cs.jar-plugin.version} + + + false + + true + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${cs.builder-helper-plugin.version} + + + remove-old-installers + + remove-project-artifact + + + true + + + + + org.apache.maven.plugins maven-dependency-plugin - [2.0,) - - copy-dependencies - - - - - - - - - com.mycila - license-maven-plugin - [2.5,) - - format - check - - - - - - - - - org.codehaus.gmaven - gmaven-plugin - [1.3,) - - compile - testCompile - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - [2.11,) - - check - - - - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - org.apache.rat - apache-rat-plugin - - 0 - false - - CHANGES.md - README.md - INSTALL.md - CONTRIBUTING.md - tools/docker/Dockerfile - tools/docker/supervisord.conf - .java-version - .python-version - .idea/ - **/*.log - **/*.patch - **/.classpath - **/.project - **/.idea/** - **/*.iml - **/.settings/** - .metadata/** - .git/** - .gitignore - **/*.crt - **/*.csr - **/*.key - **/authorized_keys - **/*.war - **/*.mar - **/*.jar - **/*.iso - **/*.tgz - **/*.zip - **/target/** - **/.vagrant - **/*.json - build/build.number - services/console-proxy/server/js/jquery.js - debian/cloudstack-usage.dirs - debian/cloudstack-agent.dirs - debian/compat - debian/control - debian/dirs - debian/rules - debian/source/format - dist/console-proxy/js/jquery.js - plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln - plugins/hypervisors/hyperv/DotNet/ServerResource/packages/** - plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/** - plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/** - plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/** - plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config - plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config - plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj - plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.settings - plugins/hypervisors/hyperv/conf/agent.properties - scripts/vm/systemvm/id_rsa.cloud - services/console-proxy/server/conf/agent.properties - services/console-proxy/server/conf/environment.properties - services/secondary-storage/conf/agent.properties - services/secondary-storage/conf/environment.properties - test/systemvm/README.md - tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf - tools/appliance/*/template.json - tools/cli/cloudmonkey.egg-info/* - tools/marvin/Marvin.egg-info/* - ui/css/token-input-facebook.css - ui/l10n/* - ui/lib/flot/jquery.colorhelpers.js - ui/lib/flot/jquery.flot.crosshair.js - ui/lib/flot/jquery.flot.fillbetween.js - ui/lib/flot/jquery.flot.image.js - ui/lib/flot/jquery.flot.js - ui/lib/flot/jquery.flot.navigate.js - ui/lib/flot/jquery.flot.pie.js - ui/lib/flot/jquery.flot.resize.js - ui/lib/flot/jquery.flot.selection.js - ui/lib/flot/jquery.flot.stack.js - ui/lib/flot/jquery.flot.symbol.js - ui/lib/flot/jquery.flot.threshold.js - ui/lib/jquery-ui/css/jquery-ui.css - ui/lib/jquery-ui/index.html - ui/lib/jquery-ui/js/jquery-ui.js - ui/lib/jquery.cookies.js - ui/lib/jquery.easing.js - ui/lib/jquery.js - ui/lib/jquery.md5.js - ui/lib/jquery.validate.js - ui/lib/jquery.tokeninput.js - ui/lib/qunit/qunit.css - ui/lib/qunit/qunit.js - ui/lib/reset.css - ui/lib/require.js - utils/testsmallfileinactive - systemvm/agent/conf/agent.properties - systemvm/agent/conf/environment.properties - systemvm/agent/js/jquery.js - systemvm/agent/js/jquery.flot.navigate.js - systemvm/debian/** - tools/transifex/.tx/config - tools/logo/apache_cloudstack.png - tools/marvin/marvin/sandbox/advanced/sandbox.cfg - tools/ngui/static/bootstrap/* - tools/ngui/static/js/lib/* - **/.checkstyle - scripts/installer/windows/acs_license.rtf - **/*.md - test/integration/component/test_host_ha.sh - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - ${cs.jdk.version} - ${cs.jdk.version} - true - 128m - 512m - -XDignore.symbol.file=true - - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - false - - true - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - remove-old-installers - - remove-project-artifact - - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.9 - - - org.codehaus.mojo - cobertura-maven-plugin - - - html - xml - - - - - org.codehaus.mojo - findbugs-maven-plugin - ${cs.findbugs.version} - - - org.apache.cloudstack - checkstyle - ${project.version} - - - - Max - High - true - false - 2048 - findbugsExcludeFilter.xml - - - - cloudstack-findbugs - - check - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.3 - - - org.apache.cloudstack - checkstyle - ${project.version} - - - - false - - cloud-pmd.xml - - - - - cloudstack-pmd - - check - cpd-check - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 - - -Djava.security.egd=file:/dev/./urandom -noverify - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.18.1 - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - ${cs.findbugs.version} - - Low - Default - ${basedir}/findbugsExcludeFilter.xml - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${cs.javadoc.version} - - 128m - 1g - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - org.codehaus.mojo - cobertura-maven-plugin - 2.6 - - - org.apache.maven.plugins - maven-site-plugin - 3.4 - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - - - - systemvm - - - systemvm - - - - systemvm - - - - eclipse - - target-eclipse - - - - developer - - tools/devcloud/devcloud.cfg - - - test - developer - tools - - - - impatient - - tools/devcloud/devcloud.cfg - - - developer - - - - vmware - - - noredist - - - - vmware-base - - - - disablecheckstyle - + ${cs.dependency-plugin.version} + + + org.codehaus.mojo + cobertura-maven-plugin + + + html + xml + + + + + org.codehaus.mojo + findbugs-maven-plugin + ${cs.findbugs-plugin.version} + + + org.apache.cloudstack + checkstyle + ${project.version} + + + + Max + High + true + false + 2048 + findbugsExcludeFilter.xml + + + + cloudstack-findbugs + + check + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${cs.pmd-plugin.version} + + + org.apache.cloudstack + checkstyle + ${project.version} + + + + false + + cloud-pmd.xml + + + + + cloudstack-pmd + + check + cpd-check + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${cs.surefire-plugin.version} + + -Djava.security.egd=file:/dev/./urandom -noverify + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${cs.failsafe-plugin.version} + + + + + - - org.apache.maven.plugins - maven-checkstyle-plugin - - - cloudstack-checkstyle - none - true - - - + + org.codehaus.mojo + findbugs-maven-plugin + ${cs.findbugs-plugin.version} + + Low + Default + ${basedir}/findbugsExcludeFilter.xml + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${cs.javadoc.version} + + 128m + 1g + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${cs.project-info-plugin.version} + + + org.codehaus.mojo + cobertura-maven-plugin + ${cs.cobertura-plugin.version} + + + org.apache.maven.plugins + maven-site-plugin + ${cs.site-plugin.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${cs.resources-plugin.version} + - - - - enablefindbugs - - - - org.codehaus.mojo - findbugs-maven-plugin - - - cloudstack-findbugs - process-classes - true - - - - - - - - buildw - - - buildw - - - - tools/wix-cloudstack-maven-plugin - - - + + + + systemvm + + + systemvm + + + + systemvm + + + + eclipse + + target-eclipse + + + + developer + + tools/devcloud/devcloud.cfg + + + test + developer + tools + + + + impatient + + tools/devcloud/devcloud.cfg + + + developer + + + + vmware + + + noredist + + + + vmware-base + + + + disablecheckstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + true + + + + + + + + enablefindbugs + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + cloudstack-findbugs + process-classes + true + + + + + + + + buildw + + + buildw + + + + tools/wix-cloudstack-maven-plugin + + + diff --git a/quickcloud/pom.xml b/quickcloud/pom.xml index 133fa9b3b63..f39f9ec82f6 100644 --- a/quickcloud/pom.xml +++ b/quickcloud/pom.xml @@ -1,30 +1,30 @@ - 4.0.0 - cloud-quickcloud - Apache CloudStack Framework - QuickCloud - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - ../pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-quickcloud + Apache CloudStack Framework - QuickCloud + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + ../pom.xml + diff --git a/server/pom.xml b/server/pom.xml index ba8899d6552..e2461508932 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,233 +1,239 @@ - + - 4.0.0 - cloud-server - Apache CloudStack Server - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - - - - commons-io - commons-io - ${cs.commons-io.version} - - - org.springframework - spring-web - - - org.apache.cloudstack - cloud-core - ${project.version} - - - org.apache.cloudstack - cloud-framework-cluster - ${project.version} - - - org.apache.cloudstack - cloud-framework-security - ${project.version} - - - javax.servlet - javax.servlet-api - provided - - - org.apache.httpcomponents - httpcore - ${cs.httpcore.version} - - - org.apache.cloudstack - cloud-framework-ca - ${project.version} - - - org.apache.cloudstack - cloud-framework-jobs - ${project.version} - - - org.apache.httpcomponents - httpclient - - - com.thoughtworks.xstream - xstream - - - javax.mail - mail - - - commons-codec - commons-codec - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - xml-apis - xml-apis - - - - - org.apache.cloudstack - cloud-api - ${project.version} - test-jar - test - - - org.reflections - reflections - - - xml-apis - xml-apis - - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-framework-ipc - ${project.version} - - - org.apache.cloudstack - cloud-framework-events - ${project.version} - - - org.apache.cloudstack - cloud-framework-config - ${project.version} - - - org.apache.cloudstack - cloud-engine-components-api - ${project.version} - - - org.apache.cloudstack - cloud-framework-agent-lb - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-configdrive - ${project.version} - - - org.opensaml - opensaml - ${cs.opensaml.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-testCompile - test-compile - - - **/com/cloud/upgrade/*.java - **/com/cloud/async/*.java - - - - testCompile - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom - - %regex[.*[0-9]*To[0-9]*.*Test.*] - com/cloud/upgrade/AdvanceZone223To224UpgradeTest - com/cloud/upgrade/AdvanceZone217To224UpgradeTest - com/cloud/async/* - com/cloud/cluster/* - com/cloud/snapshot/* - com/cloud/storage/dao/* - com/cloud/vm/dao/* - com/cloud/api/ListPerfTest.java - com/cloud/network/security/SecurityGroupManagerImpl2Test.java - com/cloud/network/security/SecurityGroupManagerImpl2Test.java - com/cloud/vpc/VpcTestConfiguration.java - com/cloud/vpc/VpcApiUnitTest.java - com/cloud/vpc/VpcManagerTest.java - - - - - maven-antrun-plugin - - - generate-resource - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-server + Apache CloudStack Server + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + + + + commons-io + commons-io + + + org.springframework + spring-web + + + org.apache.cloudstack + cloud-core + ${project.version} + + + org.apache.cloudstack + cloud-framework-cluster + ${project.version} + + + org.apache.cloudstack + cloud-framework-security + ${project.version} + + + javax.servlet + javax.servlet-api + provided + + + org.apache.httpcomponents + httpcore + + + org.apache.cloudstack + cloud-framework-ca + ${project.version} + + + org.apache.cloudstack + cloud-framework-jobs + ${project.version} + + + org.apache.httpcomponents + httpclient + + + com.thoughtworks.xstream + xstream + + + javax.mail + mail + + + commons-codec + commons-codec + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + xml-apis + xml-apis + + + + + org.apache.cloudstack + cloud-api + ${project.version} + test-jar + test + + + org.reflections + reflections + + + xml-apis + xml-apis + + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-framework-ipc + ${project.version} + + + org.apache.cloudstack + cloud-framework-events + ${project.version} + + + org.apache.cloudstack + cloud-framework-config + ${project.version} + + + org.apache.cloudstack + cloud-engine-components-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-agent-lb + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-configdrive + ${project.version} + + + org.opensaml + opensaml + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-testCompile + test-compile + + + **/com/cloud/upgrade/*.java + **/com/cloud/async/*.java + + + + testCompile + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom + + %regex[.*[0-9]*To[0-9]*.*Test.*] + com/cloud/upgrade/AdvanceZone223To224UpgradeTest + com/cloud/upgrade/AdvanceZone217To224UpgradeTest + com/cloud/async/* + com/cloud/cluster/* + com/cloud/snapshot/* + com/cloud/storage/dao/* + com/cloud/vm/dao/* + com/cloud/api/ListPerfTest.java + com/cloud/network/security/SecurityGroupManagerImpl2Test.java + com/cloud/network/security/SecurityGroupManagerImpl2Test.java + com/cloud/vpc/VpcTestConfiguration.java + com/cloud/vpc/VpcApiUnitTest.java + com/cloud/vpc/VpcManagerTest.java + + + + + maven-antrun-plugin + + + generate-resource + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml deleted file mode 100644 index 29ee6ae59a3..00000000000 --- a/services/console-proxy-rdp/rdpconsole/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - 4.0.0 - rdpclient - cloudstack-service-console-proxy-rdpclient - jar - Apache CloudStack Console Proxy - RDP Client - - - org.apache.cloudstack - cloudstack-services - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - UTF-8 - - - - - junit - junit - ${cs.junit.version} - test - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - - org.apache.tomcat.embed - tomcat-embed-core - 8.0.30 - - - - org.bouncycastle - bcprov-jdk15on - ${cs.bcprov.version} - - - diff --git a/services/console-proxy/plugin/pom.xml b/services/console-proxy/plugin/pom.xml deleted file mode 100644 index 2041547561f..00000000000 --- a/services/console-proxy/plugin/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - cloud-plugin-console-proxy - Apache CloudStack Console Proxy - Plugin - - org.apache.cloudstack - cloudstack-service-console-proxy - 4.12.0.0-SNAPSHOT - ../pom.xml - - diff --git a/services/console-proxy/pom.xml b/services/console-proxy/pom.xml index 7018e0c2101..e96c8a7d5a8 100644 --- a/services/console-proxy/pom.xml +++ b/services/console-proxy/pom.xml @@ -1,39 +1,50 @@ - - 4.0.0 - cloudstack-service-console-proxy - Apache CloudStack Console Proxy - pom - - org.apache.cloudstack - cloudstack-services - 4.12.0.0-SNAPSHOT - ../pom.xml - - - install - - - - server - + + 4.0.0 + cloudstack-service-console-proxy + Apache CloudStack Console Proxy + pom + + org.apache.cloudstack + cloudstack-services + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + false + + + + + + + server + rdpconsole + diff --git a/services/console-proxy-rdp/rdpconsole/README.txt b/services/console-proxy/rdpconsole/README.txt similarity index 100% rename from services/console-proxy-rdp/rdpconsole/README.txt rename to services/console-proxy/rdpconsole/README.txt diff --git a/services/console-proxy/rdpconsole/pom.xml b/services/console-proxy/rdpconsole/pom.xml new file mode 100644 index 00000000000..ccfdbcc6fa1 --- /dev/null +++ b/services/console-proxy/rdpconsole/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + rdpclient + cloudstack-service-console-proxy-rdpclient + jar + Apache CloudStack Console Proxy - RDP Client + + org.apache.cloudstack + cloudstack-service-console-proxy + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + + org.apache.tomcat.embed + tomcat-embed-core + + + + org.bouncycastle + bcprov-jdk15on + + + diff --git a/services/console-proxy-rdp/rdpconsole/rdp-config.bat b/services/console-proxy/rdpconsole/rdp-config.bat similarity index 100% rename from services/console-proxy-rdp/rdpconsole/rdp-config.bat rename to services/console-proxy/rdpconsole/rdp-config.bat diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtKeyEventSource.java b/services/console-proxy/rdpconsole/src/main/java/common/AwtKeyEventSource.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtKeyEventSource.java rename to services/console-proxy/rdpconsole/src/main/java/common/AwtKeyEventSource.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtMouseEventSource.java b/services/console-proxy/rdpconsole/src/main/java/common/AwtMouseEventSource.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/AwtMouseEventSource.java rename to services/console-proxy/rdpconsole/src/main/java/common/AwtMouseEventSource.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java b/services/console-proxy/rdpconsole/src/main/java/common/BitmapOrder.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapOrder.java rename to services/console-proxy/rdpconsole/src/main/java/common/BitmapOrder.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapRectangle.java b/services/console-proxy/rdpconsole/src/main/java/common/BitmapRectangle.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/BitmapRectangle.java rename to services/console-proxy/rdpconsole/src/main/java/common/BitmapRectangle.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java b/services/console-proxy/rdpconsole/src/main/java/common/BufferedImageCanvas.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCanvas.java rename to services/console-proxy/rdpconsole/src/main/java/common/BufferedImageCanvas.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java b/services/console-proxy/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/common/BufferedImageCopyRectAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java b/services/console-proxy/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/common/BufferedImagePixelsAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java b/services/console-proxy/rdpconsole/src/main/java/common/Client.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/Client.java rename to services/console-proxy/rdpconsole/src/main/java/common/Client.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/CopyRectOrder.java b/services/console-proxy/rdpconsole/src/main/java/common/CopyRectOrder.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/CopyRectOrder.java rename to services/console-proxy/rdpconsole/src/main/java/common/CopyRectOrder.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java b/services/console-proxy/rdpconsole/src/main/java/common/KeyOrder.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/KeyOrder.java rename to services/console-proxy/rdpconsole/src/main/java/common/KeyOrder.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/MouseOrder.java b/services/console-proxy/rdpconsole/src/main/java/common/MouseOrder.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/MouseOrder.java rename to services/console-proxy/rdpconsole/src/main/java/common/MouseOrder.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/OrderType.java b/services/console-proxy/rdpconsole/src/main/java/common/OrderType.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/OrderType.java rename to services/console-proxy/rdpconsole/src/main/java/common/OrderType.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java b/services/console-proxy/rdpconsole/src/main/java/common/ScreenDescription.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/ScreenDescription.java rename to services/console-proxy/rdpconsole/src/main/java/common/ScreenDescription.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/SizeChangeListener.java b/services/console-proxy/rdpconsole/src/main/java/common/SizeChangeListener.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/SizeChangeListener.java rename to services/console-proxy/rdpconsole/src/main/java/common/SizeChangeListener.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/adapter/AwtBellAdapter.java b/services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtBellAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/adapter/AwtBellAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtBellAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java b/services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtCanvasAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/adapter/AwtClipboardAdapter.java b/services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtClipboardAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/adapter/AwtClipboardAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/common/adapter/AwtClipboardAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Any.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/Any.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Any.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/Any.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Asn1Constants.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/Asn1Constants.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Asn1Constants.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/Asn1Constants.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Asn1Integer.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/Asn1Integer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Asn1Integer.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/Asn1Integer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/BerType.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/BerType.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/BerType.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/BerType.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/BitString.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/BitString.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/BitString.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/BitString.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/ObjectID.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/ObjectID.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/ObjectID.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/ObjectID.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/OctetString.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/OctetString.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/OctetString.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/OctetString.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Sequence.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/Sequence.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Sequence.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/Sequence.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/SequenceOf.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/SequenceOf.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/SequenceOf.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/SequenceOf.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Tag.java b/services/console-proxy/rdpconsole/src/main/java/common/asn1/Tag.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/asn1/Tag.java rename to services/console-proxy/rdpconsole/src/main/java/common/asn1/Tag.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/IncrementalOption.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/IncrementalOption.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/IncrementalOption.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/IncrementalOption.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/IntOption.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/IntOption.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/IntOption.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/IntOption.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/NoArgumentForOptionException.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/NoArgumentForOptionException.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/NoArgumentForOptionException.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/NoArgumentForOptionException.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/Option.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/Option.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/Option.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/Option.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/OptionParser.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/OptionParser.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/OptionParser.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/OptionParser.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/OptionRequiredException.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/OptionRequiredException.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/OptionRequiredException.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/OptionRequiredException.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/StringArrayOption.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/StringArrayOption.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/StringArrayOption.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/StringArrayOption.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/StringEnumerationOption.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/StringEnumerationOption.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/StringEnumerationOption.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/StringEnumerationOption.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/StringOption.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/StringOption.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/StringOption.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/StringOption.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/UnknownOptionException.java b/services/console-proxy/rdpconsole/src/main/java/common/opt/UnknownOptionException.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/common/opt/UnknownOptionException.java rename to services/console-proxy/rdpconsole/src/main/java/common/opt/UnknownOptionException.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/RdpClient.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/RdpClient.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/RdpClient.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpKeyboardAdapter.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpKeyboardAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpKeyboardAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpKeyboardAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpMouseAdapter.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpMouseAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpMouseAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/adapter/AwtRdpMouseAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ClipboardDataFormat.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ClipboardState.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ClipboardState.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ClipboardState.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ClipboardState.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerClipRdrChannelRouter.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerClipRdrChannelRouter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerClipRdrChannelRouter.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerClipRdrChannelRouter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerClipboardCapabilitiesPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerClipboardCapabilitiesPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerClipboardCapabilitiesPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerClipboardCapabilitiesPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerFormatDataResponsePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerFormatDataResponsePDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerFormatDataResponsePDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerFormatDataResponsePDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerFormatListPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerFormatListPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerFormatListPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerFormatListPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerMonitorReadyPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerMonitorReadyPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/clip/ServerMonitorReadyPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/clip/ServerMonitorReadyPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/debug/ClientPacketSniffer.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/debug/ClientPacketSniffer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/debug/ClientPacketSniffer.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/debug/ClientPacketSniffer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/debug/PacketSniffer.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/debug/PacketSniffer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/debug/PacketSniffer.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/debug/PacketSniffer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/debug/ServerPacketSniffer.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/debug/ServerPacketSniffer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/debug/ServerPacketSniffer.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/debug/ServerPacketSniffer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/hyperv/ClientPreConnectionBlob.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/hyperv/ClientPreConnectionBlob.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/hyperv/ClientPreConnectionBlob.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/hyperv/ClientPreConnectionBlob.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspNegotiate.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspNegotiate.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspNegotiate.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspNegotiate.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspPubKeyAuth.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspPubKeyAuth.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspPubKeyAuth.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspPubKeyAuth.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspUserCredentials.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspUserCredentials.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspUserCredentials.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ClientNtlmsspUserCredentials.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/CryptoAlgos.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/CryptoAlgos.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/CryptoAlgos.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/CryptoAlgos.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/NegoFlags.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/NegoFlags.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/NegoFlags.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/NegoFlags.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmCompute.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmCompute.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmCompute.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmCompute.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmConstants.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmConstants.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmConstants.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmConstants.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmState.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmState.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmState.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/NtlmState.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/SecBuffer.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/SecBuffer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/SecBuffer.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/SecBuffer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspChallenge.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspChallenge.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspChallenge.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspChallenge.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspPubKeyPlus1.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspPubKeyPlus1.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspPubKeyPlus1.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/ServerNtlmsspPubKeyPlus1.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/AlgorithmIdentifier.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/AlgorithmIdentifier.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/AlgorithmIdentifier.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/AlgorithmIdentifier.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoData.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoData.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoData.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoData.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoItem.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoItem.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoItem.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/NegoItem.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/SubjectPublicKeyInfo.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/SubjectPublicKeyInfo.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/SubjectPublicKeyInfo.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/SubjectPublicKeyInfo.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCredentials.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCredentials.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCredentials.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCredentials.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCspDataDetail.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCspDataDetail.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCspDataDetail.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSCspDataDetail.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSPasswordCreds.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSPasswordCreds.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSPasswordCreds.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSPasswordCreds.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSRequest.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSSmartCardCreds.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSSmartCardCreds.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSSmartCardCreds.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/asn1/TSSmartCardCreds.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/package-info.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/package-info.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/ntlmssp/package-info.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/ntlmssp/package-info.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientConfirmActivePDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientFastPathPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientFastPathPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientFastPathPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientFastPathPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientInfoPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientInfoPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientInfoPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientInfoPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSAttachUserRequest.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSChannelJoinRequestServerMCSChannelConfirmPDUs.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSConnectInitial.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSConnectInitial.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSConnectInitial.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSConnectInitial.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSErectDomainRequest.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSErectDomainRequest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSErectDomainRequest.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientMCSErectDomainRequest.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientSynchronizePDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientTpkt.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientTpkt.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientTpkt.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientTpkt.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientX224ConnectionRequestPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientX224ConnectionRequestPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientX224ConnectionRequestPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientX224ConnectionRequestPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientX224DataPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientX224DataPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ClientX224DataPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ClientX224DataPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/RLEBitmapDecompression.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/RLEBitmapDecompression.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/RLEBitmapDecompression.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/RLEBitmapDecompression.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/RdpConstants.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/RdpConstants.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/RdpConstants.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/RdpConstants.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/RdpState.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/RdpState.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/RdpState.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/RdpState.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerBitmapUpdate.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUCooperate.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUCooperate.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUCooperate.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUCooperate.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUGrantedControl.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUGrantedControl.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUGrantedControl.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerControlPDUGrantedControl.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerDemandActivePDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerFastPath.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerFastPath.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerFastPath.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerFastPath.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerIOChannelRouter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerLicenseErrorPDUValidClient.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerLicenseErrorPDUValidClient.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerLicenseErrorPDUValidClient.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerLicenseErrorPDUValidClient.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSAttachUserConfirmPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSAttachUserConfirmPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSAttachUserConfirmPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSAttachUserConfirmPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSChannelJoinConfirmPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSChannelJoinConfirmPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSChannelJoinConfirmPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSChannelJoinConfirmPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSConnectResponse.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSConnectResponse.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSConnectResponse.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSConnectResponse.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerMCSPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerPaletteUpdate.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerPaletteUpdate.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerPaletteUpdate.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerPaletteUpdate.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerSynchronizePDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerSynchronizePDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerSynchronizePDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerSynchronizePDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerTpkt.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerTpkt.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerTpkt.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerTpkt.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerX224ConnectionConfirmPDU.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerX224ConnectionConfirmPDU.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerX224ConnectionConfirmPDU.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerX224ConnectionConfirmPDU.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerX224DataPdu.java b/services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerX224DataPdu.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/rdpclient/rdp/ServerX224DataPdu.java rename to services/console-proxy/rdpconsole/src/main/java/rdpclient/rdp/ServerX224DataPdu.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java b/services/console-proxy/rdpconsole/src/main/java/streamer/BaseElement.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BaseElement.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/BaseElement.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BufferPool.java b/services/console-proxy/rdpconsole/src/main/java/streamer/BufferPool.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/BufferPool.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/BufferPool.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java b/services/console-proxy/rdpconsole/src/main/java/streamer/ByteBuffer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ByteBuffer.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/ByteBuffer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSink.java b/services/console-proxy/rdpconsole/src/main/java/streamer/DataSink.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSink.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/DataSink.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java b/services/console-proxy/rdpconsole/src/main/java/streamer/DataSource.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/DataSource.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/DataSource.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Direction.java b/services/console-proxy/rdpconsole/src/main/java/streamer/Direction.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Direction.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/Direction.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java b/services/console-proxy/rdpconsole/src/main/java/streamer/Element.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Element.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/Element.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java b/services/console-proxy/rdpconsole/src/main/java/streamer/Event.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Event.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/Event.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java b/services/console-proxy/rdpconsole/src/main/java/streamer/InputStreamSource.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/InputStreamSource.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/InputStreamSource.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java b/services/console-proxy/rdpconsole/src/main/java/streamer/Link.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Link.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/Link.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java b/services/console-proxy/rdpconsole/src/main/java/streamer/OneTimeSwitch.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OneTimeSwitch.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/OneTimeSwitch.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Order.java b/services/console-proxy/rdpconsole/src/main/java/streamer/Order.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Order.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/Order.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java b/services/console-proxy/rdpconsole/src/main/java/streamer/OutputStreamSink.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/OutputStreamSink.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/OutputStreamSink.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java b/services/console-proxy/rdpconsole/src/main/java/streamer/Pipeline.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Pipeline.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/Pipeline.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java b/services/console-proxy/rdpconsole/src/main/java/streamer/PipelineImpl.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/PipelineImpl.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/PipelineImpl.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Queue.java b/services/console-proxy/rdpconsole/src/main/java/streamer/Queue.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/Queue.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/Queue.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java b/services/console-proxy/rdpconsole/src/main/java/streamer/SocketWrapper.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/SocketWrapper.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java b/services/console-proxy/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java b/services/console-proxy/rdpconsole/src/main/java/streamer/SyncLink.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SyncLink.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/SyncLink.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java b/services/console-proxy/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/apr/AprSocketSink.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java b/services/console-proxy/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/apr/AprSocketSource.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java b/services/console-proxy/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/apr/AprSocketWrapperImpl.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java b/services/console-proxy/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/bco/BcoSocketWrapperImpl.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/AssertingByteBuffer.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/AssertingByteBuffer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/AssertingByteBuffer.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/debug/AssertingByteBuffer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/Dumper.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/Dumper.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/Dumper.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/debug/Dumper.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/FakeSink.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/FakeSink.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/FakeSink.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/debug/FakeSink.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/FakeSource.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/FakeSource.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/FakeSource.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/debug/FakeSource.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockServer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockServer.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockServer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSink.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSink.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSink.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSink.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSource.java b/services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSource.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/debug/MockSource.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/debug/MockSource.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ssl/SSLState.java b/services/console-proxy/rdpconsole/src/main/java/streamer/ssl/SSLState.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ssl/SSLState.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/ssl/SSLState.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ssl/TrustAllX509TrustManager.java b/services/console-proxy/rdpconsole/src/main/java/streamer/ssl/TrustAllX509TrustManager.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ssl/TrustAllX509TrustManager.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/ssl/TrustAllX509TrustManager.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ssl/UpgradeSocketToSSL.java b/services/console-proxy/rdpconsole/src/main/java/streamer/ssl/UpgradeSocketToSSL.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/streamer/ssl/UpgradeSocketToSSL.java rename to services/console-proxy/rdpconsole/src/main/java/streamer/ssl/UpgradeSocketToSSL.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncClient.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/VncClient.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/VncClient.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/VncClient.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/adapter/AwtVncKeyboardAdapter.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/adapter/AwtVncKeyboardAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/adapter/AwtVncKeyboardAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/adapter/AwtVncKeyboardAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/adapter/AwtVncMouseAdapter.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/adapter/AwtVncMouseAdapter.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/adapter/AwtVncMouseAdapter.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/adapter/AwtVncMouseAdapter.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/EncodingsMessage.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/EncodingsMessage.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/EncodingsMessage.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/EncodingsMessage.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/FrameBufferUpdateRequest.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/FrameBufferUpdateRequest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/FrameBufferUpdateRequest.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/FrameBufferUpdateRequest.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/RGB888LE32PixelFormatRequest.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/RGB888LE32PixelFormatRequest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/RGB888LE32PixelFormatRequest.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/RGB888LE32PixelFormatRequest.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/RfbConstants.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/RfbConstants.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/RfbConstants.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/RfbConstants.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Hello.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncInitializer.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java b/services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java rename to services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/VncMessageHandler.java diff --git a/services/console-proxy-rdp/rdpconsole/src/main/resources/jaas_ntlm_config.txt b/services/console-proxy/rdpconsole/src/main/resources/jaas_ntlm_config.txt similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/main/resources/jaas_ntlm_config.txt rename to services/console-proxy/rdpconsole/src/main/resources/jaas_ntlm_config.txt diff --git a/services/console-proxy-rdp/rdpconsole/src/test/doc/README.txt b/services/console-proxy/rdpconsole/src/test/doc/README.txt similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/doc/README.txt rename to services/console-proxy/rdpconsole/src/test/doc/README.txt diff --git a/services/console-proxy-rdp/rdpconsole/src/test/doc/dev-rdp-config.bat b/services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/doc/dev-rdp-config.bat rename to services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat diff --git a/services/console-proxy-rdp/rdpconsole/src/test/doc/freerdp-debug-log.txt b/services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log.txt similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/doc/freerdp-debug-log.txt rename to services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log.txt diff --git a/services/console-proxy-rdp/rdpconsole/src/test/doc/rdp-key.pem b/services/console-proxy/rdpconsole/src/test/doc/rdp-key.pem similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/doc/rdp-key.pem rename to services/console-proxy/rdpconsole/src/test/doc/rdp-key.pem diff --git a/services/console-proxy-rdp/rdpconsole/src/test/doc/rdp.pfx b/services/console-proxy/rdpconsole/src/test/doc/rdp.pfx similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/doc/rdp.pfx rename to services/console-proxy/rdpconsole/src/test/doc/rdp.pfx diff --git a/services/console-proxy-rdp/rdpconsole/src/test/java/common/ClientTest.java b/services/console-proxy/rdpconsole/src/test/java/common/ClientTest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/java/common/ClientTest.java rename to services/console-proxy/rdpconsole/src/test/java/common/ClientTest.java diff --git a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java b/services/console-proxy/rdpconsole/src/test/java/rdpclient/MockServerTest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java rename to services/console-proxy/rdpconsole/src/test/java/rdpclient/MockServerTest.java diff --git a/services/console-proxy-rdp/rdpconsole/src/test/java/streamer/BaseElementTest.java b/services/console-proxy/rdpconsole/src/test/java/streamer/BaseElementTest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/java/streamer/BaseElementTest.java rename to services/console-proxy/rdpconsole/src/test/java/streamer/BaseElementTest.java diff --git a/services/console-proxy-rdp/rdpconsole/src/test/java/streamer/ByteBufferTest.java b/services/console-proxy/rdpconsole/src/test/java/streamer/ByteBufferTest.java similarity index 100% rename from services/console-proxy-rdp/rdpconsole/src/test/java/streamer/ByteBufferTest.java rename to services/console-proxy/rdpconsole/src/test/java/streamer/ByteBufferTest.java diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index 611e96a21ec..57f6ccbc209 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -1,63 +1,64 @@ - - 4.0.0 - cloud-console-proxy - Apache CloudStack Console Proxy - Server - - org.apache.cloudstack - cloudstack-service-console-proxy - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - log4j - log4j - - - com.google.code.gson - gson - - - commons-codec - commons-codec - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - rdpclient - cloudstack-service-console-proxy-rdpclient - ${project.version} - - - - - - certs - - realhostip.csr - - - - + + 4.0.0 + cloud-console-proxy + Apache CloudStack Console Proxy - Server + + org.apache.cloudstack + cloudstack-service-console-proxy + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + log4j + log4j + + + com.google.code.gson + gson + + + commons-codec + commons-codec + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + rdpclient + cloudstack-service-console-proxy-rdpclient + ${project.version} + + + + + + certs + + realhostip.csr + + + + diff --git a/services/iam/plugin/pom.xml b/services/iam/plugin/pom.xml index e1123784c13..1ea101d8c54 100644 --- a/services/iam/plugin/pom.xml +++ b/services/iam/plugin/pom.xml @@ -1,58 +1,59 @@ - - 4.0.0 - cloud-plugin-iam - Apache CloudStack IAM - Plugin - - org.apache.cloudstack - cloudstack-service-iam - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-server - ${project.version} - - - org.apache.cloudstack - cloud-iam - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - test-jar - test - - + + 4.0.0 + cloud-plugin-iam + Apache CloudStack IAM - Plugin + + org.apache.cloudstack + cloudstack-service-iam + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-server + ${project.version} + + + org.apache.cloudstack + cloud-iam + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + test-jar + test + + diff --git a/services/iam/pom.xml b/services/iam/pom.xml index 30611c06e7c..2d0baedce1c 100644 --- a/services/iam/pom.xml +++ b/services/iam/pom.xml @@ -1,59 +1,59 @@ - - 4.0.0 - cloudstack-service-iam - Apache CloudStack IAM Service - pom - - org.apache.cloudstack - cloudstack-services - 4.7.0-SNAPSHOT - ../pom.xml - - - install - - - plugin - server - - - + + 4.0.0 + cloudstack-service-iam + Apache CloudStack IAM Service + pom + + org.apache.cloudstack + cloudstack-services + 4.7.0-SNAPSHOT + ../pom.xml + + + install + + + plugin + server + + diff --git a/services/iam/server/pom.xml b/services/iam/server/pom.xml index 37b70c5c159..15840a8c31b 100644 --- a/services/iam/server/pom.xml +++ b/services/iam/server/pom.xml @@ -1,57 +1,57 @@ - - 4.0.0 - cloud-iam - Apache CloudStack IAM - Server - - org.apache.cloudstack - cloudstack-service-iam - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - commons-io - commons-io - ${cs.commons-io.version} - - - net.sf.ehcache - ehcache-core - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-api - ${project.version} - test-jar - test - - + + 4.0.0 + cloud-iam + Apache CloudStack IAM - Server + + org.apache.cloudstack + cloudstack-service-iam + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + commons-io + commons-io + + + net.sf.ehcache + ehcache-core + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + test-jar + test + + diff --git a/services/pom.xml b/services/pom.xml index 45404883924..66011c35a20 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -1,51 +1,50 @@ - - 4.0.0 - cloudstack-services - Apache CloudStack Cloud Services - pom - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - ../pom.xml - - - install - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - cloudstack-checkstyle - none - false - - - - - - - console-proxy - console-proxy-rdp/rdpconsole - secondary-storage - + + 4.0.0 + cloudstack-services + Apache CloudStack Cloud Services + pom + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + false + + + + + + + console-proxy + secondary-storage + diff --git a/services/secondary-storage/controller/pom.xml b/services/secondary-storage/controller/pom.xml index 2a65c5074a0..544a183754a 100644 --- a/services/secondary-storage/controller/pom.xml +++ b/services/secondary-storage/controller/pom.xml @@ -1,50 +1,51 @@ - - 4.0.0 - cloud-controller-secondary-storage - Apache CloudStack Secondary Storage Controller - - org.apache.cloudstack - cloudstack-service-secondary-storage - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - commons-codec - commons-codec - - - org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-server - ${project.version} - - + + 4.0.0 + cloud-controller-secondary-storage + Apache CloudStack Secondary Storage Controller + + org.apache.cloudstack + cloudstack-service-secondary-storage + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + commons-codec + commons-codec + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-server + ${project.version} + + diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml index 067975d2286..6f3b729297f 100644 --- a/services/secondary-storage/pom.xml +++ b/services/secondary-storage/pom.xml @@ -1,34 +1,50 @@ - - 4.0.0 - cloudstack-service-secondary-storage - Apache CloudStack Secondary Storage - pom - - org.apache.cloudstack - cloudstack-services - 4.12.0.0-SNAPSHOT - ../pom.xml - - - controller - server - + + 4.0.0 + cloudstack-service-secondary-storage + Apache CloudStack Secondary Storage + pom + + org.apache.cloudstack + cloudstack-services + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + false + + + + + + + controller + server + diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml index ca382c57ad8..90e1a775d16 100644 --- a/services/secondary-storage/server/pom.xml +++ b/services/secondary-storage/server/pom.xml @@ -1,114 +1,115 @@ - - 4.0.0 - cloud-secondary-storage - Apache CloudStack Secondary Storage Service - - org.apache.cloudstack - cloudstack-service-secondary-storage - 4.12.0.0-SNAPSHOT - ../pom.xml - + + 4.0.0 + cloud-secondary-storage + Apache CloudStack Secondary Storage Service + + org.apache.cloudstack + cloudstack-service-secondary-storage + 4.12.0.0-SNAPSHOT + ../pom.xml + - - log4j - log4j - - - com.google.code.gson - gson - - - commons-codec - commons-codec - - - - org.apache.cloudstack - cloud-agent - ${project.version} - - - org.apache.cloudstack - cloud-server - ${project.version} - - - org.apache.cloudstack - cloud-engine-storage-configdrive - ${project.version} - - - - io.netty - netty-all - 4.0.33.Final - compile - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${skipTests} - - file:${project.build.testSourceDirectory}/../conf/log4j.xml - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - java - - - - - com.cloud.agent.AgentShell - - zone=1 - pod=1 - host=192.168.56.1 - name=192.168.56.10 - eth1ip=192.168.56.10 - eth2ip=192.168.56.10 - guid=SecondaryStorage.1 - secondary.storage.vm=false - instance=Secondary - - - - javax.net.ssl.trustStore - certs/realhostip.keystore - log.home - ${PWD}/ - - - - - - + + log4j + log4j + + + com.google.code.gson + gson + + + commons-codec + commons-codec + + + + org.apache.cloudstack + cloud-agent + ${project.version} + + + org.apache.cloudstack + cloud-server + ${project.version} + + + org.apache.cloudstack + cloud-engine-storage-configdrive + ${project.version} + + + + io.netty + netty-all + 4.0.33.Final + compile + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${skipTests} + + file:${project.build.testSourceDirectory}/../conf/log4j.xml + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + java + + + + + com.cloud.agent.AgentShell + + zone=1 + pod=1 + host=192.168.56.1 + name=192.168.56.10 + eth1ip=192.168.56.10 + eth2ip=192.168.56.10 + guid=SecondaryStorage.1 + secondary.storage.vm=false + instance=Secondary + + + + javax.net.ssl.trustStore + certs/realhostip.keystore + log.home + ${PWD}/ + + + + + + diff --git a/systemvm/pom.xml b/systemvm/pom.xml index cf9a5543f71..76f1d8c218d 100644 --- a/systemvm/pom.xml +++ b/systemvm/pom.xml @@ -1,248 +1,245 @@ - - 4.0.0 - cloud-systemvm - Apache CloudStack System VM - pom - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - ../pom.xml - - - mkisofs - - - - org.apache.cloudstack - cloud-agent - ${project.version} - - - org.apache.cloudstack - cloud-secondary-storage - ${project.version} - - - org.apache.cloudstack - cloud-console-proxy - ${project.version} - - - - - - maven-assembly-plugin - - agent - false - - systemvm-agent-descriptor.xml - - - - - make-systemvm - package - - single - - - - - - maven-resources-plugin - - - copy-resources - - package - - copy-resources - - - dist - - - target - - agent.zip - - - - debian/root/.ssh - - authorized_keys - - - - - - - - - maven-antrun-plugin - - - build-cloud-scripts - generate-sources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - package - - exec - - - - - ${mkisofs} - dist - - -quiet - -r - -o - systemvm.iso - agent.zip - cloud-scripts.tgz - authorized_keys - - - - - - - - - genisoimage - - - /usr/bin/genisoimage - - - - genisoimage - - - - vmware - - - noredist - - - - - org.apache.cloudstack - cloud-plugin-hypervisor-vmware - ${project.version} - - - org.apache.cloudstack - cloud-vmware-base - ${project.version} - - - - - quickcloud - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - java - - - - - com.cloud.agent.AgentShell - - zone=1 - pod=1 - host=192.168.56.1 - guid=ConsoleProxy.1 - - - - javax.net.ssl.trustStore - certs/realhostip.keystore - log.home - ${PWD}/ - - - - - + + 4.0.0 + cloud-systemvm + Apache CloudStack System VM + pom + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + ../pom.xml + + + mkisofs + + + + org.apache.cloudstack + cloud-agent + ${project.version} + + + org.apache.cloudstack + cloud-secondary-storage + ${project.version} + + + org.apache.cloudstack + cloud-console-proxy + ${project.version} + + + + + + maven-assembly-plugin + + agent + false + + systemvm-agent-descriptor.xml + + + + + make-systemvm + package + + single + + + + + + maven-resources-plugin + + + copy-resources + + package + + copy-resources + + + dist + + + target + + agent.zip + + + + debian/root/.ssh + + authorized_keys + + + + + + + + + maven-antrun-plugin + + + build-cloud-scripts + generate-sources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + package + + exec + + + + + ${mkisofs} + dist + + -quiet + -r + -o + systemvm.iso + agent.zip + cloud-scripts.tgz + authorized_keys + + + + - - - + + + + genisoimage + + + /usr/bin/genisoimage + + + + genisoimage + + + + vmware + + + noredist + + + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + + + org.apache.cloudstack + cloud-vmware-base + ${project.version} + + + + + quickcloud + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + java + + + + + com.cloud.agent.AgentShell + + zone=1 + pod=1 + host=192.168.56.1 + guid=ConsoleProxy.1 + + + + javax.net.ssl.trustStore + certs/realhostip.keystore + log.home + ${PWD}/ + + + + + + + + diff --git a/test/pom.xml b/test/pom.xml index 1f35328bffb..607b1b84224 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -1,22 +1,23 @@ - + 4.0.0 cloud-testclient Apache CloudStack Test @@ -34,16 +35,11 @@ log4j log4j - - - junit - junit - ${cs.junit.version} com.trilead trilead-ssh2 - + log4j apache-log4j-extras @@ -62,7 +58,7 @@ org.seleniumhq.selenium.client-drivers selenium-java-client-driver - 1.0.1 + ${cs.selenium-java-client-driver.version} diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml index 715ea0b8880..08ad0fd256c 100644 --- a/tools/apidoc/pom.xml +++ b/tools/apidoc/pom.xml @@ -1,13 +1,21 @@ - + 4.0.0 @@ -25,23 +33,20 @@ ${client.config.base}/cloud-client-ui-${project.version}.jar ${client.config.base}/classes - - - org.apache.cloudstack - cloud-server - ${project.version} - - - org.apache.cloudstack - cloud-client-ui - ${project.version} - pom - + + org.apache.cloudstack + cloud-server + ${project.version} + + + org.apache.cloudstack + cloud-client-ui + ${project.version} + pom + - - install org.codehaus.mojo diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index 04a2d2404a6..ecccb959226 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -98,7 +98,6 @@ perl -pi -e "s/6.2.0-1-SNAPSHOT<\/cs.xapi.version>/ - - 4.0.0 + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> + + 4.0.0 Apache CloudStack Developer Tools - Checkstyle Configuration org.apache.cloudstack checkstyle 4.12.0.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.0 - - - none - - - - - - + + UTF-8 + UTF-8 + diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml index 48d52005306..98a87d00cae 100644 --- a/tools/devcloud-kvm/pom.xml +++ b/tools/devcloud-kvm/pom.xml @@ -1,145 +1,149 @@ - - - 4.0.0 - cloud-devcloud-kvm - Apache CloudStack DevCloud-KVM - pom - - org.apache.cloudstack - cloud-tools - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - mysql - mysql-connector-java - provided - - - org.apache.cloudstack - cloud-developer - ${project.version} - pom - true - runtime - - + - - mysql - mysql-connector-java - ${cs.mysql.version} - - - - org.gjt.mm.mysql.Driver - ${db.cloud.driver}://${db.cloud.host}:${db.cloud.port}/cloud - ${db.cloud.username} - ${db.cloud.password} - - ${maven.test.skip} - true - - - - create-schema - process-resources - - execute - - - - ${basedir}/devcloud-kvm.sql - - - - - - - - - - deploysvr - - - deploysvr - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - package - - exec - - - - - python - - ../marvin/marvin/deployDataCenter.py - -i - devcloud-kvm.cfg - - - - - - - + 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. +--> + + 4.0.0 + cloud-devcloud-kvm + Apache CloudStack DevCloud-KVM + pom + + org.apache.cloudstack + cloud-tools + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + mysql + mysql-connector-java + provided + + + org.apache.cloudstack + cloud-developer + ${project.version} + pom + true + runtime + + + + + deploydb + + + deploydb + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${project.parent.basedir}/utils/conf/db.properties + ${project.parent.basedir}/utils/conf/db.properties.override + + true + + + + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + + mysql + mysql-connector-java + ${cs.mysql.version} + + + + org.gjt.mm.mysql.Driver + ${db.cloud.driver}://${db.cloud.host}:${db.cloud.port}/cloud + ${db.cloud.username} + ${db.cloud.password} + + ${maven.test.skip} + true + + + + create-schema + process-resources + + execute + + + + ${basedir}/devcloud-kvm.sql + + + + + + + + + + deploysvr + + + deploysvr + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + package + + exec + + + + + python + + ../marvin/marvin/deployDataCenter.py + -i + devcloud-kvm.cfg + + + + + + + diff --git a/tools/devcloud4/pom.xml b/tools/devcloud4/pom.xml index 97bd1a57b2b..be81a56e805 100644 --- a/tools/devcloud4/pom.xml +++ b/tools/devcloud4/pom.xml @@ -1,112 +1,116 @@ - - - 4.0.0 - cloud-devcloud4 - Apache CloudStack DevCloud4 - pom - - org.apache.cloudstack - cloud-tools - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - mysql - mysql-connector-java - provided - - - org.apache.cloudstack - cloud-developer - ${project.version} - pom - true - runtime - - + - - mysql - mysql-connector-java - ${cs.mysql.version} - - - - org.gjt.mm.mysql.Driver - ${db.cloud.driver}://${db.cloud.host}:${db.cloud.port}/cloud - ${db.cloud.username} - ${db.cloud.password} - - ${maven.test.skip} - true - - - - create-schema - process-resources - - execute - - - - ${basedir}/prefill.sql - - - - - - - - - + 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. +--> + + 4.0.0 + cloud-devcloud4 + Apache CloudStack DevCloud4 + pom + + org.apache.cloudstack + cloud-tools + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + mysql + mysql-connector-java + provided + + + org.apache.cloudstack + cloud-developer + ${project.version} + pom + true + runtime + + + + + deploydb + + + deploydb + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${project.parent.parent.basedir}/utils/conf/db.properties + ${project.parent.parent.basedir}/utils/conf/db.properties.override + + true + + + + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + + mysql + mysql-connector-java + ${cs.mysql.version} + + + + org.gjt.mm.mysql.Driver + ${db.cloud.driver}://${db.cloud.host}:${db.cloud.port}/cloud + ${db.cloud.username} + ${db.cloud.password} + + ${maven.test.skip} + true + + + + create-schema + process-resources + + execute + + + + ${basedir}/prefill.sql + + + + + + + + + diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml index 931d0ac30c7..f3bbd1f9af0 100644 --- a/tools/marvin/pom.xml +++ b/tools/marvin/pom.xml @@ -1,287 +1,293 @@ - + - 4.0.0 - cloud-marvin - Apache CloudStack marvin - pom - - org.apache.cloudstack - cloud-tools - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - - org.apache.cloudstack - cloud-apidoc - ${project.version} - pom - - - - - install - - - maven-antrun-plugin - - - clean - clean - - run - - - - - Deleting ${project.artifactId} API sources - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - generate-sources - generate-sources - - exec - - - ${basedir}/marvin - python - - codegenerator.py - -s - ${basedir}/../apidoc/target/commands.xml - Generating ${project.artifactId} API classes} - - - - - package - package - - exec - - - ${exec.workingdir} - python - - mvn-setup.py - ${project.version} - sdist - - - - - - - - - - - marvin.sync - - - endpoint - localhost - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-marvin + Apache CloudStack marvin + pom + + org.apache.cloudstack + cloud-tools + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-apidoc + ${project.version} + pom + + + - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - generate-sources - generate-sources - - exec - - - ${basedir}/marvin - python - - codegenerator.py - -e - ${endpoint} - Generating ${project.artifactId} API classes} - - - - - package - package - - exec - - - ${exec.workingdir} - python - - mvn-setup.py - ${project.version} - sdist - - - - - install - install - - exec - - - ${basedir}/dist - pip - - install - --allow-external - --upgrade - Marvin-${project.version}.tar.gz - - - - - + + maven-antrun-plugin + + + clean + clean + + run + + + + + Deleting ${project.artifactId} API sources + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + generate-sources + generate-sources + + exec + + + ${basedir}/marvin + python + + codegenerator.py + -s + ${basedir}/../apidoc/target/commands.xml + Generating ${project.artifactId} API classes} + + + + + package + package + + exec + + + ${exec.workingdir} + python + + mvn-setup.py + ${project.version} + sdist + + + + + - - - - marvin.setup - - ${user.dir}/setup/dev/advanced.cfg - - - - - org.codehaus.gmaven - gmaven-plugin - 1.5 - - - setproperty - validate - - execute - - - - pom.properties['resolved.basedir']=project.basedir.absolutePath.replace('\','/').replace('D:','/cyg/d'); - pom.properties['resolved.userdir']='${user.dir}'.replace('\','/').replace('D:','/cyg/d'); - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - pre-integration-test - pre-integration-test - - exec - - - ${basedir}/marvin - python - - deployAndRun.py - -c - ${resolved.userdir}/${marvin.config} - -d - ${resolved.basedir}/marvin/testSetupSuccess.py - - - - - - - - - - marvin.test - - simulator - test/integration/smoke - ${user.dir}/setup/dev/advanced.cfg - - - - - org.codehaus.gmaven - gmaven-plugin - 1.5 - - - setproperty - validate - - execute - - - - ${user.dir} - ${marvin.config} - - - project.properties['resolved.user.dir']='${user.dir}'.replace('\','/').replace('D:','/cyg/d'); - project.properties['resolved.marvin.config']='${marvin.config}'.replace('\','/').replace('D:','/cyg/d'); - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - integration-test - integration-test - - exec - - - ${basedir}/marvin - nosetests - - --with-marvin - --marvin-config - ${resolved.user.dir}/${resolved.marvin.config} - --load - -a - tags=${tag} - ${resolved.user.dir}/${test} - -v - - - - - - - - - + + + + + marvin.sync + + + endpoint + localhost + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + generate-sources + generate-sources + + exec + + + ${basedir}/marvin + python + + codegenerator.py + -e + ${endpoint} + Generating ${project.artifactId} API classes} + + + + + package + package + + exec + + + ${exec.workingdir} + python + + mvn-setup.py + ${project.version} + sdist + + + + + install + install + + exec + + + ${basedir}/dist + pip + + install + --allow-external + --upgrade + Marvin-${project.version}.tar.gz + + + + + + + + + + marvin.setup + + ${user.dir}/setup/dev/advanced.cfg + + + + + org.codehaus.gmaven + gmaven-plugin + 1.5 + + + setproperty + validate + + execute + + + + pom.properties['resolved.basedir']=project.basedir.absolutePath.replace('\','/').replace('D:','/cyg/d'); + pom.properties['resolved.userdir']='${user.dir}'.replace('\','/').replace('D:','/cyg/d'); + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + pre-integration-test + pre-integration-test + + exec + + + ${basedir}/marvin + python + + deployAndRun.py + -c + ${resolved.userdir}/${marvin.config} + -d + ${resolved.basedir}/marvin/testSetupSuccess.py + + + + + + + + + + marvin.test + + simulator + test/integration/smoke + ${user.dir}/setup/dev/advanced.cfg + + + + + org.codehaus.gmaven + gmaven-plugin + 1.5 + + + setproperty + validate + + execute + + + + ${user.dir} + ${marvin.config} + + + project.properties['resolved.user.dir']='${user.dir}'.replace('\','/').replace('D:','/cyg/d'); + project.properties['resolved.marvin.config']='${marvin.config}'.replace('\','/').replace('D:','/cyg/d'); + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + integration-test + integration-test + + exec + + + ${basedir}/marvin + nosetests + + --with-marvin + --marvin-config + ${resolved.user.dir}/${resolved.marvin.config} + --load + -a + tags=${tag} + ${resolved.user.dir}/${test} + -v + + + + + + + + + diff --git a/tools/pom.xml b/tools/pom.xml index 9190f5447e6..15cdfe0256d 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -1,26 +1,24 @@ - - - 4.0.0 + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you 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. +--> + + 4.0.0 Apache CloudStack Developer Tools cloud-tools pom @@ -31,12 +29,24 @@ ../pom.xml - install + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + cloudstack-checkstyle + none + false + + + + apidoc marvin devcloud4 - devcloud-kvm + devcloud-kvm diff --git a/tools/wix-cloudstack-maven-plugin/pom.xml b/tools/wix-cloudstack-maven-plugin/pom.xml index 19916578a04..c4693ffd5a0 100644 --- a/tools/wix-cloudstack-maven-plugin/pom.xml +++ b/tools/wix-cloudstack-maven-plugin/pom.xml @@ -1,78 +1,84 @@ - + - 4.0.0 - Wix-cloudstack-maven-plugin - Apache CloudStack - Wix Maven Plugin - maven-plugin - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - ../../pom.xml - - - - - org.apache.maven - maven-plugin-api - ${maven-plugin-api.version} - - - org.apache.commons - commons-exec - ${commons-exec.version} - - - org.bitbucket.joxley - wix-maven-plugin - ${wix-maven-plugin.version} - - - - - 2.0 - 1.1 - 1.1.1 - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0.0,) - - enforce - - - - - - - - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + Wix-cloudstack-maven-plugin + Apache CloudStack - Wix Maven Plugin + maven-plugin + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + ../../pom.xml + + + + org.apache.maven + maven-plugin-api + ${maven-plugin-api.version} + + + org.apache.commons + commons-exec + ${commons-exec.version} + + + org.bitbucket.joxley + wix-maven-plugin + ${wix-maven-plugin.version} + + + + 2.0 + 1.1 + 1.1.1 + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + + + + diff --git a/usage/pom.xml b/usage/pom.xml index edb0c5fdf91..2a22c9c4df4 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -1,211 +1,217 @@ - + - 4.0.0 - cloud-usage - Apache CloudStack Usage Server - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - - - - org.apache.cloudstack - cloud-api - ${project.version} - test-jar - test - - - org.apache.cloudstack - cloud-engine-schema - ${project.version} - - - org.apache.cloudstack - cloud-engine-components-api - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-usage + Apache CloudStack Usage Server + org.apache.cloudstack - cloud-framework-quota - ${project.version} - - - commons-daemon - commons-daemon - - - mysql - mysql-connector-java - ${cs.mysql.version} - provided - - - org.slf4j - slf4j-api - 1.7.22 - - - org.slf4j - slf4j-log4j12 - 1.7.22 - - - org.dbunit - dbunit - 2.5.4 - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - com/cloud/usage/UsageManagerTest.java - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/dependencies - runtime - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-resource - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - usage - - - run - - - + cloudstack + 4.12.0.0-SNAPSHOT + + + + org.apache.cloudstack + cloud-api + ${project.version} + test-jar + test + + + org.apache.cloudstack + cloud-engine-schema + ${project.version} + + + org.apache.cloudstack + cloud-engine-components-api + ${project.version} + + + org.apache.cloudstack + cloud-framework-quota + ${project.version} + + + commons-daemon + commons-daemon + + + mysql + mysql-connector-java + provided + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + org.dbunit + dbunit + ${cs.dbunit.version} + test + + + - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - org.apache.cloudstack - cloud-usage - ${project.version} - - - - - process-test-resources - run-usage - - java - - - - - true - true - - org.apache.cloudstack - cloud-usage - - com.cloud.usage.UsageServer - - - - catalina.home - ${project.parent.basedir}/utils - - - - + + org.apache.maven.plugins + maven-surefire-plugin + + + com/cloud/usage/UsageManagerTest.java + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/dependencies + runtime + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-resource + generate-resources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - integration - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - + + + + usage + + + run + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + org.apache.cloudstack + cloud-usage + ${project.version} + + + + + process-test-resources + run-usage + + java + + + + + true + true + + org.apache.cloudstack + cloud-usage + + com.cloud.usage.UsageServer + + + + catalina.home + ${project.parent.basedir}/utils + + + + + + + + + integration + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + + + diff --git a/utils/pom.xml b/utils/pom.xml index 6175283129d..08b144c68b6 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -1,236 +1,231 @@ - 4.0.0 - cloud-utils - Apache CloudStack Utils - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - ../pom.xml - - - - org.apache.cloudstack - cloud-framework-managed-context - ${project.version} - - - org.apache.cloudstack - cloud-framework-ca - ${project.version} - - - org.springframework - spring-context - - - org.aspectj - aspectjweaver - - - log4j - log4j - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - cglib - cglib-nodep - - - commons-validator - commons-validator - - - commons-codec - commons-codec - - - org.bouncycastle - bcprov-jdk15on - - - org.bouncycastle - bcpkix-jdk15on - - - com.jcraft - jsch - - - org.jasypt - jasypt - - - com.trilead - trilead-ssh2 - - - com.amazonaws - aws-java-sdk-core - - - com.amazonaws - aws-java-sdk-s3 - - - log4j - apache-log4j-extras - runtime - - - com.googlecode.java-ipv6 - java-ipv6 - - - commons-configuration - commons-configuration - - - javax.servlet - javax.servlet-api - provided - - - - mysql - mysql-connector-java - test - - - commons-io - commons-io - provided - ${cs.commons-io.version} - - - org.reflections - reflections - - - xml-apis - xml-apis - - - - - org.owasp.esapi - esapi - - - xml-apis - xml-apis - - - xml-apis - xml-apis-ext - - - xerces - xmlParserAPIs - - - commons-beanutils - commons-beanutils-core - - - - - org.opensaml - opensaml - ${cs.opensaml.version} - - - commons-net - commons-net - 3.6 - - - com.google.code.gson - gson - - - com.google.guava - guava-testlib - ${cs.guava-testlib.version} - - - com.fasterxml.jackson.core - jackson-databind - ${cs.jackson.version} - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - com/cloud/utils/testcase/*TestCase* - com/cloud/utils/db/*Test* - - - - - - - - integration - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-utils + Apache CloudStack Utils + + org.apache.cloudstack + cloudstack + 4.12.0.0-SNAPSHOT + ../pom.xml + + + + org.apache.cloudstack + cloud-framework-managed-context + ${project.version} + + + org.apache.cloudstack + cloud-framework-ca + ${project.version} + + + org.springframework + spring-context + + + org.aspectj + aspectjweaver + + + log4j + log4j + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + cglib + cglib-nodep + + + commons-validator + commons-validator + + + commons-codec + commons-codec + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + + com.jcraft + jsch + + + org.jasypt + jasypt + + + com.trilead + trilead-ssh2 + + + com.amazonaws + aws-java-sdk-core + + + com.amazonaws + aws-java-sdk-s3 + + + log4j + apache-log4j-extras + runtime + + + com.googlecode.java-ipv6 + java-ipv6 + + + commons-configuration + commons-configuration + + + javax.servlet + javax.servlet-api + provided + + + + mysql + mysql-connector-java + test + + + commons-io + commons-io + provided + + + org.reflections + reflections + + + xml-apis + xml-apis + + + + + org.owasp.esapi + esapi + + + xml-apis + xml-apis + + + xml-apis + xml-apis-ext + + + xerces + xmlParserAPIs + + + commons-beanutils + commons-beanutils-core + + + + + org.opensaml + opensaml + + + commons-net + commons-net + + + com.google.code.gson + gson + + + com.google.guava + guava-testlib + ${cs.guava-testlib.version} + + + com.fasterxml.jackson.core + jackson-databind + ${cs.jackson.version} + + + - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + com/cloud/utils/testcase/*TestCase* + com/cloud/utils/db/*Test* + + + - - - + + + + integration + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + + + diff --git a/version-info.in b/version-info.in deleted file mode 100644 index c0c21e78cf7..00000000000 --- a/version-info.in +++ /dev/null @@ -1,27 +0,0 @@ -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you 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. - - - -This is the version information for the manifests in the JAR files. - -Implementation_Version: @Implementation_Version@ - -This file exists solely to trigger ant recompilation if it is needed. -Otherwise, JAR files and all the dependent files are brought from cache. -This file does not get installed or used in any other way other than -during the build process. diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml index 7928bc22e45..73ca0860e6b 100644 --- a/vmware-base/pom.xml +++ b/vmware-base/pom.xml @@ -1,73 +1,73 @@ - 4.0.0 - cloud-vmware-base - Apache CloudStack VMware Base - - org.apache.cloudstack - cloudstack - 4.12.0.0-SNAPSHOT - - - - org.apache.cloudstack - cloud-utils - ${project.version} - - - org.apache.cloudstack - cloud-framework-db - ${project.version} - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + cloud-vmware-base + Apache CloudStack VMware Base + org.apache.cloudstack - cloud-api - ${project.version} - - - org.apache.cloudstack - cloud-engine-api - ${project.version} - - - com.google.code.gson - gson - - - com.cloud.com.vmware - vmware-vim25 - ${cs.vmware.api.version} - compile - - - org.apache.axis - axis - - - org.apache.axis - axis-jaxrpc - - - wsdl4j - wsdl4j - - + cloudstack + 4.12.0.0-SNAPSHOT + + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-framework-db + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + org.apache.cloudstack + cloud-engine-api + ${project.version} + + + com.google.code.gson + gson + + + com.cloud.com.vmware + vmware-vim25 + ${cs.vmware.api.version} + compile + + + org.apache.axis + axis + + + org.apache.axis + axis-jaxrpc + + + wsdl4j + wsdl4j + +