diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs deleted file mode 100644 index d4313d4..0000000 --- a/.settings/org.eclipse.jdt.apt.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 1b6e1ef..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.teamcity/pluginData/_Self/mavenSettings/netology b/.teamcity/pluginData/_Self/mavenSettings/netology deleted file mode 100644 index 012fcad..0000000 --- a/.teamcity/pluginData/_Self/mavenSettings/netology +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - nexus - admin - admin123 - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml deleted file mode 100644 index 1690ba7..0000000 --- a/.teamcity/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - Netology Config DSL Script - Netology - Netology_dsl - 1.0-SNAPSHOT - - - org.jetbrains.teamcity - configs-dsl-kotlin-parent - 1.0-SNAPSHOT - - - - - jetbrains-all - https://download.jetbrains.com/teamcity-repository - - true - - - - teamcity-server - http://51.250.44.79:8111/app/dsl-plugins-repository - - true - - - - - - - JetBrains - https://download.jetbrains.com/teamcity-repository - - - - - ${basedir} - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - - - compile - process-sources - - compile - - - - test-compile - process-test-sources - - test-compile - - - - - - org.jetbrains.teamcity - teamcity-configs-maven-plugin - ${teamcity.dsl.version} - - kotlin - target/generated-configs - - - - - - - - org.jetbrains.teamcity - configs-dsl-kotlin - ${teamcity.dsl.version} - compile - - - org.jetbrains.teamcity - configs-dsl-kotlin-plugins - 1.0-SNAPSHOT - pom - compile - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - compile - - - org.jetbrains.kotlin - kotlin-script-runtime - ${kotlin.version} - compile - - - \ No newline at end of file diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts deleted file mode 100644 index e1ffd80..0000000 --- a/.teamcity/settings.kts +++ /dev/null @@ -1,103 +0,0 @@ -import jetbrains.buildServer.configs.kotlin.v2019_2.* -import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.maven -import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs - -/* -The settings script is an entry point for defining a TeamCity -project hierarchy. The script should contain a single call to the -project() function with a Project instance or an init function as -an argument. - -VcsRoots, BuildTypes, Templates, and subprojects can be -registered inside the project using the vcsRoot(), buildType(), -template(), and subProject() methods respectively. - -To debug settings scripts in command-line, run the - - mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate - -command and attach your debugger to the port 8000. - -To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View --> Tool Windows -> Maven Projects), find the generate task node -(Plugins -> teamcity-configs -> teamcity-configs:generate), the -'Debug' option is available in the context menu for the task. -*/ - -version = "2021.2" - -project { - - buildType(Build) - buildType(Sample) - - params { - text("name", "Alexey", readOnly = true, allowEmpty = true) - param("system.sample", "123") - } -} - -object Build : BuildType({ - name = "Build" - - artifactRules = "+:target/*.jar" - - params { - param("env.name2", "%name%") - password("env.out", "credentialsJSON:12f2c387-f043-4357-8d37-8e00390454d0") - } - - vcs { - root(DslContext.settingsRoot) - } - - steps { - maven { - name = "run clean test" - executionMode = BuildStep.ExecutionMode.ALWAYS - - conditions { - doesNotContain("teamcity.build.branch", "master") - } - goals = "clean test" - runnerArgs = "-Dmaven.test.failure.ignore=true" - } - maven { - name = "make distrib" - executionMode = BuildStep.ExecutionMode.ALWAYS - - conditions { - contains("teamcity.build.branch", "master") - } - goals = "clean deploy" - runnerArgs = "-Dmaven.test.failure.ignore=true" - userSettingsSelection = "netology" - } - } - - triggers { - vcs { - } - } - - requirements { - exists("env.JAVA_HOME") - } -}) - -object Sample : BuildType({ - name = "Sample" - - vcs { - root(DslContext.settingsRoot) - } - - steps { - maven { - name = "run clean test" - executionMode = BuildStep.ExecutionMode.ALWAYS - goals = "clean test" - runnerArgs = "-Dmaven.test.failure.ignore=true" - } - } -}) diff --git a/pom.xml b/pom.xml index 47bd4c1..adebef5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.netology plaindoll jar - 0.2.6 + 0.0.1 1.8 @@ -15,7 +15,7 @@ nexus - http://51.250.44.27:8081/repository/maven-releases + http:/51.250.36.24:8081/repository/maven-releases diff --git a/src/main/java/plaindoll/Welcomer.java b/src/main/java/plaindoll/Welcomer.java index d8849fc..940a52a 100644 --- a/src/main/java/plaindoll/Welcomer.java +++ b/src/main/java/plaindoll/Welcomer.java @@ -7,7 +7,4 @@ public class Welcomer{ public String sayFarewell() { return "Farewell, good hunter. May you find your worth in waking world."; } - public String sayStatus() { - return "Hello! My status is Good"; - } }