Author: vsiveton
Date: Sun Dec 2 05:28:57 2007
New Revision: 600285
URL: http://svn.apache.org/viewvc?rev=600285&view=rev
Log:
o lock surefire-plugin version to 2.3 to avoid Plexus pb
Modified:
maven/plugins/trunk/maven-jar-plugin/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-01/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-02/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-03/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-01/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-02/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-03/pom.xml
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/project-004/pom.xml
Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=600285&r1=600284&r2=600285&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Sun Dec 2 05:28:57 2007
@@ -99,6 +99,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
@@ -118,6 +119,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
<executions>
<execution>
<id>integration-test</id>
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-01/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-01/pom.xml?rev=600285&r1=600284&r2=600285&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-01/pom.xml
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-01/pom.xml
Sun Dec 2 05:28:57 2007
@@ -1,48 +1,52 @@
<?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.
+ 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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin-test-mjar-30-01</artifactId>
- <version>99.0</version>
- <name>Maven</name>
- <packaging>jar</packaging>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2-it-SNAPSHOT</version>
- </plugin>
- </plugins>
- </build>
+ 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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin-test-mjar-30-01</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>jar</packaging>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2-it-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-02/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-02/pom.xml?rev=600285&r1=600284&r2=600285&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-02/pom.xml
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-02/pom.xml
Sun Dec 2 05:28:57 2007
@@ -28,16 +28,20 @@
<packaging>jar</packaging>
<url>http://maven.apache.org</url>
<build>
- <plugins>
+ <plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2-it-SNAPSHOT</version>
<configuration>
- <includes>
- <include>**/service/*</include>
- </includes>
+ <includes>
+ <include>**/service/*</include>
+ </includes>
</configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-03/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-03/pom.xml?rev=600285&r1=600284&r2=600285&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-03/pom.xml
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-30-03/pom.xml
Sun Dec 2 05:28:57 2007
@@ -1,53 +1,57 @@
<?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.
+ 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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin-test-mjar-30-03</artifactId>
- <version>99.0</version>
- <name>Maven</name>
- <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2-it-SNAPSHOT</version>
- <configuration>
- <excludes>
- <exclude>**/*.class</exclude>
- <exclude>**/*.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ 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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin-test-mjar-30-03</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2-it-SNAPSHOT</version>
+ <configuration>
+ <excludes>
+ <exclude>**/*.class</exclude>
+ <exclude>**/*.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-01/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-01/pom.xml?rev=600285&r1=600284&r2=600285&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-01/pom.xml
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-01/pom.xml
Sun Dec 2 05:28:57 2007
@@ -7,9 +7,9 @@
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
@@ -49,6 +49,10 @@
<phase>package</phase>
</execution>
</executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-02/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-02/pom.xml?rev=600285&r1=600284&r2=600285&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-02/pom.xml
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-02/pom.xml
Sun Dec 2 05:28:57 2007
@@ -7,9 +7,9 @@
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
@@ -54,7 +54,10 @@
</configuration>
</execution>
</executions>
-
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-03/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-03/pom.xml?rev=600285&r1=600284&r2=600285&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-03/pom.xml
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/mjar-80-03/pom.xml
Sun Dec 2 05:28:57 2007
@@ -7,9 +7,9 @@
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
@@ -54,7 +54,10 @@
</configuration>
</execution>
</executions>
-
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/project-004/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/project-004/pom.xml?rev=600285&r1=600284&r2=600285&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/project-004/pom.xml
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/resources/it/project-004/pom.xml
Sun Dec 2 05:28:57 2007
@@ -1,54 +1,58 @@
<?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.
+ 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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin-test-project-004</artifactId>
- <version>99.0</version>
- <name>Maven</name>
- <packaging>jar</packaging>
- <url>http://maven.apache.org</url>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2-it-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
-
<classifier>service</classifier>
- <includes>
-
<include>**/service/*</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ 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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin-test-project-004</artifactId>
+ <version>99.0</version>
+ <name>Maven</name>
+ <packaging>jar</packaging>
+ <url>http://maven.apache.org</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2-it-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>service</classifier>
+ <includes>
+ <include>**/service/*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
