mirror of https://github.com/apache/poi.git
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 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894277 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
ac0b1fd15a
commit
f406fe798f
|
@ -20,18 +20,6 @@ ooxml-testlib/
|
||||||
junit*.properties
|
junit*.properties
|
||||||
TEST-org.apache.poi*.xml
|
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
|
# IntelliJ
|
||||||
/out/
|
/out/
|
||||||
/*/out/
|
/*/out/
|
||||||
|
|
42
build.xml
42
build.xml
|
@ -639,13 +639,6 @@ under the License.
|
||||||
<delete dir="poi-ooxml/build"/>
|
<delete dir="poi-ooxml/build"/>
|
||||||
<delete dir="poi-ooxml-full/build"/>
|
<delete dir="poi-ooxml-full/build"/>
|
||||||
<delete dir="poi-scratchpad/build"/>
|
<delete dir="poi-scratchpad/build"/>
|
||||||
<delete includeemptydirs="true">
|
|
||||||
<fileset dir="sonar">
|
|
||||||
<include name="*/target/**"/>
|
|
||||||
<include name="*/build/**"/>
|
|
||||||
<include name="*/src/**"/>
|
|
||||||
</fileset>
|
|
||||||
</delete>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<macrodef name="downloadfile">
|
<macrodef name="downloadfile">
|
||||||
|
@ -2002,6 +1995,7 @@ under the License.
|
||||||
<uptodate property="main.docs.notRequired" targetfile="${build.site}/index.html">
|
<uptodate property="main.docs.notRequired" targetfile="${build.site}/index.html">
|
||||||
<srcfiles dir="${main.documentation}" />
|
<srcfiles dir="${main.documentation}" />
|
||||||
</uptodate>
|
</uptodate>
|
||||||
|
<echo message="Had result: ${main.docs.notRequired}"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="-check-forrest-installed" unless="env.FORREST_HOME">
|
<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"
|
<target name="-forrest-docs" depends="-check-forrest-installed, -check-docs"
|
||||||
unless="main.docs.notRequired" description="Builds the HTML pages of the POI website">
|
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="${env.FORREST_HOME}/bin/forrest" osfamily="unix"/>
|
||||||
<exec executable="cmd" osfamily="windows">
|
<exec executable="cmd" osfamily="windows">
|
||||||
<arg value="/c"/>
|
<arg value="/c"/>
|
||||||
|
@ -2389,8 +2385,6 @@ under the License.
|
||||||
out/**,
|
out/**,
|
||||||
tmp/**,
|
tmp/**,
|
||||||
gradle/**,
|
gradle/**,
|
||||||
sonar/**/target/**,
|
|
||||||
sonar/*/src/**,
|
|
||||||
compile-lib/**,
|
compile-lib/**,
|
||||||
ooxml-lib/**,
|
ooxml-lib/**,
|
||||||
ooxml-testlib/**,
|
ooxml-testlib/**,
|
||||||
|
@ -3031,26 +3025,16 @@ under the License.
|
||||||
<param name="version_id" value="${rel_next}"/>
|
<param name="version_id" value="${rel_next}"/>
|
||||||
</antcall>
|
</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 -->
|
<!-- unpin documentation and commit next snapshot version -->
|
||||||
<svn refid="svn.settings">
|
<svn refid="svn.settings">
|
||||||
<update dir="." recurse="true"/>
|
<update dir="." recurse="true"/>
|
||||||
<propset path="src" name="svn:externals" value="documentation https://svn.apache.org/repos/asf/poi/site/src/documentation"/>
|
<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">
|
<!--<commit message="prepare for ${rel_next}" recurse="false">
|
||||||
<fileset dir="." includes="build.xml"/>
|
<fileset dir="." includes="build.xml"/>
|
||||||
<fileset dir="sonar" includes="**/pom.xml"/>
|
|
||||||
<dirset dir="src"/>
|
<dirset dir="src"/>
|
||||||
</commit>-->
|
</commit>-->
|
||||||
</svn>
|
</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"/>
|
<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="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="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 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>
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
@ -3289,20 +3269,6 @@ under the License.
|
||||||
|
|
||||||
<target name="replaceVersion" description="Apply the version from build.xml in all other places">
|
<target name="replaceVersion" description="Apply the version from build.xml in all other places">
|
||||||
<replaceregexp
|
<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)?'"
|
match=" version = '[0-9.]+(?:-SNAPSHOT)?'"
|
||||||
replace=" version = '${version.id}'">
|
replace=" version = '${version.id}'">
|
||||||
<fileset dir=".">
|
<fileset dir=".">
|
||||||
|
|
|
@ -280,7 +280,6 @@ poijobs.each { poijob ->
|
||||||
/* remove xmlbeans while 4.0 is not stable */
|
/* remove xmlbeans while 4.0 is not stable */
|
||||||
includePattern('**/lib/ooxml/xmlbeans*.jar')
|
includePattern('**/lib/ooxml/xmlbeans*.jar')
|
||||||
includePattern('**/lib/ooxml/ooxml*.jar')
|
includePattern('**/lib/ooxml/ooxml*.jar')
|
||||||
includePattern('sonar/*/target/**')
|
|
||||||
/* remove ooxml-schemas while the builds migrate to 5th edition */
|
/* remove ooxml-schemas while the builds migrate to 5th edition */
|
||||||
includePattern('build/xmlbean-*/**')
|
includePattern('build/xmlbean-*/**')
|
||||||
/* remove remaining src debris */
|
/* remove remaining src debris */
|
||||||
|
|
Loading…
Reference in New Issue