Skip to content

AXIS2-6082 fix reproducible builds issues #879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertlazarski merged 2 commits into from
Mar 21, 2025
Merged

AXIS2-6082 fix reproducible builds issues #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f648261
AXIS2-6082 fix reproducible builds issues
hboutemy Mar 15, 2025
760f0de
AXIS2-6082 drop unused build.time property
hboutemy Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions modules/adb-codegen/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,10 @@
<phase>process-resources</phase>
<configuration>
<target>
<tstamp>
<format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en" />
</tstamp>
<copy toDir="${basedir}/target/classes/" overwrite="true" filtering="on">
<fileset dir="${basedir}/src/" includes="**/*.xsl" />
<filterset begintoken="#" endtoken="#">
<filter token="axisVersion" value="${project.version}" />
<filter token="today" value=" Built on : ${build.time}" />
</filterset>
</copy>
</target>
Expand Down
2 changes: 1 addition & 1 deletion modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
* <xsl:value-of select="$name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

<xsl:if test="string-length(normalize-space(@package)) > 0">
Expand Down
2 changes: 1 addition & 1 deletion modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
* <xsl:value-of select="$name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

package <xsl:value-of select="@package"/>;
Expand Down
4 changes: 2 additions & 2 deletions modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* <xsl:value-of select="$name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

<xsl:if test="string-length(normalize-space(@package)) > 0">
Expand Down Expand Up @@ -72,7 +72,7 @@
* <xsl:value-of select="$name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

<xsl:if test="string-length(normalize-space(@package)) > 0">
Expand Down
6 changes: 3 additions & 3 deletions modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* <xsl:value-of select="$axis2_name"/>.h
*
* This file was auto-generated from WSDL
* by the Apache Axis2/Java version: #axisVersion# #today#
* by the Apache Axis2/Java version: #axisVersion#
*/

#include &lt;stdio.h&gt;
Expand Down Expand Up @@ -89,7 +89,7 @@
* <xsl:value-of select="$axis2_name"/>.h
*
* This file was auto-generated from WSDL
* by the Apache Axis2/Java version: #axisVersion# #today#
* by the Apache Axis2/Java version: #axisVersion#
*/

/**
Expand Down Expand Up @@ -1087,7 +1087,7 @@
* <xsl:value-of select="$axis2_name"/>.h
*
* This file was auto-generated from WSDL
* by the Apache Axis2/Java version: #axisVersion# #today#
* by the Apache Axis2/Java version: #axisVersion#
*/

#include &lt;stdio.h&gt;
Expand Down
4 changes: 2 additions & 2 deletions modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* <xsl:value-of select="$axis2_name"/>.c
*
* This file was auto-generated from WSDL
* by the Apache Axis2/Java version: #axisVersion# #today#
* by the Apache Axis2/Java version: #axisVersion#
*/

#include "<xsl:value-of select="$axis2_name"/>.h"
Expand Down Expand Up @@ -6617,7 +6617,7 @@
* <xsl:value-of select="$axis2_name"/>.c
*
* This file was auto-generated from WSDL
* by the Apache Axis2/Java version: #axisVersion# #today#
* by the Apache Axis2/Java version: #axisVersion#
*/

#include "<xsl:value-of select="$axis2_name"/>.h"
Expand Down
4 changes: 2 additions & 2 deletions modules/adb-codegen/src/org/apache/axis2/schema/template/PlainBeanTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* <xsl:value-of select="$name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

package <xsl:value-of select="@package"/>;
Expand All @@ -54,7 +54,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

package <xsl:value-of select="@package"/>;
Expand Down
2 changes: 1 addition & 1 deletion modules/adb/test/org/apache/axis2/databinding/ClientInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* ClientInfo.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

package org.apache.axis2.databinding;
Expand Down
2 changes: 1 addition & 1 deletion modules/adb/test/org/apache/axis2/databinding/CreateAccountRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* CreateAccountRequest.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

package org.apache.axis2.databinding;
Expand Down
4 changes: 0 additions & 4 deletions modules/codegen/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,10 @@
<phase>process-resources</phase>
<configuration>
<target>
<tstamp>
<format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en" />
</tstamp>
<copy toDir="${basedir}/target/classes/" overwrite="true" filtering="on">
<fileset dir="${basedir}/src/" includes="**/*.xsl" />
<filterset begintoken="#" endtoken="#">
<filter token="axisVersion" value="${project.version}" />
<filter token="today" value=" Built on : ${build.time}" />
</filterset>
</copy>
</target>
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceSkeleton.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* <xsl:value-of select="@name"/>.c
*
* This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
* <xsl:value-of select="$skeletonname"/>
*/

Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/c/ServiceXMLTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<xsl:template match="/">
<xsl:comment> This file was auto-generated from WSDL </xsl:comment>
<xsl:comment> by the Apache Axis2 version: #axisVersion# #today# </xsl:comment>
<xsl:comment> by the Apache Axis2 version: #axisVersion# </xsl:comment>
<xsl:apply-templates/>
</xsl:template>

Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* <xsl:value-of select="@name"/>.h
*
* This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
* by the Apache Axis2/C version: #axisVersion# #today#
* by the Apache Axis2/C version: #axisVersion#
* <xsl:value-of select="@name"/> Axis2/C skeleton for the axisService- Header file
*/

Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelSourceTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* <xsl:value-of select="@name"/>.c
*
* This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
* by the Apache Axis2/C version: #axisVersion# #today#
* by the Apache Axis2/C version: #axisVersion#
* <xsl:value-of select="@name"/> Axis2/C skeleton for the axisService
*/

Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* <xsl:value-of select="@name"/>.h
*
* This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
* by the Apache Axis2/Java version: #axisVersion# #today#
* by the Apache Axis2/Java version: #axisVersion#
*/

