You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2021/10/15 07:58:20 UTC
svn commit: r1894277 - in /poi/trunk: .gitignore build.xml
jenkins/create_jobs.groovy
Author: centic
Date: Fri Oct 15 07:58:20 2021
New Revision: 1894277
URL: http://svn.apache.org/viewvc?rev=1894277&view=rev
Log:
Remove some remnants of sonar-directory which cause CI failures
Remove handling of "sonar" in build.xml
Remove unused gitignores
Add some more output to build.xml
Adjust Jenkins DSL to not try to cleanup non-existing directory
Modified:
poi/trunk/.gitignore
poi/trunk/build.xml
poi/trunk/jenkins/create_jobs.groovy
Modified: poi/trunk/.gitignore
URL: http://svn.apache.org/viewvc/poi/trunk/.gitignore?rev=1894277&r1=1894276&r2=1894277&view=diff
==============================================================================
--- poi/trunk/.gitignore (original)
+++ poi/trunk/.gitignore Fri Oct 15 07:58:20 2021
@@ -20,18 +20,6 @@ ooxml-testlib/
junit*.properties
TEST-org.apache.poi*.xml
-# Sonar
-.sonar
-sonar/main/src/
-sonar/ooxml/src/
-sonar/scratchpad/src/
-sonar/ooxml-full/src/
-sonar/examples/src/
-sonar/excelant/src/
-sonar/integration-test/src/
-sonar/target
-sonar/*/target
-
# IntelliJ
/out/
/*/out/
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1894277&r1=1894276&r2=1894277&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Oct 15 07:58:20 2021
@@ -639,13 +639,6 @@ under the License.
<delete dir="poi-ooxml/build"/>
<delete dir="poi-ooxml-full/build"/>
<delete dir="poi-scratchpad/build"/>
- <delete includeemptydirs="true">
- <fileset dir="sonar">
- <include name="*/target/**"/>
- <include name="*/build/**"/>
- <include name="*/src/**"/>
- </fileset>
- </delete>
</target>
<macrodef name="downloadfile">
@@ -2002,6 +1995,7 @@ under the License.
<uptodate property="main.docs.notRequired" targetfile="${build.site}/index.html">
<srcfiles dir="${main.documentation}" />
</uptodate>
+ <echo message="Had result: ${main.docs.notRequired}"/>
</target>
<target name="-check-forrest-installed" unless="env.FORREST_HOME">
@@ -2020,6 +2014,8 @@ under the License.
<target name="-forrest-docs" depends="-check-forrest-installed, -check-docs"
unless="main.docs.notRequired" description="Builds the HTML pages of the POI website">
+ <echo message="Using Apache Forrest from ${env.FORREST_HOME}"/>
+
<exec executable="${env.FORREST_HOME}/bin/forrest" osfamily="unix"/>
<exec executable="cmd" osfamily="windows">
<arg value="/c"/>
@@ -2389,8 +2385,6 @@ under the License.
out/**,
tmp/**,
gradle/**,
- sonar/**/target/**,
- sonar/*/src/**,
compile-lib/**,
ooxml-lib/**,
ooxml-testlib/**,
@@ -3031,26 +3025,16 @@ under the License.
<param name="version_id" value="${rel_next}"/>
</antcall>
- <!-- update sonar pom.xmls -->
- <replaceregexp byline="true">
- <regexp pattern="<version>.*-SNAPSHOT</version>"/>
- <substitution expression="<version>${rel_next}-SNAPSHOT</version>"/>
- <fileset dir="sonar">
- <include name="**/pom.xml"/>
- </fileset>
- </replaceregexp>
-
<!-- unpin documentation and commit next snapshot version -->
<svn refid="svn.settings">
<update dir="." recurse="true"/>
<propset path="src" name="svn:externals" value="documentation https://svn.apache.org/repos/asf/poi/site/src/documentation"/>
<!--<commit message="prepare for ${rel_next}" recurse="false">
<fileset dir="." includes="build.xml"/>
- <fileset dir="sonar" includes="**/pom.xml"/>
<dirset dir="src"/>
</commit>-->
</svn>
- <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'prepare for ${rel_next}' build.xml sonar src"/>
+ <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'prepare for ${rel_next}' build.xml src poi*"/>
<mkdir dir="build/release"/>
@@ -3123,10 +3107,6 @@ under the License.
<replaceregexp file="poi-examples/src/main/scala/build.sbt" match='( *org.apache.poi.* ")[0-9.]+(.+)' replace="\1${rel_prev}\2" byline="true"/>
<replaceregexp file="osgi/pom.xml" match="version>${rel_prev}[^<]+" replace="version>${version.id}"/>
<replaceregexp file="doap_POI.rdf" match="<release>" replace="<release> <Version> <name>Apache POI ${rel_prev}</name> <created>${file_date_iso}</created> <revision>${rel_prev}</revision> </Version> </release> <release>"/>
-
- <replaceregexp match="(<version>)[^<]+" replace="\1${version.id}">
- <fileset dir="sonar" includes="**/pom.xml"/>
- </replaceregexp>
</target>
@@ -3289,20 +3269,6 @@ under the License.
<target name="replaceVersion" description="Apply the version from build.xml in all other places">
<replaceregexp
- match="(packaging>\n\s*<version>)[0-9.]+(?:-SNAPSHOT)?"
- replace="\1${version.id}">
- <fileset dir="sonar">
- <include name="**/pom.xml"/>
- </fileset>
- </replaceregexp>
- <replaceregexp
- match="(poi-parent</artifactId>\n\s*<version>)[0-9.]+(?:-SNAPSHOT)?"
- replace="\1${version.id}">
- <fileset dir="sonar">
- <include name="**/pom.xml"/>
- </fileset>
- </replaceregexp>
- <replaceregexp
match=" version = '[0-9.]+(?:-SNAPSHOT)?'"
replace=" version = '${version.id}'">
<fileset dir=".">
Modified: poi/trunk/jenkins/create_jobs.groovy
URL: http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1894277&r1=1894276&r2=1894277&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Fri Oct 15 07:58:20 2021
@@ -280,7 +280,6 @@ poijobs.each { poijob ->
/* remove xmlbeans while 4.0 is not stable */
includePattern('**/lib/ooxml/xmlbeans*.jar')
includePattern('**/lib/ooxml/ooxml*.jar')
- includePattern('sonar/*/target/**')
/* remove ooxml-schemas while the builds migrate to 5th edition */
includePattern('build/xmlbean-*/**')
/* remove remaining src debris */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org