[sling-tooling-release] branch master updated: SLING-6766 include all modules in the build (even the ones which do not have sling in their artifact names)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-tooling-release.git


The following commit(s) were added to refs/heads/master by this push:
     new a671445  SLING-6766 include all modules in the build (even the ones which do not have sling in their artifact names)
a671445 is described below

commit a671445dcbcf9e704ec0c1b4457335ca0d7a1113
Author: Konrad Windszus <ko...@netcentric.biz>
AuthorDate: Tue Feb 6 17:05:52 2018 +0100

    SLING-6766 include all modules in the build (even the ones which do not have sling in their artifact names)
---
 generate_javadoc_for_release.sh                                       | 4 ++--
 ...overy.impl-1.0.10 => sling-org.apache.sling.discovery.impl-1.0.10} | 0
 ...scovery.impl-1.1.8 => sling-org.apache.sling.discovery.impl-1.1.8} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generate_javadoc_for_release.sh b/generate_javadoc_for_release.sh
index 86457ff..5408b7a 100755
--- a/generate_javadoc_for_release.sh
+++ b/generate_javadoc_for_release.sh
@@ -28,10 +28,10 @@ artifacts+="adapter-annotations:1.0.0"
 for artifact in $artifacts; do
     artifact_name=$(echo $artifact | sed 's/:.*//')
     artifact_version=$(echo $artifact | sed 's/.*://')
-    artifact_dir="${artifact_name}-${artifact_version}"
+    branch_name="${artifact_name}-${artifact_version}"
+    artifact_dir="sling-${artifact_name}-${artifact_version}"
     artifact_repo=$(echo $artifact_name | tr '.' '-')
     artifact_repo="sling-${artifact_repo}"
-    branch_name=${artifact_dir}
 
     # - don't document Slingshot sample
     # - threaddump was renamed and tag history is lost
diff --git a/patches/org.apache.sling.discovery.impl-1.0.10 b/patches/sling-org.apache.sling.discovery.impl-1.0.10
similarity index 100%
rename from patches/org.apache.sling.discovery.impl-1.0.10
rename to patches/sling-org.apache.sling.discovery.impl-1.0.10
diff --git a/patches/org.apache.sling.discovery.impl-1.1.8 b/patches/sling-org.apache.sling.discovery.impl-1.1.8
similarity index 100%
rename from patches/org.apache.sling.discovery.impl-1.1.8
rename to patches/sling-org.apache.sling.discovery.impl-1.1.8

-- 
To stop receiving notification emails like this one, please contact
rombert@apache.org.