You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/11/02 20:29:51 UTC
svn commit: r1845624 - in /webservices/axiom/branches/1.2.x: ./ NOTICE
devguide/src/docbkx/devguide.xml
Author: veithen
Date: Fri Nov 2 20:29:50 2018
New Revision: 1845624
URL: http://svn.apache.org/viewvc?rev=1845624&view=rev
Log:
Merge r1845623 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/NOTICE
webservices/axiom/branches/1.2.x/devguide/src/docbkx/devguide.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 2 20:29:50 2018
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1806321,1815009,1817725,1817727,1817735,1826041,1843069,1843517,1845037
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1806321,1815009,1817725,1817727,1817735,1826041,1843069,1843517,1845037,1845623
Modified: webservices/axiom/branches/1.2.x/NOTICE
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/NOTICE?rev=1845624&r1=1845623&r2=1845624&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/NOTICE (original)
+++ webservices/axiom/branches/1.2.x/NOTICE Fri Nov 2 20:29:50 2018
@@ -1,16 +1,10 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Axiom distribution. ==
- =========================================================================
+ Apache Axiom
+ Copyright 2004-2018 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Portions Copyright 2006 International Business Machines Corp.
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
-
This product includes unmodified, binary redistributions of software (AspectJ)
developed for the Eclipse Foundation (http://www.eclipse.org/aspectj), which
is licensed under the Eclipse Public License 1.0. Source code for this project
Modified: webservices/axiom/branches/1.2.x/devguide/src/docbkx/devguide.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/devguide/src/docbkx/devguide.xml?rev=1845624&r1=1845623&r2=1845624&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/devguide/src/docbkx/devguide.xml (original)
+++ webservices/axiom/branches/1.2.x/devguide/src/docbkx/devguide.xml Fri Nov 2 20:29:50 2018
@@ -562,6 +562,11 @@ javax.xml.stream.XMLOutputFactory=com.be
<procedure>
<step>
<para>
+ If necessary, update the copyright date in the top level <filename>NOTICE</filename> file.
+ </para>
+ </step>
+ <step>
+ <para>
Start the release process with the following command:
</para>
<screen>mvn release:prepare</screen>