diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index c0ecf583e..000000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. - id 'groovy-gradle-plugin' -} - -repositories { - // Use the plugin portal to apply community plugins in convention plugins. - gradlePluginPortal() -} - -//temporarily disable javadocs -subprojects { - tasks.withType(javadoc).all { enabled = false } -} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/org.cloudbus.cloudsim.java-conventions.gradle b/buildSrc/src/main/groovy/org.cloudbus.cloudsim.java-conventions.gradle deleted file mode 100644 index 26d3c1afa..000000000 --- a/buildSrc/src/main/groovy/org.cloudbus.cloudsim.java-conventions.gradle +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'java-library' - id 'maven-publish' -} - -repositories { - mavenLocal() - maven { - url = uri('https://repo.maven.apache.org/maven2/') - } -} - -group = 'org.cloudbus.cloudsim' -version = '5.1' -java.sourceCompatibility = JavaVersion.VERSION_17 - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} diff --git a/distribution/src/main/assembly/package.xml b/distribution/src/main/assembly/package.xml deleted file mode 100644 index 486fef7c1..000000000 --- a/distribution/src/main/assembly/package.xml +++ /dev/null @@ -1,66 +0,0 @@ - - package - - tar.gz - zip - - - - jars - - ${project.groupId}:cloudsim:jar - ${project.groupId}:cloudsim:jar:sources - ${project.groupId}:cloudsim-examples:jar - ${project.groupId}:cloudsim-examples:jar:sources - - - - sources - true - - - META-INF/ - - - - ${project.groupId}:cloudsim:jar:sources - - - - examples - true - - - META-INF/ - - - - ${project.groupId}:cloudsim-examples:jar:sources - - - - true - - - META-INF/ - - - / - - ${project.groupId}:documentation - - - - docs - true - - - META-INF/ - - - - ${project.groupId}:cloudsim:jar:javadoc - - - - \ No newline at end of file diff --git a/documentation/build.gradle b/documentation/build.gradle deleted file mode 100644 index f54d3eeba..000000000 --- a/documentation/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'org.cloudbus.cloudsim.java-conventions' -} - -description = 'documentation' diff --git a/documentation/pom.xml b/documentation/pom.xml new file mode 100644 index 000000000..dcd90fb91 --- /dev/null +++ b/documentation/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + cloudsim-package + org.cloudbus.cloudsim + 7.0.0-alpha + + + documentation + documentation + \ No newline at end of file diff --git a/documentation/src/main/resources/pom.xml b/documentation/src/main/resources/pom.xml deleted file mode 100644 index a580b24d5..000000000 --- a/documentation/src/main/resources/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - 4.0.0 - org.cloudbus.cloudsim - cloudsim-toolkit - 5.1 - bundle - cloudsim-toolkit - CloudSim: A Framework For Modeling And Simulation Of Cloud Computing Infrastructures And Services - http://www.cloudbus.org/cloudsim/ - - - 11 - UTF-8 - 2.0.1 - - - - classes - classes - cloudsim-new - classes/test-classes - sources - - - - true - src/main/resources - - - - - - maven-compiler-plugin - 3.8.0 - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.5 - - 1024 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 11 - 11 - true - - - - - - - - activator - - true - - - true - - - - - org.apache.felix - maven-bundle-plugin - ${felix-version} - true - - - cloudsim-toolkit - cloudsim-toolkit - org.apache.log4j;resolution:=optional - org.cloudbus.cloudsim.*;version="${project.version}" - - - - - - - - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180f2..000000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 84d1f85fd..000000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index 1b6c78733..000000000 --- a/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://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. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index ac1b06f93..000000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/modules/cloudsim-examples/build.gradle b/modules/cloudsim-examples/build.gradle deleted file mode 100644 index 90e018e9e..000000000 --- a/modules/cloudsim-examples/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'org.cloudbus.cloudsim.java-conventions' - // id("net.ltgt.errorprone") version("2.0.2") -} - -dependencies { - implementation project(':cloudsim') - implementation 'com.opencsv:opencsv:5.5.2' - testImplementation('junit:junit:4.13.2') - testImplementation('org.easymock:easymock:4.2') - testImplementation('org.easymock:easymockclassextension:3.2') - implementation 'io.gatling.uncommons.maths:uncommons-maths:1.2.3' - implementation 'com.google.guava:guava:31.0.1-jre' - compileOnly 'org.projectlombok:lombok:1.18.22' - annotationProcessor 'org.projectlombok:lombok:1.18.22' - - testCompileOnly 'org.projectlombok:lombok:1.18.22' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' - //errorprone("com.google.errorprone:error_prone_core:2.4.0") - -} - -description = 'cloudsim-examples' diff --git a/modules/cloudsim-examples/pom.xml b/modules/cloudsim-examples/pom.xml new file mode 100644 index 000000000..24315526e --- /dev/null +++ b/modules/cloudsim-examples/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + + + cloudsim-package + org.cloudbus.cloudsim + 7.0.0-alpha + ../../ + + + cloudsim-examples + cloudsim-examples + + + + + com.google.guava + guava + + + + + org.apache.commons + commons-lang3 + + + + + org.apache.commons + commons-math3 + + + + + commons-net + commons-net + + + + + commons-io + commons-io + + + + + io.gatling.uncommons.maths + uncommons-maths + + + + + com.opencsv + opencsv + 5.9 + + + + + com.maxmind.geoip2 + geoip2 + + + + + org.easymock + easymock + test + + + + + junit + junit + test + + + org.cloudbus.cloudsim + cloudsim + 7.0.0-alpha + compile + + + diff --git a/modules/cloudsim/build.gradle b/modules/cloudsim/build.gradle deleted file mode 100644 index 3b710bee2..000000000 --- a/modules/cloudsim/build.gradle +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'org.cloudbus.cloudsim.java-conventions' -// id("net.ltgt.errorprone") version("2.0.2") - id 'jacoco' -} - -dependencies { - implementation 'com.opencsv:opencsv:5.5.2' - implementation 'org.jfree:jfreechart:1.5.3' - implementation 'commons-io:commons-io:2.11.0' - implementation 'org.apache.commons:commons-lang3:3.12.0' - implementation 'io.gatling.uncommons.maths:uncommons-maths:1.2.3' - implementation 'com.google.guava:guava:31.0.1-jre' - implementation 'com.maxmind.geoip2:geoip2:2.16.1' - implementation 'commons-net:commons-net:3.8.0' - implementation 'org.apache.commons:commons-math3:3.6.1' - testImplementation('junit:junit:4.13.2') - testImplementation('org.easymock:easymockclassextension:3.2') - testImplementation('org.easymock:easymock:4.2') - compileOnly 'org.projectlombok:lombok:1.18.22' - annotationProcessor 'org.projectlombok:lombok:1.18.22' - -// errorprone("com.google.errorprone:error_prone_core:2.4.0") - - testCompileOnly 'org.projectlombok:lombok:1.18.22' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' - -} - -description = 'cloudsim' -javadoc{ - options.tags = ["pre:a:Precondition","post:a:Postcondition"] -} - -jacoco { - toolVersion = "0.8.7" - reportsDirectory = layout.buildDirectory.dir('customJacocoReportDir') -} - -jacocoTestReport { - reports { - xml.required = false - csv.required = false - html.outputLocation = layout.buildDirectory.dir('jacocoHtml') - } -} - -java { -// withJavadocJar() -} diff --git a/modules/cloudsim/pom.xml b/modules/cloudsim/pom.xml new file mode 100644 index 000000000..9d401a6e6 --- /dev/null +++ b/modules/cloudsim/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + + + cloudsim-package + org.cloudbus.cloudsim + 7.0.0-alpha + ../../ + + + cloudsim + cloudsim + + + + + com.google.guava + guava + + + + + org.apache.commons + commons-lang3 + + + + + org.apache.commons + commons-math3 + + + + + commons-net + commons-net + + + + + commons-io + commons-io + + + + + io.gatling.uncommons.maths + uncommons-maths + + + + + com.opencsv + opencsv + 5.9 + + + + + com.maxmind.geoip2 + geoip2 + + + + + org.easymock + easymock + test + + + + + junit + junit + test + + + + org.projectlombok + lombok + provided + + + diff --git a/pom.xml b/pom.xml index 1642eafba..c4b5a756d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,99 +1,110 @@ - - 4.0.0 - org.cloudbus.cloudsim - cloudsim-package - 4.0 - pom - cloudsim-package - CloudSim: A Framework For Modeling And Simulation Of Cloud Computing Infrastructures And Services - http://www.cloudbus.org/cloudsim/ - - - UTF-8 - - - - modules - documentation - distribution - - - - The Cloud Computing and Distributed Systems (CLOUDS) Laboratory, The University of Melbourne - http://cloudbus.org/ - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - - - - - localrepo - LocalRepository - file:///${project.build.directory}/deployment-artifacts - - - - - - - ${project.groupId} - modules - ${project.version} - - - ${project.groupId} - cloudsim - ${project.version} - - - ${project.groupId} - cloudsim-examples - ${project.version} - - - ${project.groupId} - documentation - ${project.version} - - - ${project.groupId} - distribution - ${project.version} - - - - junit - junit - 4.13.1 - test - - - org.easymock - easymock - 3.1 - test - - - org.easymock - easymockclassextension - 3.1 - test - - - - + + + 4.0.0 + + org.cloudbus.cloudsim + cloudsim-package + cloudsim-package + CloudSim: A Framework For Modeling And Simulation Of Cloud Computing Infrastructures And Services + http://www.cloudbus.org/cloudsim/ + 7.0.0-alpha + pom + + + 21 + 21 + 21 + UTF-8 + + + + modules/cloudsim + modules/cloudsim-examples + + + + + + + com.google.guava + guava + 33.2.1-jre + + + + + org.apache.commons + commons-lang3 + 3.15.0 + + + + + org.apache.commons + commons-math3 + 3.6.1 + + + + + commons-net + commons-net + 3.11.1 + + + + + commons-io + commons-io + 2.16.1 + + + + + io.gatling.uncommons.maths + uncommons-maths + 1.2.3 + + + + + com.opencsv + opencsv + 5.9 + + + + + com.maxmind.geoip2 + geoip2 + 4.2.0 + + + + + org.easymock + easymock + 5.3.0 + test + + + + + junit + junit + 4.13.2 + test + + + + + org.projectlombok + lombok + 1.18.34 + provided + + + diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 280449e55..000000000 --- a/settings.gradle +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - - - -rootProject.name = 'cloudsim-package' -include(':cloudsim-examples') -include(':distribution') -include(':modules') -include(':documentation') -include(':cloudsim') -project(":cloudsim-examples").projectDir = file('modules/cloudsim-examples') -project(":cloudsim").projectDir = file('modules/cloudsim')