From c7e6169e21e9ad2d6c23ed6931ea758d64f7b4ba Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 10 Jun 2013 13:01:33 +0400 Subject: [PATCH 1/9] test --- libraries/docs/website/pom.xml | 2 +- libraries/maven-settings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml index 2186d0cfd54d5..6003f4d5781b9 100644 --- a/libraries/docs/website/pom.xml +++ b/libraries/docs/website/pom.xml @@ -125,7 +125,7 @@ github-project-site - gitsite:git@github.com/JetBrains/kotlin.git + gitsite:git@github.com/bashor/kotlin.git diff --git a/libraries/maven-settings.xml b/libraries/maven-settings.xml index 879b3c2e3350b..22f5818590dde 100644 --- a/libraries/maven-settings.xml +++ b/libraries/maven-settings.xml @@ -15,7 +15,7 @@ jetbrains-kotlin - tc-kotlin + bashor ${tc-kotlin.password} From 56207b9b9d8de704ddc2111ad6dc055e8abc2691 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 10 Jun 2013 18:20:46 +0400 Subject: [PATCH 2/9] test --- libraries/docs/website/pom.xml | 212 +++++++++++++++------------------ libraries/maven-settings.xml | 30 ++--- 2 files changed, 112 insertions(+), 130 deletions(-) diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml index 6003f4d5781b9..0ec46ed3f5178 100644 --- a/libraries/docs/website/pom.xml +++ b/libraries/docs/website/pom.xml @@ -1,131 +1,113 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0%20http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - 4.0.0 + 4.0.0 - - org.jetbrains.kotlin - kotlin-project - 0.1-SNAPSHOT - ../../pom.xml - + + org.jetbrains.kotlin + kotlin-project + 0.1-SNAPSHOT + ../../pom.xml + - website - pom + website + pom - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - org.jetbrains.kotlin - apidoc - ${project.version} - - - org.pegdown - pegdown - ${pegdown.version} - - + + + org.jetbrains.kotlin + kotlin-stdlib + ${project.version} + + + org.jetbrains.kotlin + apidoc + ${project.version} + + + org.pegdown + pegdown + ${pegdown.version} + + - - src/main/kotlin + + src/main/kotlin - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${project.version} + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${project.version} - - - compile - compile - - compile - - - - + + + compile + compile + + compile + + + + - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - prepare-package - prepare-package - - java - - - - - org.jetbrains.kotlin.site.SitePackage - - ${basedir} - - - + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + prepare-package + prepare-package + + java + + + + + org.jetbrains.kotlin.site.SitePackage + + ${basedir} + + + - - maven-assembly-plugin - 2.2.1 - - - src/main/assembly/zip.xml - - - - - make-zip - package - - single - - - - - + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + true + + - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.6 - - - org.apache.maven.scm - maven-scm-manager-plexus - 1.6 - - - com.github.stephenc.wagon - wagon-gitsite - 0.4.1 - - - + + com.github.github + site-maven-plugin + 0.8 + + Building site + jetbrains-kotlin + + + + + site + + site + + + + - - + + https://github.com/bashor/kotlin + scm:git:git@github.com:bashor/kotlin.git + scm:git:git@github.com:bashor/kotlin.git + - - github-project-site - gitsite:git@github.com/bashor/kotlin.git - - diff --git a/libraries/maven-settings.xml b/libraries/maven-settings.xml index 22f5818590dde..9ee2586daa7db 100644 --- a/libraries/maven-settings.xml +++ b/libraries/maven-settings.xml @@ -3,20 +3,20 @@ xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - - central - repo - http://repository.jetbrains.com/remote-repos - repo - - + + + central + repo + http://repository.jetbrains.com/remote-repos + repo + + - - - jetbrains-kotlin - bashor - ${tc-kotlin.password} - - + + + jetbrains-kotlin + + ${KOTLIN_GITHUB_OAUTH} + + From e600c230dfd7a38926338a6c0c0a3405a198d058 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 10 Jun 2013 18:26:11 +0400 Subject: [PATCH 3/9] test --- libraries/docs/website/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml index 0ec46ed3f5178..e651bb0af29d9 100644 --- a/libraries/docs/website/pom.xml +++ b/libraries/docs/website/pom.xml @@ -88,7 +88,7 @@ site-maven-plugin 0.8 - Building site + Update Kotlin API Docs jetbrains-kotlin From 37c36937b90890648018034f90f3eb799c0ed49f Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 10 Jun 2013 19:17:48 +0400 Subject: [PATCH 4/9] test --- libraries/docs/website/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml index e651bb0af29d9..bb2ec06ffc610 100644 --- a/libraries/docs/website/pom.xml +++ b/libraries/docs/website/pom.xml @@ -88,7 +88,7 @@ site-maven-plugin 0.8 - Update Kotlin API Docs + Update Kotlin API Docs (build ${build.number}}) jetbrains-kotlin From 8637258d185d4de6c1f6c157fd9a8a73a5a5074e Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 11 Jun 2013 21:04:39 +0400 Subject: [PATCH 5/9] Update pom.xml --- libraries/docs/website/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/docs/website/pom.xml b/libraries/docs/website/pom.xml index bb2ec06ffc610..bb5de81dcd88e 100644 --- a/libraries/docs/website/pom.xml +++ b/libraries/docs/website/pom.xml @@ -88,7 +88,7 @@ site-maven-plugin 0.8 - Update Kotlin API Docs (build ${build.number}}) + Update Kotlin API Docs (build ${build.number}) jetbrains-kotlin From 639a7f004efd2d867b3a40996c9a659d542a2160 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 29 May 2015 01:50:18 +0300 Subject: [PATCH 6/9] Create .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000..2018070e8fc28 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +**/testData/** linguist-vendored From 9ae949626306e6d70ba20be9feecdd5a7ebbc9d6 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 29 May 2015 01:54:06 +0300 Subject: [PATCH 7/9] Delete .gitattributes --- .gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 2018070e8fc28..0000000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -**/testData/** linguist-vendored From 4ae1785396b812f9c587ec046aff276be5e0e533 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 29 May 2015 01:55:59 +0300 Subject: [PATCH 8/9] Create .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000..2018070e8fc28 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +**/testData/** linguist-vendored From 142c610a4e9e81c2c001a331c74e4b82a1a05506 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 26 Jul 2017 22:35:32 +0300 Subject: [PATCH 9/9] Delete .gitattributes --- .gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 2018070e8fc28..0000000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -**/testData/** linguist-vendored