Changeset 15070


Ignore:
Timestamp:
06/11/17 08:00:07 (4 months ago)
Author:
mevenson
Message:

Maintenance on file structure

Explicitly note which paragraph constitutes our "classpath exception"
in COPYING.

Use '1.5.0-SNAPSHOT' in POM for publishing snapshots.

Location:
trunk/abcl
Files:
2 added
3 deleted
4 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/abcl/COPYING

    r11665 r15070  
    265265          NO WARRANTY
    266266
    267   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
    268 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
    269 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
    270 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
    271 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
    272 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
    273 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
    274 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
    275 REPAIR OR CORRECTION.
    276 
    277   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
    278 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
    279 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
    280 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
    281 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
    282 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
    283 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
    284 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
    285 POSSIBILITY OF SUCH DAMAGES.
    286 
    287   13. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public License cover the whole combination.
    288 
    289 As a special exception, the copyright holders of this software give you
    290 permission to link this software with independent modules to produce an
    291 executable, regardless of the license terms of these independent modules, and
    292 to copy and distribute the resulting executable under terms of your choice,
    293 provided that you also meet, for each linked independent module, the terms and
    294 conditions of the license of that module. An independent module is a module
    295 which is not derived from or based on this software. If you modify this
    296 software, you may extend this exception to your version of the software, but
    297 you are not obligated to do so. If you do not wish to do so, delete this
    298 exception statement from your version.
     267  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
     268WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
     269EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
     270OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY
     271KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
     272IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     273PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
     274PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
     275THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
     276
     277  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
     278WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
     279AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
     280FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
     281CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
     282PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
     283RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
     284FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
     285SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
     286DAMAGES.
     287
     288  13. Linking this library statically or dynamically with other
     289  modules is making a combined work based on this library. Thus, the
     290  terms and conditions of the GNU General Public License cover the
     291  whole combination.
     292
     293  The following paragraph details the "classpath exception" which ABCL
     294  allows as an exception to the statement about linking libraries.
     295
     296  As a special exception, the copyright holders of this software give
     297  you permission to link this software with independent modules to
     298  produce an executable, regardless of the license terms of these
     299  independent modules, and to copy and distribute the resulting
     300  executable under terms of your choice, provided that you also meet,
     301  for each linked independent module, the terms and conditions of the
     302  license of that module. An independent module is a module which is
     303  not derived from or based on this software. If you modify this
     304  software, you may extend this exception to your version of the
     305  software, but you are not obligated to do so. If you do not wish to
     306  do so, delete this exception statement from your version.
    299307
    300308
  • trunk/abcl/build.xml

    r15041 r15070  
    763763      <include name="build-from-lisp.bash"/>
    764764     
    765       <!-- The remainder of these files are used by the Lisp hosted
    766            build in 'build-abcl.lisp' but not used by Ant, so include
    767            them in the source distribution. -->
    768       <include name="make-jar.in"/>
    769       <include name="make-jar.bat.in"/>
    770 
    771765      <include name="build-abcl.lisp"/>
    772766      <include name="customizations.lisp.in"/>
     
    12311225
    12321226    <import file="netbeans-build.xml" optional="true"/>
    1233 <!--    <import file="j-build.xml" optional="true"/>  -->
    1234     <import file="not.org-build.xml" optional="true"/>
    12351227   
    1236     <import file="build-snapshot.xml" optional="true"/>
    1237 
    1238     <import file="build-maven.xml" optional="true"/> </project>
     1228    <import file="etc/ant/build-snapshot.xml" optional="true"/>
     1229
     1230    <import file="etc/ant/build-maven.xml" optional="true"/>
     1231  </project>
  • trunk/abcl/contrib/pom.xml

    r15048 r15070  
    1414  <groupId>org.abcl</groupId>
    1515  <artifactId>abcl-contrib</artifactId>
    16   <version>1.5.0-rc-1</version>
     16  <version>1.5.0-SNAPSHOT</version>
    1717  <packaging>jar</packaging>
    1818  <name>Armed Bear Common Lisp (ABCL) Contribs</name>
  • trunk/abcl/doc/releng.org

    r15067 r15070  
    1 # Releasing ABCL on Sonatype's OSS Maven repository - instructions
    2 #
    3 # This assumes your settings.xml (/etc/maven2/settings.xml for Ubuntu-packaged Maven) contains something like this in its <servers></servers> section:
    4 #
    5 # <server>
    6 #   <id>sonatype-nexus-snapshots</id>
    7 #   <username>sonatype-jira-username</username>
    8 #   <password>sonatype-jira-password</password>
    9 # </server>
    10 # <server>
    11 #   <id>sonatype-nexus-staging</id>
    12 #   <username>sonatype-jira-username</username>
    13 #   <password>sonatype-jira-password</password>
    14 # </server>
     1* ABCL Release Engineering practices
    152
    16 # First, remember to build it!
     3** Maven
     4
     5Instructions for Releasing ABCL on Sonatype's OSS Maven repository
     6
     7*** settings.xml
     8
     9This assumes your settings.xml (/etc/maven2/settings.xml for
     10Ubuntu-packaged Maven) contains something like this in its
     11<servers></servers> section:
     12
     13#+BEGIN_SRC
     14 <server>
     15   <id>sonatype-nexus-snapshots</id>
     16   <username>sonatype-jira-username</username>
     17   <password>sonatype-jira-password</password>
     18 </server>
     19 <server>
     20   <id>sonatype-nexus-staging</id>
     21   <username>sonatype-jira-username</username>
     22   <password>sonatype-jira-password</password>
     23 </server>
     24#+END_SRC
     25
     26*** Process
     27
     28First, remember to build it!
     29
     30#+BEGIN_SRC
    1731ant abcl.jar abcl.source.jar abcl.javadoc.jar abcl.contrib
     32#+END_SRC
    1833
    19 # And maybe test it as well
     34And maybe test it as well
     35
     36#+BEGIN_SRC
    2037ant abcl.test
     38#+END_SRC
    2139
    22 # For snapshots - development versions - the version in the POM should be like x.y.z-SNAPSHOT
     40For snapshots - development versions - the version in the POM should be like x.y.z-SNAPSHOT
     41
     42#+BEGIN_SRC
    2343mvn gpg:sign-and-deploy-file -Dfile=dist/abcl.jar -DpomFile=pom.xml -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -DrepositoryId=sonatype-nexus-snapshots
    2444mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-sources.jar -DpomFile=pom.xml -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -DrepositoryId=sonatype-nexus-snapshots -Dclassifier=sources
    2545mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-javadoc.jar -DpomFile=pom.xml -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -DrepositoryId=sonatype-nexus-snapshots -Dclassifier=javadoc
    26 mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-contrib-.jar -DpomFile=contrib/pom.xml -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -DrepositoryId=sonatype-nexus-snapshots
     46mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-contrib.jar -DpomFile=contrib/pom.xml -Durl=https://oss.sonatype.org/content/repositories/snapshots/ -DrepositoryId=sonatype-nexus-snapshots
     47#+END_SRC
    2748
    28 # For releases - the version in the POM should be x.y.z
     49For releases - the version in the POM should be x.y.z
     50
     51#+BEGIN_SRC
    2952mvn gpg:sign-and-deploy-file -Dfile=dist/abcl.jar -DpomFile=pom.xml -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging
    3053mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-${abcl_version}-sources.jar -DpomFile=pom.xml -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -Dclassifier=sources
    3154mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-${abcl_version}-javadoc.jar -DpomFile=pom.xml -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -Dclassifier=javadoc
     55#+END_SRC
    3256
    33 # Contrib releases
     57abcl-contrib release
     58
     59#+BEGIN_SRC
    3460mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-contrib.jar -DpomFile=contrib/pom.xml -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging
    3561mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-contrib-${abcl_version}-sources.jar -DpomFile=contrib/pom.xml -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -Dclassifier=sources
    3662mvn gpg:sign-and-deploy-file -Dfile=dist/abcl-contrib-${abcl_version}-javadoc.jar -DpomFile=contrib/pom.xml -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -Dclassifier=javadoc
     63#+END_SRC
    3764
    38 # <http://www.sonatype.org/nexus/2015/06/02/how-to-publish-software-artifacts-to-maven-central/>
    39 # <http://central.sonatype.org/pages/releasing-the-deployment.html>
    40 #
    41 # For specifying gpg executable, use a property specified via '-Dgpg.executable=gpg2'
     65**** Testing downloads
     66
     67#+BEGIN_SRC
     68mvn org.apache.maven.plugins:maven-dependency-plugin:2.1:get -DrepoUrl=https://oss.sonatype.org/content/repositories/snapshots -Dartifact=org.abcl:abcl-contrib:1.5.0-SNAPSHOT:jar
     69#+END_SRC
     70
     71*** See also
     72<http://www.sonatype.org/nexus/2015/06/02/how-to-publish-software-artifacts-to-maven-central/>
     73<http://central.sonatype.org/pages/releasing-the-deployment.html>
     74
     75*** Specifiying GPG executable
     76
     77For specifying gpg executable, use a property specified via
     78'-Dgpg.executable=gpg2'.
  • trunk/abcl/pom.xml

    r15048 r15070  
    1414  <groupId>org.abcl</groupId>
    1515  <artifactId>abcl</artifactId>
    16   <version>1.5.0-rc-1</version>
     16  <version>1.5.0-SNAPSHOT</version>
    1717  <packaging>jar</packaging>
    1818  <name>ABCL - Armed Bear Common Lisp</name>
Note: See TracChangeset for help on using the changeset viewer.