maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Arnaud HERITIER <aherit...@gmail.com>
Subject RE: cvs commit: maven-plugins/javadoc project.xml
Date Sat, 25 Sep 2004 08:11:23 GMT
Hi Brett.

I didn't have the time to see why this descriptor redefines all these =
elements.
I'll clean it before the release.

Arnaud

> -----Message d'origine-----
> De=A0: Brett Porter [mailto:brett@apache.org]
> Envoy=E9=A0: samedi 25 septembre 2004 03:28
> =C0=A0: Maven Developers List
> Objet=A0: Re: cvs commit: maven-plugins/javadoc project.xml
>=20
> What happened here Arnaud?
>=20
> Shoulsn't most of this stuff like the group and build element be
> inherited from the parent?
>=20
> Cheers,
> Brett
>=20
> aheritier@apache.org wrote:
>=20
> >aheritier    2004/09/24 14:50:45
> >
> >  Modified:    javadoc  project.xml
> >  Log:
> >  Fix the groupId + reindent
> >
> >  Revision  Changes    Path
> >  1.48      +178 -161  maven-plugins/javadoc/project.xml
> >
> >  Index: project.xml
> >  =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> >  RCS file: /home/cvs/maven-plugins/javadoc/project.xml,v
> >  retrieving revision 1.47
> >  retrieving revision 1.48
> >  diff -u -r1.47 -r1.48
> >  --- project.xml	5 Sep 2004 19:56:37 -0000	1.47
> >  +++ project.xml	24 Sep 2004 21:50:45 -0000	1.48
> >  @@ -1,162 +1,179 @@
> >   <project>
> >  -    <extend>../plugin-parent/project.xml</extend>
> >  -    <pomVersion>3</pomVersion>
> >  -    <artifactId>maven-javadoc-plugin</artifactId>
> >  -    <name>Maven Javadoc Plug-in</name>
> >  -    <groupId>maven-javadoc-plugin</groupId>
> >  -    <currentVersion>1.7-SNAPSHOT</currentVersion>
> >  -    <shortDescription>Produce Javadocs and =
report</shortDescription>
> >  -    <url>http://maven.apache.org/reference/plugins/javadoc/</url>
> >  -    =
<issueTrackingUrl>http://jira.codehaus.org/browse/MPJAVADOC</issueTrackin=
gUrl>
> >  -    =
<siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDire=
ctory>
> >  -    <repository>
> >  -        =
<connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-=

