svn commit: r474035 - /jakarta/commons/proper/commons-parent/trunk/pom.xml

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r474035 - /jakarta/commons/proper/commons-parent/trunk/pom.xml

Dennis Lundberg-2
Author: dennisl
Date: Sun Nov 12 12:36:46 2006
New Revision: 474035

URL: http://svn.apache.org/viewvc?view=rev&rev=474035
Log:
[maven-release-plugin] prepare release commons-parent-1

Modified:
    jakarta/commons/proper/commons-parent/trunk/pom.xml

Modified: jakarta/commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/commons-parent/trunk/pom.xml?view=diff&rev=474035&r1=474034&r2=474035
==============================================================================
--- jakarta/commons/proper/commons-parent/trunk/pom.xml (original)
+++ jakarta/commons/proper/commons-parent/trunk/pom.xml Sun Nov 12 12:36:46 2006
@@ -1,23 +1,4 @@
-<!--
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache</groupId>
@@ -28,7 +9,7 @@
   <artifactId>commons-parent</artifactId>
   <packaging>pom</packaging>
   <!-- TODO: dummy version. In Maven 2.1, this will be auto-versioned being a generic parent -->
-  <version>1-SNAPSHOT</version>
+  <version>1</version>
   <name>Jakarta Commons</name>
   <url>http://jakarta.apache.org/commons/</url>
   <inceptionYear>2001</inceptionYear>
@@ -58,7 +39,7 @@
    <repository>
      <id>dummy</id>
      <name>Dummy to avoid accidental deploys</name>
-     <url></url>
+     <url />
    </repository>
   </distributionManagement>
 
@@ -67,9 +48,9 @@
     a release of the commons-parent POM.
   -->
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-parent/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/commons-parent/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/jakarta/commons/proper/commons-parent/trunk</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/commons-parent/tags/commons-parent-1</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/commons-parent/tags/commons-parent-1</developerConnection>
+    <url>http://svn.apache.org/viewvc/jakarta/commons/proper/commons-parent/tags/commons-parent-1</url>
   </scm>
 
   <mailingLists>
@@ -127,8 +108,8 @@
               <tasks>
                 <copy todir="${project.build.outputDirectory}/META-INF">
                   <fileset dir="${basedir}">
-                    <include name="LICENSE.txt"/>
-                    <include name="NOTICE.txt"/>
+                    <include name="LICENSE.txt" />
+                    <include name="NOTICE.txt" />
                   </fileset>
                 </copy>
               </tasks>
@@ -230,5 +211,4 @@
     <maven.compile.target>1.3</maven.compile.target>
   </properties>
   -->
-</project>
-
+</project>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r474035 - /jakarta/commons/proper/commons-parent/trunk/pom.xml

Wendy Smoak
The release plugin removed the license header in this commit, and it's
deployed to the Maven repo without one:
http://repo1.maven.org/maven2/org/apache/commons/commons-parent/1/

I wonder if moving the license inside the <project> element would
help, since the rest of the comments weren't removed.

--
Wendy

On 11/12/06, [hidden email] <[hidden email]> wrote:

> Author: dennisl
> Date: Sun Nov 12 12:36:46 2006
> New Revision: 474035
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=474035
> Log:
> [maven-release-plugin] prepare release commons-parent-1
>
> Modified:
>     jakarta/commons/proper/commons-parent/trunk/pom.xml
>
> Modified: jakarta/commons/proper/commons-parent/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/jakarta/commons/proper/commons-parent/trunk/pom.xml?view=diff&rev=474035&r1=474034&r2=474035
> ==============================================================================
> --- jakarta/commons/proper/commons-parent/trunk/pom.xml (original)
> +++ jakarta/commons/proper/commons-parent/trunk/pom.xml Sun Nov 12 12:36:46 2006
> @@ -1,23 +1,4 @@
> -<!--
> -
> -   Licensed to the Apache Software Foundation (ASF) under one or more
> -   contributor license agreements.  See the NOTICE file distributed with
> -   this work for additional information regarding copyright ownership.
> -   The ASF licenses this file to You 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.
> -
> --->
...

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r474035 - /jakarta/commons/proper/commons-parent/trunk/pom.xml

Wendy Smoak
On 11/18/06, Wendy Smoak <[hidden email]> wrote:
> The release plugin removed the license header in this commit, and it's
> deployed to the Maven repo without one:
> http://repo1.maven.org/maven2/org/apache/commons/commons-parent/1/
>
> I wonder if moving the license inside the <project> element would
> help, since the rest of the comments weren't removed.

On dev@maven, Brett said:
> That is a bug in the release plugin if you have new lines in the root
> element. I think it's fixed in trunk.

--
Wendy

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r474035 - /jakarta/commons/proper/commons-parent/trunk/pom.xml

Rahul Akolkar
On 11/18/06, Wendy Smoak <[hidden email]> wrote:

> On 11/18/06, Wendy Smoak <[hidden email]> wrote:
> > The release plugin removed the license header in this commit, and it's
> > deployed to the Maven repo without one:
> > http://repo1.maven.org/maven2/org/apache/commons/commons-parent/1/
> >
> > I wonder if moving the license inside the <project> element would
> > help, since the rest of the comments weren't removed.
>
> On dev@maven, Brett said:
> > That is a bug in the release plugin if you have new lines in the root
> > element. I think it's fixed in trunk.
>
<snip/>

Thanks for tracking this, I've added it back.

There were also other whitespace changes (related to tags without
bodies for examples), but for the convenience of using a plugin, that
will probably have to do.

-Rahul



> --
> Wendy
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]