#ifndef <xsl:value-of select="$caps_name"/>_H
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/c/StubSourceTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* <xsl:value-of select="@name"/>.c
*
* This file was auto-generated from WSDL for "<xsl:value-of select="$qname"/>" service
* by the Apache Axis2/Java version: #axisVersion# #today#
* by the Apache Axis2/Java version: #axisVersion#
*/

#include "<xsl:value-of select="@name"/>.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/general/ServiceXMLTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<xsl:template match="/">
<xsl:comment> This file was auto-generated from WSDL </xsl:comment>
<xsl:comment> by the Apache Axis2 version: #axisVersion# #today# </xsl:comment>
<xsl:comment> by the Apache Axis2 version: #axisVersion# </xsl:comment>
<serviceGroup>
<xsl:apply-templates/>
</serviceGroup>
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

package <xsl:value-of select="@package"/>;
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/ExceptionTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

package <xsl:value-of select="@package"/>;
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/
package <xsl:value-of select="$package"/>;

Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/

package <xsl:value-of select="$package"/>;
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsExceptionTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import <xsl:value-of select="@value"/>;</xsl:for-each>
* <xsl:value-of select="@name"/>.java
*
* This class was auto-generated from WSDL.
* Apache Axis2 version: #axisVersion# #today#
* Apache Axis2 version: #axisVersion#
*
*/
<xsl:for-each select="annotation">
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceClassTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import javax.xml.ws.Service;<!--<xsl:for-each select="importList/import">-->
* <xsl:value-of select="@name"/>.java
*
* This class was auto-generated from WSDL.
* Apache Axis2 version: #axisVersion# #today#
* Apache Axis2 version: #axisVersion#
*
*/
<xsl:for-each select="annotation">
Expand Down
2 changes: 1 addition & 1 deletion ...gen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceImplTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* <xsl:value-of select="@name"/>.java
*
* This class was auto-generated from WSDL.
* Apache Axis2 version: #axisVersion# #today#
* Apache Axis2 version: #axisVersion#
*/
<xsl:for-each select="annotation">
<xsl:variable name="annoparamcount" select="count(param)"/>
Expand Down
2 changes: 1 addition & 1 deletion ...codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceEndpointInterfaceTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import <xsl:value-of select="@value"/>;</xsl:for-each>
* <xsl:value-of select="@name"/>.java
*
* This class was auto-generated from WSDL.
* Apache Axis2 version: #axisVersion# #today#
* Apache Axis2 version: #axisVersion#
*/
<xsl:for-each select="annotation">
<xsl:variable name="annoparamcount" select="count(param)"/>
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/JaxwsServiceXMLTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<xsl:template match="/">
<xsl:comment> This file was auto-generated from WSDL </xsl:comment>
<xsl:comment> Apache Axis2 version: #axisVersion# #today# </xsl:comment>
<xsl:comment> Apache Axis2 version: #axisVersion# </xsl:comment>
<serviceGroup>
<xsl:apply-templates/>
</serviceGroup>
Expand Down
6 changes: 3 additions & 3 deletions modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/
package <xsl:value-of select="@package"/>;

Expand Down Expand Up @@ -322,7 +322,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/
package <xsl:value-of select="@package"/>;

Expand Down Expand Up @@ -440,7 +440,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/
package <xsl:value-of select="@package"/>;

Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonInterfaceTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/
package <xsl:value-of select="@package"/>;
/**
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/
package <xsl:value-of select="@package"/>;
/**
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/src/org/apache/axis2/wsdl/template/java/TestClassTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* <xsl:value-of select="@name"/>.java
*
* This file was auto-generated from WSDL
* by the Apache Axis2 version: #axisVersion# #today#
* by the Apache Axis2 version: #axisVersion#
*/
package <xsl:value-of select="$package"/>;

Expand Down
4 changes: 0 additions & 4 deletions modules/kernel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,7 @@
<phase>process-resources</phase>
<configuration>
<target>
<tstamp>
<format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en" />
</tstamp>
<filter token="axisVersion" value="${project.version}" />
<filter token="TODAY" value="${build.time}" />
<copy toDir="${basedir}/target/classes/org/apache/axis2/i18n" overwrite="true" filtering="on" file="${basedir}/src/org/apache/axis2/i18n/resource.properties" />
</target>
</configuration>
Expand Down
2 changes: 0 additions & 2 deletions modules/kernel/src/org/apache/axis2/i18n/resource.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
# PROCESS.
axisVersion=Apache Axis2 version: @axisVersion@
axisVersionRaw=@axisVersion@
axisBuiltOnRaw=@TODAY@
axisUserAgent=Axis/@axisVersion@
builtOn=Built on @TODAY@
#############################################################################

threadpoolshutdown=Thread pool is shut down.
Expand Down
2 changes: 0 additions & 2 deletions modules/metadata/src/org/apache/axis2/jaxws/i18n/resource.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@
# PROCESS.
axisVersion=Apache Axis2 version: #axisVersion#
axisVersionRaw=#axisVersion#
axisBuiltOnRaw=#today#
axisUserAgent=Axis/#axisVersion#
builtOn=Built on #today#
#############################################################################
test01=This string is a test string 01.
faultProcessingNotSupported=User fault processing is not supported. The @WebFault faultbean is missing for {0}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,12 +1234,12 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-aar-maven-plugin</artifactId>
<version>1.8.0</version>
<version>2.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
<version>1.8.0</version>
<version>2.0.0</version>
</plugin>

<!-- No chicken and egg problem here because the plugin doesn't expose
Expand Down