You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/07/06 18:44:06 UTC
svn commit: r674316 - in /maven/components/trunk:
maven-core-it-runner/pom.xml maven-distribution/pom.xml pom.xml
Author: jvanzyl
Date: Sun Jul 6 09:44:06 2008
New Revision: 674316
URL: http://svn.apache.org/viewvc?rev=674316&view=rev
Log:
MNG-3656: Keep pushing artifact and plugin versions up to the parent POM
Modified:
maven/components/trunk/maven-core-it-runner/pom.xml
maven/components/trunk/maven-distribution/pom.xml
maven/components/trunk/pom.xml
Modified: maven/components/trunk/maven-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core-it-runner/pom.xml?rev=674316&r1=674315&r2=674316&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it-runner/pom.xml (original)
+++ maven/components/trunk/maven-core-it-runner/pom.xml Sun Jul 6 09:44:06 2008
@@ -31,14 +31,14 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-distribution</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>${project.version}</version>
<classifier>bin</classifier>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.apache.maven.its</groupId>
<artifactId>core-integration-tests</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -46,8 +46,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
<configuration>
<systemProperties>
<property>
@@ -73,7 +73,7 @@
<artifactItem>
<groupId>org.apache.maven</groupId>
<artifactId>maven-distribution</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>${project.version}</version>
<classifier>bin</classifier>
<type>tar.gz</type>
</artifactItem>
Modified: maven/components/trunk/maven-distribution/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?rev=674316&r1=674315&r2=674316&view=diff
==============================================================================
--- maven/components/trunk/maven-distribution/pom.xml (original)
+++ maven/components/trunk/maven-distribution/pom.xml Sun Jul 6 09:44:06 2008
@@ -1,34 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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">
+ <!--
+ 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">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
<version>2.1-SNAPSHOT</version>
</parent>
-
<artifactId>maven-distribution</artifactId>
<name>Maven Distribution</name>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -46,7 +40,6 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId>
</dependency>
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
@@ -86,23 +79,21 @@
<artifactId>commons-httpclient</artifactId>
</dependency>
</dependencies>
-
<profiles>
<profile>
<!--
- |
- | This profile is specifically for creating an embedder that can be used for IntelliJ integration. We need to
- | remove the JDOM JAR because IntelliJ include its own version, and the JTidy JAR includes org.xml.* classes
- | which causes a loader constraint issues while loading the embedder.
- |
- -->
+ | | This profile is specifically for creating an embedder that
+ can be used for IntelliJ integration. We need to | remove the
+ JDOM JAR because IntelliJ include its own version, and the JTidy
+ JAR includes org.xml.* classes | which causes a loader
+ constraint issues while loading the embedder. |
+ -->
<id>idea</id>
<build>
<plugins>
<plugin>
<artifactId>shade-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.0-alpha-12</version>
<executions>
<execution>
<phase>package</phase>
@@ -110,12 +101,16 @@
<goal>shade</goal>
</goals>
<configuration>
- <!-- The IDEA folks don't want to put SNAPSHOT libs in their projects even though they are -->
+ <!--
+ The IDEA folks don't want to put SNAPSHOT libs in
+ their projects even though they are
+ -->
<finalName>maven-embedder-idea-2.1</finalName>
<createDependencyReducedPom>false</createDependencyReducedPom>
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<transformers>
- <transformer implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer"/>
+ <transformer
+ implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer" />
</transformers>
<artifactSet>
<excludes>
@@ -124,7 +119,10 @@
<exclude>junit:junit</exclude>
<exclude>jmock:jmock</exclude>
<exclude>xml-apis:xml-apis</exclude>
- <!-- So this is required for the IDEA embedder which already has its own copy of JDOM -->
+ <!--
+ So this is required for the IDEA embedder which
+ already has its own copy of JDOM
+ -->
<exclude>jdom:jdom</exclude>
<exclude>jtidy:jtidy</exclude>
</excludes>
@@ -145,20 +143,17 @@
</plugins>
</build>
</profile>
-
<profile>
<!--
- |
- | This profile is specifically for creating an embedder that can be used for netbeans integration
- |
- -->
+ | | This profile is specifically for creating an embedder that
+ can be used for netbeans integration |
+ -->
<id>netbeans</id>
<build>
<plugins>
<plugin>
<artifactId>shade-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <version>1.0-alpha-12</version>
<executions>
<execution>
<phase>package</phase>
@@ -169,7 +164,8 @@
<createDependencyReducedPom>false</createDependencyReducedPom>
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<transformers>
- <transformer implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer"/>
+ <transformer
+ implementation="org.codehaus.mojo.shade.resource.ComponentsXmlResourceTransformer" />
</transformers>
<artifactSet>
<excludes>
@@ -198,7 +194,6 @@
</plugins>
</build>
</profile>
-
<profile>
<id>standard</id>
<activation>
@@ -207,8 +202,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<executions>
<execution>
<id>create-distro</id>
@@ -224,8 +219,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
<configuration>
<forkMode>once</forkMode>
</configuration>
@@ -233,7 +228,6 @@
</plugins>
</build>
</profile>
-
<profile>
<!-- Single Test -->
<id>st</id>
@@ -251,4 +245,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=674316&r1=674315&r2=674316&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Sun Jul 6 09:44:06 2008
@@ -202,6 +202,21 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>1.0.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>shade-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <version>1.0-alpha-12</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -227,20 +242,19 @@
<module>maven-workspace</module>
<module>maven-toolchain</module>
</modules>
-
<properties>
<artifactVersion>3.0-SNAPSHOT</artifactVersion>
<aspectjVersion>1.5.3</aspectjVersion>
<classWorldsVersion>1.2-alpha-12</classWorldsVersion>
<commonsCliVersion>1.0</commonsCliVersion>
<commonsHttpClientVersion>3.1</commonsHttpClientVersion>
- <doxiaVersion>1.0-alpha-9</doxiaVersion>
+ <doxiaVersion>1.0-alpha-9</doxiaVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
- <junitVersion>3.8.1</junitVersion>
+ <junitVersion>3.8.1</junitVersion>
<plexusVersion>1.0-alpha-48</plexusVersion>
<plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion>
<plexusInterpolationVersion>1.0</plexusInterpolationVersion>
- <plexusUtilsVersion>1.5.4</plexusUtilsVersion>
+ <plexusUtilsVersion>1.5.4</plexusUtilsVersion>
<wagonVersion>1.0-beta-3</wagonVersion>
</properties>