You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sk...@apache.org on 2005/07/15 13:12:27 UTC
svn commit: r219178 - in
/jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare: maven.xml
project.properties project.xml
Author: skitching
Date: Fri Jul 15 04:12:23 2005
New Revision: 219178
URL: http://svn.apache.org/viewcvs?rev=219178&view=rev
Log:
Update build process to fit with latest maven and commons-build.
Modified:
jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/maven.xml
jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties
jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml
Modified: jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/maven.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/maven.xml?rev=219178&r1=219177&r2=219178&view=diff
==============================================================================
--- jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/maven.xml (original)
+++ jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/maven.xml Fri Jul 15 04:12:23 2005
@@ -1,4 +1,78 @@
-<project default="java:jar"
- xmlns:j="jelly:core">
+<!--
+ Copyright 2001-2005 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project default="jar:jar" xmlns:j="jelly:core">
+
+ <!-- ==================================================================
+ - COMMONS-BUILD TWEAKS
+ -
+ - Ensure commons-build stylesheets are copied into target directory
+ - when executing the xdoc goal (part of the site goal), so that the
+ - resulting website has the correct look-and-feel.
+ -
+ - This goal assumes that commons-build is checked out as a sibling
+ - to the directory we are doing the build in.
+ ================================================================== -->
+
+ <postGoal name="xdoc:copy-resources">
+ <copy todir="${basedir}/target/docs/style/" failonerror="false">
+ <fileset dir="${basedir}/../commons-build/xdocs/style">
+ <include name='**/*'/>
+ <exclude name='**/CVS/**'/>
+ </fileset>
+ </copy>
+ </postGoal>
+
+ <!-- ==================================================================
+ - distribution-building tweaks
+ -
+ - By default, the "dist" target builds a binary distribution that contains
+ - the output of all the maven reports. We don't want this; the output
+ - is huge and not relevant for most users. So before the build-bin
+ - goal tars/zips the archive dir it has build, we delete the unwanted
+ - information from it, leaving just the javadoc API info behind.
+ -
+ - Yes, it would be more elegant to skip the reports completely
+ - when running the dist target, but I don't know
+ - how to do that; if you do, then please fix this file.
+ -
+ - The source and binary distributions must also have the
+ - RELEASE-NOTES.txt file in them, so here we
+ - copy it manually into the assembly directories.
+ ================================================================== -->
+
+ <preGoal name="dist:build-bin">
+ <delete includeEmptyDirs="true">
+ <fileset dir="${maven.dist.bin.assembly.dir}/docs">
+ <exclude name="apidocs/**"/>
+ </fileset>
+ </delete>
+
+ <copy todir="${maven.dist.bin.assembly.dir}">
+ <fileset dir="${basedir}">
+ <include name="RELEASE-NOTES.txt"/>
+ </fileset>
+ </copy>
+ </preGoal>
+
+ <preGoal name="dist:build-src">
+ <copy todir="${maven.dist.src.assembly.dir}">
+ <fileset dir="${basedir}">
+ <include name="RELEASE-NOTES.txt"/>
+ </fileset>
+ </copy>
+ </preGoal>
+
</project>
Modified: jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties?rev=219178&r1=219177&r2=219178&view=diff
==============================================================================
--- jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties (original)
+++ jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties Fri Jul 15 04:12:23 2005
@@ -2,13 +2,25 @@
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
-compile.debug = on
-compile.optimize = off
+compile.debug = off
+compile.optimize = on
compile.deprecation = off
maven.jarResources.basedir=${basedir}/src/java
+maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+
+# ensure that the digester-x.y-src.tar.gz (and zip) distributions unpack into
+# a directory with suffix -src
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src
+
+# generate .class files that can be loaded into a version 1.1 JVM.
+maven.compile.target=1.1
+maven.compile.source=1.2
+
+# ----------------------------------------------------------------
# coding standards
+# ----------------------------------------------------------------
maven.checkstyle.rcurly = ignore
maven.checkstyle.lcurly.type = ignore
Modified: jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml?rev=219178&r1=219177&r2=219178&view=diff
==============================================================================
--- jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml (original)
+++ jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml Fri Jul 15 04:12:23 2005
@@ -1,19 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
+<!--
<extend>../project.xml</extend>
+-->
+ <pomVersion>3</pomVersion>
<id>commons-cli</id>
<name>CLI</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0.1-dev</currentVersion>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://jakarta.apache.org</url>
+ <logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
+ </organization>
+
<inceptionYear>2002</inceptionYear>
- <shortDescription>Commons CLI</shortDescription>
<gumpRepositoryId>jakarta</gumpRepositoryId>
+
+ <package>org.apache.commons.digester</package>
<logo>/images/1x1.gif</logo>
-
+ <gumpRepositoryId>jakarta</gumpRepositoryId>
+
<description>
Commons CLI provides a simple API for working with the command line arguments and options.
</description>
+
+ <shortDescription>Commons CLI</shortDescription>
+
+ <url>http://jakarta.apache.org/commons/cli/</url>
+ <issueTrackingUrl>http://issues.apache.org/bugzilla/</issueTrackingUrl>
+ <siteAddress>people.apache.org</siteAddress>
+ <siteDirectory>/www/jakarta.apache.org/commons/cli/</siteDirectory>
+ <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/cli/</distributionDirectory>
+
+ <repository>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk</connection>
+ <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk</url>
+ </repository>
+
+ <mailingLists>
+ <mailingList>
+ <name>Commons Dev List</name>
+ <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
+ <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commons User List</name>
+ <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
+ <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
+ </mailingList>
+ </mailingLists>
+
+
<developers>
<developer>
@@ -57,8 +99,15 @@
</contributor>
</contributors>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 1.1</name>
+ <url>/LICENSE.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
<dependencies>
-
<dependency>
<id>commons-logging</id>
<version>1.0</version>
@@ -73,15 +122,72 @@
<id>junit</id>
<version>3.7</version>
</dependency>
-
</dependencies>
<build>
- <!-- Unit test classes -->
+ <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
<unitTest>
<includes>
- <include>**/*Test*.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
</includes>
+ <resources>
+ <resource>
+ <directory>${pom.build.unitTestSourceDirectory}</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${pom.build.sourceDirectory}</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
+ </resources>
</unitTest>
+
+ <resources>
+ <resource>
+ <directory>${pom.build.sourceDirectory}</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
+ </resources>
</build>
+
+ <reports>
+ <!--
+ - changelog, developer-activity and file-activity plugins are all date-based, and
+ - date selection is broken in subversion, so exclude them. They're not actually
+ - much use anyway unless they go back to the date of the previous release.
+
+ <report>maven-changelog-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ -->
+
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-license-plugin</report>
+
+ <!--
+ - This report is useful to enable when preparing release candidates
+ - but should not be included in the final release as the info isn't
+ - relevant to end users. And it should not be enabled in normal use
+ - as it takes a very long time to run.
+ <report>maven-linkcheck-plugin</report>
+ -->
+ <report>maven-pmd-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ <!-- <report>maven-clover-plugin</report> -->
+ </reports>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: svn commit: r219178 - in /jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare:
maven.xml project.properties project.xml
Posted by Dennis Lundberg <de...@mdh.se>.
skitching@apache.org wrote:
<snip>
> Modified: jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties
> URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties?rev=219178&r1=219177&r2=219178&view=diff
> ==============================================================================
> --- jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties (original)
> +++ jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.properties Fri Jul 15 04:12:23 2005
> @@ -2,13 +2,25 @@
> # P R O J E C T P R O P E R T I E S
> # -------------------------------------------------------------------
>
> -compile.debug = on
> -compile.optimize = off
> +compile.debug = off
> +compile.optimize = on
> compile.deprecation = off
>
> maven.jarResources.basedir=${basedir}/src/java
>
> +maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
> +
> +# ensure that the digester-x.y-src.tar.gz (and zip) distributions unpack into
Copy-and-paste error - should be:
# ensure that the cli-x.y-src.tar.gz (and zip) distributions unpack into
<snip>
> Modified: jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml
> URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml?rev=219178&r1=219177&r2=219178&view=diff
> ==============================================================================
> --- jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml (original)
> +++ jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare/project.xml Fri Jul 15 04:12:23 2005
> @@ -1,19 +1,61 @@
> <?xml version="1.0" encoding="UTF-8"?>
>
> <project>
> +<!--
> <extend>../project.xml</extend>
> +-->
> + <pomVersion>3</pomVersion>
> <id>commons-cli</id>
> <name>CLI</name>
>
> - <currentVersion>1.0</currentVersion>
> + <currentVersion>1.0.1-dev</currentVersion>
> +
> + <organization>
> + <name>The Apache Software Foundation</name>
> + <url>http://jakarta.apache.org</url>
> + <logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
> + </organization>
> +
> <inceptionYear>2002</inceptionYear>
> - <shortDescription>Commons CLI</shortDescription>
> <gumpRepositoryId>jakarta</gumpRepositoryId>
> +
> + <package>org.apache.commons.digester</package>
Another copy-and-paste error - should be:
<package>org.apache.commons.cli</package>
<snip>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [CLI] using license 1.1 for CLI emergency release
Posted by Simon Kitching <sk...@apache.org>.
On Fri, 2005-07-15 at 16:54 +0200, Stefan Bodewig wrote:
> On Fri, 15 Jul 2005, Simon Kitching <sk...@apache.org> wrote:
>
> > Hmm..well, Digester has "jakarta" here (that's where I got the info
> > from) and it builds fine in gump. But if you're really sure this
> > needs to be updated I'll do it (and digester too).
>
> Gump ignores the information completely. I guess it is used by the
> Maven Gump plugin, but this one doesn't get used for Digester (or
> CLI).
>
> >> > + <name>The Apache Software License, Version 1.1</name>
> >>
> >> You mean 2.0, don't you?
> >
> > No I don't. This is a re-release of the 1.0 code with the version
> > number updated to 1.0.1.
>
> Still it would be a release and all releases must use the 2.0 version
> of the license now.
I don't think applying the 2.0 license to code that has already been
released under 1.1 gains anything here. It's IDENTICAL code.
And I think we would be causing users further annoyance by modifying the
source code in any way. It will be annoying enough for them to have to
go through the 1.0 to 1.0.1 upgrade. If they can see, however, that the
version control system has ZERO changes between 1.0 and 1.0.1 for the
source code that will help. If we get in there and change all the files
that will only make the upgrade harder.
This is an EMERGENCY release to fix a nasty distribution problem, not a
regular release.
Regards,
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [CLI] Re: svn commit: r219178
Posted by Stefan Bodewig <bo...@apache.org>.
On Fri, 15 Jul 2005, Simon Kitching <sk...@apache.org> wrote:
> Hmm..well, Digester has "jakarta" here (that's where I got the info
> from) and it builds fine in gump. But if you're really sure this
> needs to be updated I'll do it (and digester too).
Gump ignores the information completely. I guess it is used by the
Maven Gump plugin, but this one doesn't get used for Digester (or
CLI).
>> > + <name>The Apache Software License, Version 1.1</name>
>>
>> You mean 2.0, don't you?
>
> No I don't. This is a re-release of the 1.0 code with the version
> number updated to 1.0.1.
Still it would be a release and all releases must use the 2.0 version
of the license now.
Cheers
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
[CLI] Re: svn commit: r219178
Posted by Simon Kitching <sk...@apache.org>.
On Fri, 2005-07-15 at 13:24 +0200, Stefan Bodewig wrote:
> On Fri, 15 Jul 2005, <sk...@apache.org> wrote:
>
> > + <gumpRepositoryId>jakarta</gumpRepositoryId>
>
> I don't know what this is used for, but Gump would call it
> jakarta-svn, jakarta is the old CVS repo.
Hmm..well, Digester has "jakarta" here (that's where I got the info
from) and it builds fine in gump. But if you're really sure this needs
to be updated I'll do it (and digester too).
>
> > + <name>The Apache Software License, Version 1.1</name>
>
> You mean 2.0, don't you?
No I don't. This is a re-release of the 1.0 code with the version number
updated to 1.0.1.
As described, the purpose of this release is to fix a problem with a
commons-cli-1.0 file floating around that actually contains a snapshot
not the real 1.0.
There is no intention to touch any .java file in any way as part of this
release, including updating the license info. Ideally, just the version#
in the project.xml file would be updated, then RELEASE-NOTES and
index.html updated to describe the 1.0 snafu then the new release made.
Unfortunately commons-build.xml has moved on, and commons has moved to
SVN, etc. So a few other build and doc-related tweaks need to be made.
Regards,
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: svn commit: r219178 - in
/jakarta/commons/proper/cli/branches/CLI_1_0_1_prepare: maven.xml
project.properties project.xml
Posted by Stefan Bodewig <bo...@apache.org>.
On Fri, 15 Jul 2005, <sk...@apache.org> wrote:
> + <gumpRepositoryId>jakarta</gumpRepositoryId>
I don't know what this is used for, but Gump would call it
jakarta-svn, jakarta is the old CVS repo.
> + <name>The Apache Software License, Version 1.1</name>
You mean 2.0, don't you?
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org