jython/jython-dont-validate-pom.patch

100 lines
4.2 KiB
Diff

Only in jython-2.7.3: build.xml.orig
Only in jython-2.7.3: build.xml.rej
--- jython-2.7.3/maven/build.xml 2023-06-27 13:47:28.639774958 +0200
+++ jython-2.7.3/maven/build.xml 2023-06-27 13:58:10.216237299 +0200
@@ -155,9 +155,6 @@
</filterset>
</copy>
- <!-- Sign everything. -->
- <sign-all stageDir="@{stageDir}" artifactId="@{artifactId}" version="@{version}" />
-
<!-- JAR-up the entire contents of the staging directory. -->
<jar jarfile="${pubs.dir}/@{basename}-bundle.jar">
<fileset dir="@{stageDir}" />
@@ -175,9 +172,6 @@
<attribute name="stageDir" default="${build.maven}" />
<attribute name="basename" default="@{artifactId}-@{version}" />
<sequential>
- <!-- Validate the POM -->
- <validate-pom file="@{fromdir}/@{basename}.pom" />
-
<!-- Clean the staging directory. -->
<delete dir="@{stageDir}" />
<mkdir dir="@{stageDir}" />
@@ -190,9 +184,6 @@
</fileset>
</copy>
- <!-- Sign everything. -->
- <sign-all stageDir="@{stageDir}" artifactId="@{artifactId}" version="@{version}" />
-
<!-- JAR-up the entire contents of the staging directory. -->
<jar jarfile="${pubs.dir}/@{basename}-bundle.jar">
<fileset dir="@{stageDir}" />
@@ -200,61 +191,11 @@
</sequential>
</macrodef>
- <!-- Add detached signature for single artifact in staging directory. -->
- <macrodef name="sign-detached">
- <attribute name="file" />
- <attribute name="stageDir" />
- <sequential>
- <!-- Generate a detached signature for each artifact in the bundle. -->
- <exec executable="gpg" dir="@{stageDir}">
- <arg value="-ab" />
- <arg value="@{file}" />
- </exec>
- </sequential>
- </macrodef>
-
- <!-- Add detached signatures for group of artifacts in staging directory. -->
- <macrodef name="sign-all">
- <attribute name="artifactId" />
- <attribute name="version" />
- <attribute name="stageDir" />
- <attribute name="basename" default="@{artifactId}-@{version}" />
- <sequential>
- <sign-detached stageDir="@{stageDir}" file="@{basename}.pom" />
- <sign-detached stageDir="@{stageDir}" file="@{basename}.jar" />
- <sign-detached stageDir="@{stageDir}" file="@{basename}-sources.jar" />
- <sign-detached stageDir="@{stageDir}" file="@{basename}-javadoc.jar" />
- </sequential>
- </macrodef>
-
- <!-- Validate a Maven POM . -->
- <macrodef name="validate-pom">
- <attribute name="file" />
- <sequential>
- <xmlvalidate failonerror="true" file="@{file}">
- <attribute name="http://xml.org/sax/features/validation" value="true" />
- <attribute name="http://apache.org/xml/features/validation/schema" value="true" />
- <attribute name="http://xml.org/sax/features/namespaces" value="true" />
- <property name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation" value="maven/maven-v4_0_0.xsd" />
- </xmlvalidate>
- </sequential>
- </macrodef>
-
- <!-- Validate the POM template. -->
- <target name="validate-template-pom">
- <validate-pom file="maven/pom-template.xml"/>
- </target>
-
- <!-- Validate the base POM produced by Gradle task generatePomFileForMainPublication. -->
- <target name="validate-gradle-pom" depends="version">
- <validate-pom file="${gradle.base}/publications/main/pom-default.xml"/>
- </target>
-
<target name="build-jython" if="do.build">
<ant antfile="build.xml" target="all-jars" />
</target>
- <target name="prepare" depends="build-jython, validate-template-pom, version">
+ <target name="prepare" depends="build-jython, version">
<local name="artifacts" />
<property name="artifacts" value="${gradle.repo}/${m2.groupDir}/jython-slim/${jython.version}" />
<condition property="gradle.published">
Only in jython-2.7.3/maven: build.xml.orig
Only in jython-2.7.3/maven: build.xml.rej