[maven-release-plugin] prepare branch 5.0

dCache · Dec 19, 2018 · d411179 · d411179
1 parent 48868f8
commit d411179
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/docs/TheBook/pom.xml b/docs/TheBook/pom.xml
@@ -156,7 +156,7 @@
                                           ref = 'git rev-parse --abbrev-ref --symbolic-full-name @{u}'.execute().text.trim()
                                       } else { // git checkout is a detached HEAD or not a git repo
                                           // Check each remote branch (if multiple, last one wins)
-                                          fer = 'git for-each-ref --format=%(refname:short) refs/remotes'.execute().text.eachLine { remoteRef ->
+                                          fer = 'git for-each-ref --format=%(refname:short) refs/remotes'.execute().text.eachLine { remoteRef -&gt;
                                               p = "git merge-base --is-ancestor HEAD $remoteRef".execute()
                                               p.waitFor()
                                               if (p.exitValue() == 0) {
@@ -190,17 +190,17 @@
                     <configuration>
                       <target>
                         <!-- Maven does not support defining more than one target -->
-                        <ant antfile="${basedir}/src/main/antruns/substituteFilename.xml"/>
+                        <ant antfile="${basedir}/src/main/antruns/substituteFilename.xml" />
 
                         <replaceregexp byline="true">
-                          <regexp pattern='href="([^/"][^"]*)\.html([^"]*)"'/>
-                          <substitution expression='href="\1.shtml\2"'/>
-                          <fileset dir="${raw-html-target.path}" includes="**/*.html"/>
+                          <regexp pattern="href=&quot;([^/&quot;][^&quot;]*)\.html([^&quot;]*)&quot;" />
+                          <substitution expression="href=&quot;\1.shtml\2&quot;" />
+                          <fileset dir="${raw-html-target.path}" includes="**/*.html" />
                         </replaceregexp>
 
                         <move todir="${raw-html-target.path}" includeemptydirs="false">
-                          <fileset dir="${raw-html-target.path}"/>
-                          <mapper type="glob" from="*.html" to="*.shtml"/>
+                          <fileset dir="${raw-html-target.path}" />
+                          <mapper type="glob" from="*.html" to="*.shtml" />
                         </move>
                       </target>
                     </configuration>

diff --git a/pom.xml b/pom.xml
@@ -118,7 +118,7 @@
         <url>https://github.com/dCache/dcache</url>
         <connection>scm:git:https://github.com/dCache/dcache.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/dCache/dcache.git</developerConnection>
-      <tag>HEAD</tag>
+      <tag>5.0</tag>
   </scm>
 
     <repositories>