You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2021/07/01 18:23:55 UTC
[ofbiz-framework] branch trunk updated: Improved: Remove SVN
references in build (OFBIZ-12267) (#305)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1aaa2e7 Improved: Remove SVN references in build (OFBIZ-12267) (#305)
1aaa2e7 is described below
commit 1aaa2e7751197314a20ad0a444b0d59c7c357d62
Author: Eugen Stan <ie...@apache.org>
AuthorDate: Thu Jul 1 21:23:47 2021 +0300
Improved: Remove SVN references in build (OFBIZ-12267) (#305)
Removed SVN references in git ant templates.
---
README.adoc | 12 +-------
.../helpdata/HELP_OFBizDocumentationSystem.xml | 2 +-
.../helpdata/HELP_OFBizDocumentationSystem_FR.xml | 2 +-
build.gradle | 32 ++--------------------
themes/flatgrey/template/Footer.ftl | 1 -
themes/rainbowstone/README.md | 4 +--
themes/rainbowstone/template/includes/Footer.ftl | 1 -
themes/tomahawk/template/Footer.ftl | 1 -
8 files changed, 8 insertions(+), 47 deletions(-)
diff --git a/README.adoc b/README.adoc
index 77a9b59..8c2c7ce 100644
--- a/README.adoc
+++ b/README.adoc
@@ -675,16 +675,11 @@ latest version of a plugin.
`gradlew pullPluginSource -PpluginId=ecommerce`
-________________________________________________________________________________________
-_Note_: This plugin will have its own .svn directory placed inside the plugin
-directory.
-________________________________________________________________________________________
-
[[pull-all-official-plugins-from-source-control]]
=== Pull all official plugins from source control
Download all officially supported plugins from source control (currently
-subversion) and place them inclusive of their ".svn" directory in /plugins.
+git) and place them in /plugins.
WARNING! This task deletes the /plugins directory and replaces it with the
official plugins.
@@ -696,11 +691,6 @@ not recommend using this task on releases of OFBiz, instead consider using the
"pullPlugin" task to get the correct version of a plugin compatible with your
release.
-____________________________________________________________________________________
-_Note_: All the plugins will share a .svn directory placed in the plugins
-directory.
-____________________________________________________________________________________
-
[[install-a-plugin]]
=== Install a plugin
diff --git a/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml b/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
index baa52dd..1f04071 100644
--- a/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
+++ b/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem.xml
@@ -92,7 +92,7 @@
</listitem>
<listitem>
<para>
- Submit the change to the svn repository or create a diff file and attach it to a jira issue.
+ Submit the change to the git repository or create a diff file and attach it to a jira issue.
</para>
</listitem>
<listitem>
diff --git a/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml b/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
index 26f5a2c..4939cf4 100644
--- a/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
+++ b/applications/commonext/data/helpdata/HELP_OFBizDocumentationSystem_FR.xml
@@ -76,7 +76,7 @@
</para>
</listitem>
<listitem>
- <para>Committer les changements dans le référentiel SVN ou créez un fichier diff et joignez-le à un jira.</para>
+ <para>Committer les changements dans le référentiel GIT ou créez un fichier diff et joignez-le à un jira.</para>
</listitem>
<listitem>
<para>Si le texte d'aide est utile à la documentation d'OFBiz, incluez-le dans les fichiers du répertoire où se trouve le document.</para>
diff --git a/build.gradle b/build.gradle
index ec0b661..765a727 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,9 +119,8 @@ tasks.withType(JavaCompile) {
}
}
-// defines the footer files for svn and git info
+// defines the footer files for git info
def File gitFooterFile = file("${rootDir}/runtime/GitInfo.ftl")
-def File svnFooterFile = file("${rootDir}/runtime/SvnInfo.ftl")
// root and subproject settings
defaultTasks 'jar', 'test'
@@ -720,32 +719,6 @@ task gitInfoFooter(group: sysadminGroup, description: 'Update the Git Branch-rev
}
}
-task svnInfoFooter(group: sysadminGroup, description: 'Update the Subversion revision info in the footer if Subversion is used') {
- doLast {
- def timestamp = new Date().format 'yyyy-MM-dd HH:mm:ss'
- def svnOutput = new ByteArrayOutputStream()
- def svnFolder = new File('.svn')
-
- if (!svnFolder.exists()) {
- println ("Subversion is not used")
- return
- }
-
- exec{
- commandLine 'svn', 'info', '--xml'
- standardOutput = svnOutput
- }
- def info = new XmlParser().parseText(svnOutput.toString())
- svnFooterFile.delete()
- svnFooterFile.createNewFile()
- svnFooterFile << System.lineSeparator()
- svnFooterFile << '${uiLabelMap.CommonBranch} : ' + "${info.entry.url.text()}" + System.lineSeparator()
- svnFooterFile << '${uiLabelMap.CommonRevision} : ' + "${info.entry.commit.@revision}" + System.lineSeparator()
- svnFooterFile << '${uiLabelMap.CommonBuiltOn} : ' + "${timestamp}" + System.lineSeparator()
- svnFooterFile << '${uiLabelMap.CommonJavaVersion} : ' + "${org.gradle.internal.jvm.Jvm.current()}"
- }
-}
-
// ========== OFBiz Plugin Management ==========
task createPlugin(group: ofbizPlugin, description: 'create a new plugin component based on specified templates') {
doLast {
@@ -942,6 +915,7 @@ task pullPlugin(group: ofbizPlugin, description: 'Download and install a plugin
task pullPluginSource(group: ofbizPlugin, description: 'Download and install a plugin from source control') {
if (project.hasProperty('pluginId')) {
+ // GitHub SVN feature https://docs.github.com/en/github/importing-your-projects-to-github/working-with-subversion-on-github/support-for-subversion-clients
task pullPluginFromSvn(type: SvnCheckout) {
svnUrl = "https://github.com/apache/ofbiz-plugins/trunk/${pluginId}"
workspaceDir = "${pluginsDir}/${pluginId}"
@@ -960,6 +934,7 @@ task pullAllPluginsSource(group: ofbizPlugin,
doLast { delete "${pluginsDir}" }
}
task pullPluginsFromSvn(type: SvnCheckout, dependsOn: deleteBeforePulling) {
+ // GitHub SVN feature https://docs.github.com/en/github/importing-your-projects-to-github/working-with-subversion-on-github/support-for-subversion-clients
svnUrl = "https://github.com/apache/ofbiz-plugins/trunk"
workspaceDir = "${pluginsDir}"
}
@@ -1020,7 +995,6 @@ task cleanXtra(group: cleanupGroup, description: 'Clean extra generated files li
task cleanFooterFiles(group: cleanupGroup, description: 'clean generated footer files') {
doLast {
delete gitFooterFile
- delete svnFooterFile
}
}
/*
diff --git a/themes/flatgrey/template/Footer.ftl b/themes/flatgrey/template/Footer.ftl
index 64df1b3..f552c9c 100644
--- a/themes/flatgrey/template/Footer.ftl
+++ b/themes/flatgrey/template/Footer.ftl
@@ -28,7 +28,6 @@ under the License.
<a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span>
<span class="footerTextColour">
${uiLabelMap.CommonRelease} <#include "ofbizhome://VERSION" ignore_missing=true/>
- <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/>
<#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
</span>
</div>
diff --git a/themes/rainbowstone/README.md b/themes/rainbowstone/README.md
index 372705b..9cd9f71 100644
--- a/themes/rainbowstone/README.md
+++ b/themes/rainbowstone/README.md
@@ -4,10 +4,10 @@
# Rainbowstone theme
This back-end OFBiz theme is bootstrap based and offers 4 colour variants. As an example
-<img src="http://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/images/themeRuby.png" alt="Rainbowstone ruby colour variant" />
+<img src="https://raw.githubusercontent.com/apache/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/images/themeRuby.png" alt="Rainbowstone ruby colour variant" />
## License
-The Rainbowstone theme uses the Quicksand font which is licensed under the [SIL OPEN FONT LICENSE Version 1.1](https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/Quicksand SIL OFL License 1.1.txt "SIL OPEN FONT LICENSE Version 1.1")
+The Rainbowstone theme uses the Quicksand font which is licensed under the [SIL OPEN FONT LICENSE Version 1.1](https://raw.githubusercontent.com/apache/ofbiz-framework/trunk/LICENSE)
## more information
For more information about this component visit the product page in the OFBiz WIKI,
diff --git a/themes/rainbowstone/template/includes/Footer.ftl b/themes/rainbowstone/template/includes/Footer.ftl
index 795ace3..f926c47 100644
--- a/themes/rainbowstone/template/includes/Footer.ftl
+++ b/themes/rainbowstone/template/includes/Footer.ftl
@@ -23,7 +23,6 @@ under the License.
<a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy}
<a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> ${uiLabelMap.CommonRelease}
<#include "ofbizhome://VERSION" ignore_missing=true/>
- <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/>
<#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
</span>
</div>
diff --git a/themes/tomahawk/template/Footer.ftl b/themes/tomahawk/template/Footer.ftl
index a2d78a7..c40e28a 100644
--- a/themes/tomahawk/template/Footer.ftl
+++ b/themes/tomahawk/template/Footer.ftl
@@ -25,7 +25,6 @@ under the License.
${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br/>
${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> ${uiLabelMap.CommonRelease}
<#include "ofbizhome://VERSION" ignore_missing=true/>
- <#include "ofbizhome://runtime/SvnInfo.ftl" ignore_missing=true/>
<#include "ofbizhome://runtime/GitInfo.ftl" ignore_missing=true/>
</li>
<li class="opposed">${nowTimestamp?datetime?string.short} -