[axis-axis2-java-core] 03/08: Update AAR/MAR plugin versions used in the build
This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit e9dd95759dfb10be82965e8536af2916fe4cba6b Author: Andreas Veithen AuthorDate: Sun Jul 17 11:02:15 2022 + Update AAR/MAR plugin versions used in the build --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f703a1659d..33b0291498 100644 --- a/pom.xml +++ b/pom.xml @@ -1218,12 +1218,12 @@ org.apache.axis2 axis2-aar-maven-plugin -1.7.6 +1.8.0 org.apache.axis2 axis2-mar-maven-plugin -1.7.6 +1.8.0
[axis-axis2-java-core] 05/08: Bump spring.version from 5.3.21 to 5.3.22
This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 310990ebdbcc9de490b3e2b17612436b47d4d3ef Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sun Jul 17 10:57:29 2022 + Bump spring.version from 5.3.21 to 5.3.22 Bumps `spring.version` from 5.3.21 to 5.3.22. Updates `spring-core` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-beans` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-context` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-web` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) Updates `spring-test` from 5.3.21 to 5.3.22 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.21...v5.3.22) --- updated-dependencies: - dependency-name: org.springframework:spring-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-beans dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-web dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-test dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 33b0291498..a0b822de0d 100644 --- a/pom.xml +++ b/pom.xml @@ -489,7 +489,7 @@ 3.4.2 1.6R7 1.7.36 -5.3.21 +5.3.22 1.6.3 2.7.2 3.0.1
[axis-axis2-java-core] branch master updated (43ab6d7958 -> dafcdc937e)
This is an automated email from the ASF dual-hosted git repository. veithen pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git from 43ab6d7958 [maven-release-plugin] prepare for next development iteration new 0ca3c6aa4f Add empty release notes for 1.8.3 new 35af333ba7 Remove outdated comment new e9dd95759d Update AAR/MAR plugin versions used in the build new 683c9fb2ba Update the exclusions in bin-assembly.xml new 310990ebdb Bump spring.version from 5.3.21 to 5.3.22 new 9f5caa0305 Bump apache from 26 to 27 new e1daff7a48 Bump maven-bundle-plugin from 5.1.6 to 5.1.7 new dafcdc937e Use project.build.outputTimestamp as release date The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: modules/distribution/pom.xml | 7 --- .../distribution/src/main/assembly/bin-assembly.xml | 5 - pom.xml | 19 +-- src/site/markdown/release-notes/1.8.3.md | 2 ++ 4 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 src/site/markdown/release-notes/1.8.3.md
[axis-axis2-java-core] 02/08: Remove outdated comment
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 35af333ba773913f3af39da3511fe6af12278a4c
Author: Andreas Veithen
AuthorDate: Sun Jul 17 10:59:59 2022 +
Remove outdated comment
The problems with tidy-maven-plugin should have been fixed by
https://github.com/apache/axis-axis2-java-core/commit/83d7d473678995ec14b12e80936ca185a1f2a149.
---
pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index f56d633b14..f703a1659d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1579,8 +1579,6 @@ $${type_declaration}]]>
-
org.codehaus.mojo
tidy-maven-plugin
[axis-axis2-java-core] 01/08: Add empty release notes for 1.8.3
This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 0ca3c6aa4f23e6041bf2033ff8f2b441056d685b Author: Andreas Veithen AuthorDate: Sun Jul 17 10:55:34 2022 + Add empty release notes for 1.8.3 --- src/site/markdown/release-notes/1.8.3.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/site/markdown/release-notes/1.8.3.md b/src/site/markdown/release-notes/1.8.3.md new file mode 100644 index 00..73839cc059 --- /dev/null +++ b/src/site/markdown/release-notes/1.8.3.md @@ -0,0 +1,2 @@ +Apache Axis2 1.8.3 Release Notes +
[axis-axis2-java-core] 07/08: Bump maven-bundle-plugin from 5.1.6 to 5.1.7
This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit e1daff7a48fae21718e6a23e792b0d050d96c02b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sun Jul 17 10:56:56 2022 + Bump maven-bundle-plugin from 5.1.6 to 5.1.7 Bumps maven-bundle-plugin from 5.1.6 to 5.1.7. --- updated-dependencies: - dependency-name: org.apache.felix:maven-bundle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 146a666de0..42f2417c8d 100644 --- a/pom.xml +++ b/pom.xml @@ -1146,7 +1146,7 @@ org.apache.felix maven-bundle-plugin -5.1.6 +5.1.7 net.nicoulaj.maven.plugins
[axis-axis2-java-core] 06/08: Bump apache from 26 to 27
This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 9f5caa0305df5d6f7de813ee0f1f7025e46010f7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sun Jul 17 10:57:04 2022 + Bump apache from 26 to 27 Bumps [apache](https://github.com/apache/maven-apache-parent) from 26 to 27. - [Release notes](https://github.com/apache/maven-apache-parent/releases) - [Commits](https://github.com/apache/maven-apache-parent/commits) --- updated-dependencies: - dependency-name: org.apache:apache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a0b822de0d..146a666de0 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.apache apache -26 +27 org.apache.axis2
[axis-axis2-java-core] 04/08: Update the exclusions in bin-assembly.xml
This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git commit 683c9fb2ba088951756218eec77e82a9e9b7315d Author: Andreas Veithen AuthorDate: Sun Jul 17 11:09:52 2022 + Update the exclusions in bin-assembly.xml This should make the build more reproducible --- modules/distribution/src/main/assembly/bin-assembly.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/src/main/assembly/bin-assembly.xml index 334b7dfd5b..c970484038 100755 --- a/modules/distribution/src/main/assembly/bin-assembly.xml +++ b/modules/distribution/src/main/assembly/bin-assembly.xml @@ -153,7 +153,10 @@ yahoorestsearch/**/* -**/*.iml + +**/.settings/ **/target/
[axis-axis2-java-core] 08/08: Use project.build.outputTimestamp as release date
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit dafcdc937ec014408a760133587a6f21efff58e0
Author: Andreas Veithen
AuthorDate: Sun Jul 17 12:07:12 2022 +
Use project.build.outputTimestamp as release date
This should make building the distributions reproducible. The timestamp
is updated automatically during the release.
---
modules/distribution/pom.xml | 7 ---
pom.xml | 7 ---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 6bf8280c63..2d571fa849 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -377,9 +377,10 @@
-import java.util.Date
-import java.text.MessageFormat
-project.properties['buildTimestamp'] =
MessageFormat.format("{0,date,dd-MM-}", new Date())
+import java.time.*
+import java.time.format.*
+
+project.properties['buildTimestamp'] =
DateTimeFormatter.ofPattern("dd-MM-").withZone(ZoneId.of("Z")).format(OffsetDateTime.parse(project.properties['project.build.outputTimestamp']).toInstant())
project.properties['release_version'] =
project.version.replaceAll("-SNAPSHOT", "")
diff --git a/pom.xml b/pom.xml
index 42f2417c8d..d6142be95b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1445,9 +1445,10 @@
-import java.util.Date
-import java.text.MessageFormat
-project.properties['release_date'] =
MessageFormat.format("{0,date,M dd, }", new Date())
+import java.time.*
+import java.time.format.*
+
+project.properties['release_date'] =
DateTimeFormatter.ofPattern(" dd,
").withZone(ZoneId.of("Z")).format(OffsetDateTime.parse(project.properties['project.build.outputTimestamp']).toInstant())
project.properties['release_version'] =
project.version.replaceAll("-SNAPSHOT", "")
project.properties['skipSiteSite'] =
String.valueOf(!new File(project.basedir, 'src/site/site.xml').exists())
[axis-axis2-java-core] branch master created (now dafcdc937e)
This is an automated email from the ASF dual-hosted git repository. veithen pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git at dafcdc937e Use project.build.outputTimestamp as release date No new revisions were added by this update.
[axis-axis2-java-core] branch master created (now dafcdc937e)
This is an automated email from the ASF dual-hosted git repository. veithen pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git at dafcdc937e Use project.build.outputTimestamp as release date No new revisions were added by this update.
[axis-axis2-java-core] branch master created (now dafcdc937e)
This is an automated email from the ASF dual-hosted git repository. veithen pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git at dafcdc937e Use project.build.outputTimestamp as release date No new revisions were added by this update.
[axis-axis2-java-core] branch master updated (dafcdc937e -> d6cd907c42)
This is an automated email from the ASF dual-hosted git repository. veithen pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git from dafcdc937e Use project.build.outputTimestamp as release date add 5fc205c698 Fix dependency scopes in Maven plugins add d6cd907c42 Use annotations instead of doclet tags in plugins No new revisions were added by this update. Summary of changes: modules/tool/axis2-aar-maven-plugin/pom.xml| 8 ++ .../apache/axis2/maven2/aar/AarExplodedMojo.java | 8 +- .../apache/axis2/maven2/aar/AarInPlaceMojo.java| 6 +- .../java/org/apache/axis2/maven2/aar/AarMojo.java | 42 +++ .../apache/axis2/maven2/aar/AbstractAarMojo.java | 34 ++ .../org/apache/axis2/maven2/aar/DeployAarMojo.java | 17 ++- modules/tool/axis2-java2wsdl-maven-plugin/pom.xml | 7 ++ .../axis2/maven2/java2wsdl/Java2WSDLMojo.java | 51 - modules/tool/axis2-mar-maven-plugin/pom.xml| 8 ++ .../apache/axis2/maven2/mar/AbstractMarMojo.java | 28 ++--- .../apache/axis2/maven2/mar/MarExplodedMojo.java | 9 +- .../apache/axis2/maven2/mar/MarInPlaceMojo.java| 7 +- .../java/org/apache/axis2/maven2/mar/MarMojo.java | 42 +++ modules/tool/axis2-repo-maven-plugin/pom.xml | 7 ++ .../maven2/repo/AbstractCreateRepositoryMojo.java | 63 --- .../axis2/maven2/repo/CreateRepositoryMojo.java| 21 ++-- .../maven2/repo/CreateTestRepositoryMojo.java | 31 ++ modules/tool/axis2-wsdl2code-maven-plugin/pom.xml | 8 ++ .../maven2/wsdl2code/AbstractWSDL2CodeMojo.java| 122 +++-- .../maven2/wsdl2code/GenerateSourcesMojo.java | 11 +- .../maven2/wsdl2code/GenerateTestSourcesMojo.java | 11 +- .../axis2/maven2/wsdl2code/WSDL2CodeMojo.java | 10 +- modules/tool/axis2-xsd2java-maven-plugin/pom.xml | 7 ++ .../axis2/maven/xsd2java/AbstractXSD2JavaMojo.java | 31 ++ .../axis2/maven/xsd2java/GenerateSourcesMojo.java | 11 +- .../maven/xsd2java/GenerateTestSourcesMojo.java| 11 +- modules/tool/simple-server-maven-plugin/pom.xml| 5 + .../axis2/maven2/server/SimpleHttpServerMojo.java | 64 --- pom.xml| 8 +- 29 files changed, 280 insertions(+), 408 deletions(-)
[axis-axis2-java-core] branch master updated: Support reproducible builds in the AAR/MAR plugins
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 29c5b77d99 Support reproducible builds in the AAR/MAR plugins
29c5b77d99 is described below
commit 29c5b77d998761f17358c89d6da0fee98e8aa6d8
Author: Andreas Veithen
AuthorDate: Sun Jul 17 19:36:05 2022 +
Support reproducible builds in the AAR/MAR plugins
---
.../src/main/java/org/apache/axis2/maven2/aar/AarMojo.java | 7 +++
.../src/main/java/org/apache/axis2/maven2/mar/MarMojo.java | 7 +++
2 files changed, 14 insertions(+)
diff --git
a/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
b/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
index 54ff343c58..ea216a21be 100644
---
a/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
+++
b/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
@@ -74,6 +74,12 @@ public class AarMojo extends AbstractAarMojo {
@Parameter
private MavenArchiveConfiguration archive = new
MavenArchiveConfiguration();
+/**
+ * Timestamp for reproducible output archive entries.
+ */
+@Parameter(defaultValue = "${project.build.outputTimestamp}")
+private String outputTimestamp;
+
/**
* Classifier to add to the artifact generated. If given, the artifact
will be an attachment
* instead.
@@ -130,6 +136,7 @@ public class AarMojo extends AbstractAarMojo {
MavenArchiver archiver = new MavenArchiver();
archiver.setArchiver(jarArchiver);
archiver.setOutputFile(aarFile);
+archiver.configureReproducibleBuild(outputTimestamp);
jarArchiver.addDirectory(aarDirectory);
// create archive
diff --git
a/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
b/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
index b207066edf..05e707321b 100644
---
a/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
+++
b/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
@@ -75,6 +75,12 @@ public class MarMojo extends AbstractMarMojo
@Parameter
private MavenArchiveConfiguration archive = new
MavenArchiveConfiguration();
+/**
+ * Timestamp for reproducible output archive entries.
+ */
+@Parameter(defaultValue = "${project.build.outputTimestamp}")
+private String outputTimestamp;
+
/**
* Classifier to add to the artifact generated. If given, the artifact
will be an attachment instead.
*/
@@ -134,6 +140,7 @@ public class MarMojo extends AbstractMarMojo
MavenArchiver archiver = new MavenArchiver();
archiver.setArchiver( jarArchiver );
archiver.setOutputFile( marFile );
+archiver.configureReproducibleBuild( outputTimestamp );
jarArchiver.addDirectory( marDirectory );
// create archive
