Update apache release.

apache · Oct 17, 2019 · d8e1ed9 · d8e1ed9
1 parent 1020a98
commit d8e1ed9
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019 Apache Incubator-Weex
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/android/build.gradle b/android/build.gradle
@@ -77,6 +77,7 @@ ext {
     disableCov = project.hasProperty("disableCov") && disableCov.equals("true")
     useApachePackageName = project.hasProperty('apachePackageName') ? project.property('apachePackageName').toBoolean() : false
     unbundlingJSC = project.hasProperty('unbundlingJSC') ? project.property('unbundlingJSC').toBoolean() : false
+    artifactName = project.hasProperty('artifactName') ? project.property('artifactName') : 'weex_sdk'
     implementFromWeex = true
 }
 

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -33,7 +33,8 @@ apply from: 'buildSrc/download_jsc.gradle'
 apply from: 'buildSrc/packageName.gradle'
 apply from: 'buildSrc/asan.gradle'
 
-version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : '0.26.0.1'
+version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : '0.28.0.1'
+group = "com.taobao.android"
 
 //Check version, the version must have 4 sections. The leading three section must be number, and the last section is odd number with or without suffix string.
 if (!project.hasProperty('ignoreVersionCheck') || !project.getProperty('ignoreVersionCheck').equals("true")) {

diff --git a/android/sdk/buildSrc/jcenter.gradle b/android/sdk/buildSrc/jcenter.gradle
@@ -16,33 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-def siteUrl = 'https://weex.incubator.apache.org'
+def siteUrl = 'https://weex.apache.org/'
 def gitUrl = 'https://github.com/apache/incubator-weex.git'
-group = "com.taobao.android"
+def mailingList = 'dev@weex.apache.org'
+def description='Weex release is always under the form of source code, the JCenter distribuion is only used for users\' convenience. View https://weex.apache.org/download/download.html for all the source code release'
 install {
     repositories.mavenInstaller {
         // This generates POM.xml with proper parameters
         pom {
             project {
                 packaging 'aar'
-                name 'weex_sdk'
+                name project.artifactName
+                groupId 'org.apache.weex'
                 url siteUrl
                 licenses {
                     license {
                         name 'The Apache Software License, Version 2.0'
-                        url 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                        url 'https://raw.githubusercontent.com/apache/incubator-weex/master/LICENSE'
                     }
                 }
                 developers {
                     developer {
-                        id 'weex alibaba'
-                        name 'weex alibaba'
-                        email 'alibabaweex@gmail.com'
+                        name 'Apache Incubator-Weex PPMC'
+                        email mailingList
                     }
                 }
                 scm {
                     connection gitUrl
-                    developerConnection gitUrl
+                    developerConnection mailingList
                     url siteUrl
                 }
             }
@@ -56,18 +57,28 @@ bintray {
     key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
     pkg {
         repo = "maven"
-        name = "weex_sdk"
+        name = 'weex_sdk'
         websiteUrl = siteUrl
+        desc = description
         vcsUrl = gitUrl
         licenses = ["Apache-2.0"]
         publish = true
         version {
-            //The version to be published
             name = project.version
-            vcsTag = project.version
+            vcsTag = project.hasProperty('vcsTag') ? project.property('vcsTag') : project.version
         }
     }
 }
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+artifacts {
+    archives sourcesJar
+}
+
 artifactory {
     contextUrl = 'http://oss.jfrog.org/artifactory'
     publish {

diff --git a/scripts/publish_release_official.sh b/scripts/publish_release_official.sh
@@ -36,19 +36,20 @@ sed -i '' 's/^*//' commit-history.log
 sed -i '' 's/^/* /' commit-history.log
 sed -i '' -e '1i \
 # Detail Commit' commit-history.log
-cat CHANGELOG.md commit-history.log > RELEASE_NOTE.md
+cat DISCLAIMER CHANGELOG.md commit-history.log > RELEASE_NOTE.md
 
 echo "Publish source file to Apache SVN server"
 if [ ! -d "${TMPDIR}weex_release" ]
 then
     svn checkout https://dist.apache.org/repos/dist/release/incubator/weex/ "${TMPDIR}weex_release"
 fi
+svn delete .
 mkdir -p "${TMPDIR}weex_release/${1}" && cd "$_"
 curl "https://dist.apache.org/repos/dist/dev/incubator/weex/${1}/${2}/apache-weex-incubating-${1}-${2}-src.tar.gz" -o "apache-weex-incubating-${1}-src.tar.gz"
 curl "https://dist.apache.org/repos/dist/dev/incubator/weex/${1}/${2}/apache-weex-incubating-${1}-${2}-src.tar.gz.asc" -o "apache-weex-incubating-${1}-src.tar.gz.asc"
 curl "https://dist.apache.org/repos/dist/dev/incubator/weex/${1}/${2}/apache-weex-incubating-${1}-${2}-src.tar.gz.sha512" -o "apache-weex-incubating-${1}-src.tar.gz.sha512"
 cd ..
-svn add "$1"
+svn add . --force
 svn commit -m "Release ${1}"
 
 echo "Push Git Tag to Github Repo"
@@ -62,6 +63,7 @@ release-it --ci --no-npm --no-increment --no-git.requireCleanWorkingDir --no-git
 
 echo "Publish Android JCenter Release"
 cd android
-./gradlew clean install bintray -PbuildRuntimeApi=true -PignoreVersionCheck="true"  -PweexVersion="$1" -PbintrayUser=alibabaweex -PbintrayApiKey="$6" 
+./gradlew clean install bintray -PartifactName="sdk" -PuseApachePackageName="true" -PvcsTag="$1" -PunbundlingJSC="true" -PbuildRuntimeApi=true -PignoreVersionCheck="true" -PweexVersion="$1" -PbintrayUser=alibabaweex -PbintrayApiKey="$6" 
+./gradlew install bintray -PartifactName="sdk_legacy" -PuseApachePackageName="false" -PvcsTag="$1" -PunbundlingJSC="true" -PbuildRuntimeApi=true -PignoreVersionCheck="true" -PweexVersion="$1" -PbintrayUser=alibabaweex -PbintrayApiKey="$6" 
 
 # Publish iOS to Cocoapods