> plugins/javadoc/</connection>
> >  -        =
<developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/c=
vs:maven-
> plugins/javadoc/</developerConnection>
> >  -        =
<url>http://cvs.apache.org/viewcvs/maven-plugins/javadoc/</url>
> >  -    </repository>
> >  -    <versions>
> >  -        <version>
> >  -            <id>1.3</id>
> >  -            <name>1.3</name>
> >  -            <tag>MAVEN_JAVADOC_1_3</tag>
> >  -        </version>
> >  -        <version>
> >  -            <id>1.4</id>
> >  -            <name>1.4</name>
> >  -            <tag>MAVEN_JAVADOC_1_4</tag>
> >  -        </version>
> >  -        <version>
> >  -            <id>1.5</id>
> >  -            <name>1.5</name>
> >  -            <tag>MAVEN_JAVADOC_1_5</tag>
> >  -        </version>
> >  -        <version>
> >  -            <id>1.6</id>
> >  -            <name>1.6</name>
> >  -            <tag>MAVEN_JAVADOC_1_6</tag>
> >  -        </version>
> >  -        <version>
> >  -            <id>1.6.1</id>
> >  -            <name>1.6.1</name>
> >  -            <tag>MAVEN_JAVADOC_1_6_1</tag>
> >  -        </version>
> >  -    </versions>
> >  -    <developers>
> >  -        <developer>
> >  -            <name>Emmanuel Venisse</name>
> >  -            <id>evenisse</id>
> >  -            <email>emmanuel@venisse.net</email>
> >  -            <roles>
> >  -                <role>Java Developer</role>
> >  -            </roles>
> >  -        </developer>
> >  -        <developer>
> >  -            <name>Stephane Mor</name>
> >  -            <id>smor</id>
> >  -            <email>stephanemor@yahoo.fr</email>
> >  -            <organization>Hasgard Systemes et =
Reseaux</organization>
> >  -            <roles>
> >  -                <role>Java Developer</role>
> >  -            </roles>
> >  -        </developer>
> >  -        <developer>
> >  -            <name>Jason van Zyl</name>
> >  -            <id>jvanzyl</id>
> >  -            <email>jason@zenplex.com</email>
> >  -            <organization>Zenplex</organization>
> >  -            <roles>
> >  -                <role>Architect</role>
> >  -            </roles>
> >  -        </developer>
> >  -        <developer>
> >  -            <name>Michal Maczka</name>
> >  -            <id>michal</id>
> >  -            <email>michal.maczka@dimatics.com</email>
> >  -            <organization>Dimatics</organization>
> >  -            <roles>
> >  -                <role>Jelly Developer</role>
> >  -            </roles>
> >  -        </developer>
> >  -        <developer>
> >  -            <name>Vincent Massol</name>
> >  -            <id>vmassol</id>
> >  -            <email>vmassol@pivolis.com</email>
> >  -            <organization>Pivolis</organization>
> >  -            <roles>
> >  -                <role>Java Developer</role>
> >  -            </roles>
> >  -        </developer>
> >  -        <developer>
> >  -            <name>Arnaud Heritier</name>
> >  -            <id>aheritier</id>
> >  -            <email>aheritier@apache.org</email>
> >  -            <roles>
> >  -                <role>Developer</role>
> >  -                <role>Release Manager</role>
> >  -            </roles>
> >  -        </developer>
> >  -        <developer>
> >  -            <name>Felipe Leme</name>
> >  -            <id>felipeal</id>
> >  -            <email>maven@felipeal.net</email>
> >  -            <organization>Falcon Informatica</organization>
> >  -            <roles>
> >  -                <role>Java Developer</role>
> >  -                <role>Jelly Developer</role>
> >  -            </roles>
> >  -           <timezone>-3</timezone>
> >  -       </developer>
> >  -    </developers>
> >  -    <dependencies>
> >  -        <dependency>
> >  -            <groupId>commons-lang</groupId>
> >  -            <artifactId>commons-lang</artifactId>
> >  -            <version>2.0</version>
> >  -            <type>jar</type>
> >  -            <properties/>
> >  -        </dependency>
> >  -        <dependency>
> >  -            <groupId>commons-collections</groupId>
> >  -            <artifactId>commons-collections</artifactId>
> >  -            <version>3.1</version>
> >  -            <type>jar</type>
> >  -            <properties/>
> >  -        </dependency>
> >  -    </dependencies>
> >  -    <build>
> >  -        <sourceDirectory>src/main</sourceDirectory>
> >  -        =
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
> >  -        <unitTest>
> >  -            <includes>
> >  -                <include>**/*Test.java</include>
> >  -            </includes>
> >  -            <resources>
> >  -                <resource>
> >  -                    <directory>src/test</directory>
> >  -                    <includes>
> >  -                        <include>**/*.txt</include>
> >  -                    </includes>
> >  -                    <filtering>false</filtering>
> >  -                </resource>
> >  -            </resources>
> >  -        </unitTest>
> >  -        <resources>
> >  -            <resource>
> >  -                =
<directory>${basedir}/src/plugin-resources</directory>
> >  -                <targetPath>plugin-resources</targetPath>
> >  -                <filtering>false</filtering>
> >  -            </resource>
> >  -            <resource>
> >  -                <directory>${basedir}</directory>
> >  -                <includes>
> >  -                    <include>plugin.jelly</include>
> >  -                    <include>plugin.properties</include>
> >  -                    <include>project.properties</include>
> >  -                    <include>project.xml</include>
> >  -                </includes>
> >  -                <filtering>false</filtering>
> >  -            </resource>
> >  -        </resources>
> >  -    </build>
> >  -    <properties/>
> >  -</project>
> >  \ No newline at end of file
> >  +  <!--
> >  +/*
> >  + * Copyright 2001-2004 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.
> >  + */
> >  +  -->
> >  +  <extend>../plugin-parent/project.xml</extend>
> >  +  <pomVersion>3</pomVersion>
> >  +  <artifactId>maven-javadoc-plugin</artifactId>
> >  +  <name>Maven Javadoc Plug-in</name>
> >  +  <groupId>maven</groupId>
> >  +  <currentVersion>1.7-SNAPSHOT</currentVersion>
> >  +  <shortDescription>Produce Javadocs and report</shortDescription>
> >  +  <url>http://maven.apache.org/reference/plugins/javadoc/</url>
> >  +  =
<issueTrackingUrl>http://jira.codehaus.org/browse/MPJAVADOC</issueTrackin=
gUrl>
> >  +  =
<siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDire=
ctory>
> >  +  <repository>
> >  +    =
<connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-=

> plugins/javadoc/</connection>
> >  +    =
<developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/c=
vs:maven-
> plugins/javadoc/</developerConnection>
> >  +    =
<url>http://cvs.apache.org/viewcvs/maven-plugins/javadoc/</url>
> >  +  </repository>
> >  +  <versions>
> >  +    <version>
> >  +      <id>1.3</id>
> >  +      <name>1.3</name>
> >  +      <tag>MAVEN_JAVADOC_1_3</tag>
> >  +    </version>
> >  +    <version>
> >  +      <id>1.4</id>
> >  +      <name>1.4</name>
> >  +      <tag>MAVEN_JAVADOC_1_4</tag>
> >  +    </version>
> >  +    <version>
> >  +      <id>1.5</id>
> >  +      <name>1.5</name>
> >  +      <tag>MAVEN_JAVADOC_1_5</tag>
> >  +    </version>
> >  +    <version>
> >  +      <id>1.6</id>
> >  +      <name>1.6</name>
> >  +      <tag>MAVEN_JAVADOC_1_6</tag>
> >  +    </version>
> >  +    <version>
> >  +      <id>1.6.1</id>
> >  +      <name>1.6.1</name>
> >  +      <tag>MAVEN_JAVADOC_1_6_1</tag>
> >  +    </version>
> >  +  </versions>
> >  +  <developers>
> >  +    <developer>
> >  +      <name>Emmanuel Venisse</name>
> >  +      <id>evenisse</id>
> >  +      <email>emmanuel@venisse.net</email>
> >  +      <roles>
> >  +        <role>Java Developer</role>
> >  +      </roles>
> >  +    </developer>
> >  +    <developer>
> >  +      <name>Stephane Mor</name>
> >  +      <id>smor</id>
> >  +      <email>stephanemor@yahoo.fr</email>
> >  +      <organization>Hasgard Systemes et Reseaux</organization>
> >  +      <roles>
> >  +        <role>Java Developer</role>
> >  +      </roles>
> >  +    </developer>
> >  +    <developer>
> >  +      <name>Jason van Zyl</name>
> >  +      <id>jvanzyl</id>
> >  +      <email>jason@zenplex.com</email>
> >  +      <organization>Zenplex</organization>
> >  +      <roles>
> >  +        <role>Architect</role>
> >  +      </roles>
> >  +    </developer>
> >  +    <developer>
> >  +      <name>Michal Maczka</name>
> >  +      <id>michal</id>
> >  +      <email>michal.maczka@dimatics.com</email>
> >  +      <organization>Dimatics</organization>
> >  +      <roles>
> >  +        <role>Jelly Developer</role>
> >  +      </roles>
> >  +    </developer>
> >  +    <developer>
> >  +      <name>Vincent Massol</name>
> >  +      <id>vmassol</id>
> >  +      <email>vmassol@pivolis.com</email>
> >  +      <organization>Pivolis</organization>
> >  +      <roles>
> >  +        <role>Java Developer</role>
> >  +      </roles>
> >  +    </developer>
> >  +    <developer>
> >  +      <name>Arnaud Heritier</name>
> >  +      <id>aheritier</id>
> >  +      <email>aheritier@apache.org</email>
> >  +      <roles>
> >  +        <role>Developer</role>
> >  +        <role>Release Manager</role>
> >  +      </roles>
> >  +    </developer>
> >  +    <developer>
> >  +      <name>Felipe Leme</name>
> >  +      <id>felipeal</id>
> >  +      <email>maven@felipeal.net</email>
> >  +      <organization>Falcon Informatica</organization>
> >  +      <roles>
> >  +        <role>Java Developer</role>
> >  +        <role>Jelly Developer</role>
> >  +      </roles>
> >  +      <timezone>-3</timezone>
> >  +    </developer>
> >  +  </developers>
> >  +  <dependencies>
> >  +    <dependency>
> >  +      <groupId>commons-lang</groupId>
> >  +      <artifactId>commons-lang</artifactId>
> >  +      <version>2.0</version>
> >  +      <type>jar</type>
> >  +      <properties/>
> >  +    </dependency>
> >  +    <dependency>
> >  +      <groupId>commons-collections</groupId>
> >  +      <artifactId>commons-collections</artifactId>
> >  +      <version>3.1</version>
> >  +      <type>jar</type>
> >  +      <properties/>
> >  +    </dependency>
> >  +  </dependencies>
> >  +  <build>
> >  +    <sourceDirectory>src/main</sourceDirectory>
> >  +    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
> >  +    <unitTest>
> >  +      <includes>
> >  +        <include>**/*Test.java</include>
> >  +      </includes>
> >  +      <resources>
> >  +        <resource>
> >  +          <directory>src/test</directory>
> >  +          <includes>
> >  +            <include>**/*.txt</include>
> >  +          </includes>
> >  +          <filtering>false</filtering>
> >  +        </resource>
> >  +      </resources>
> >  +    </unitTest>
> >  +    <resources>
> >  +      <resource>
> >  +        <directory>${basedir}/src/plugin-resources</directory>
> >  +        <targetPath>plugin-resources</targetPath>
> >  +        <filtering>false</filtering>
> >  +      </resource>
> >  +      <resource>
> >  +        <directory>${basedir}</directory>
> >  +        <includes>
> >  +          <include>plugin.jelly</include>
> >  +          <include>plugin.properties</include>
> >  +          <include>project.properties</include>
> >  +          <include>project.xml</include>
> >  +        </includes>
> >  +        <filtering>false</filtering>
> >  +      </resource>
> >  +    </resources>
> >  +  </build>
> >  +  <properties/>
> >  +</project>
> >
> >
> >
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >For additional commands, e-mail: dev-help@maven.apache.org
> >
> >
> >
> >
> >
> >
>=20
>=20
>=20
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>=20
>=20
>=20
> #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D gPopper Menu =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D#
> Delete from Gmail inbox:   mailto:del|ff333440069819d@gPopper
> Mark message as unread:    mailto:unr|ff333440069819d@gPopper
> Mark message as read:      mailto:rea|ff333440069819d@gPopper

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Mime
View raw message