You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ba...@apache.org on 2011/12/12 04:45:05 UTC
svn commit: r1213138 - in /maven/plugins/trunk/maven-eclipse-plugin: pom.xml
src/it/settings-default.xml src/it/settings.xml
Author: baerrach
Date: Mon Dec 12 03:45:04 2011
New Revision: 1213138
URL: http://svn.apache.org/viewvc?rev=1213138&view=rev
Log:
Making it settings file configurable per user.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/it/settings-default.xml (with props)
Removed:
maven/plugins/trunk/maven-eclipse-plugin/src/it/settings.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1213138&r1=1213137&r2=1213138&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Dec 12 03:45:04 2011
@@ -1,45 +1,22 @@
<?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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<version>21</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
-
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.9-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
-
<name>Maven Eclipse Plugin</name>
<description>The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM.</description>
-
<prerequisites>
<maven>${mavenVersion}</maven>
</prerequisites>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/</developerConnection>
@@ -49,13 +26,11 @@ under the License.
<system>JIRA</system>
<url>http://jira.codehaus.org/browse/MECLIPSE</url>
</issueManagement>
-
<properties>
<mavenVersion>2.0.8</mavenVersion>
<maven.test.jvmargs>-Xmx1024m</maven.test.jvmargs>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -212,7 +187,6 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<pluginManagement>
<plugins>
@@ -231,7 +205,7 @@ under the License.
<reportsDirectory>${project.build.directory}/failsafe-reports</reportsDirectory>
</reportsDirectories>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -278,7 +252,6 @@ under the License.
</plugin>
</plugins>
</build>
-
<profiles>
<profile>
<id>maven-repo-local</id>
@@ -297,7 +270,7 @@ under the License.
</systemPropertyVariables>
<configuration>
<argLine>${maven.test.jvmargs}</argLine>
- </configuration>
+ </configuration>
</configuration>
</plugin>
</plugins>
@@ -310,8 +283,23 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
+ <id>copy-it-settings</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <available property="it_settings_file" file="src/it/settings-${user.name}.xml" value="src/it/settings-${user.name}.xml" />
+ <property name="it_settings_file" location="src/it/settings-default.xml" />
+ <copy file="${it_settings_file}" tofile="src/it/settings.xml" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
<id>verify-integration-tests-checks</id>
<phase>post-integration-test</phase>
<configuration>
@@ -342,7 +330,7 @@ under the License.
<version>2.0b4</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
@@ -375,7 +363,7 @@ under the License.
</goals>
<configuration>
<argLine>${maven.test.jvmargs}</argLine>
- </configuration>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -419,5 +407,5 @@ under the License.
</reportSets>
</plugin>
</plugins>
- </reporting>
-</project>
+ </reporting>
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-eclipse-plugin/src/it/settings-default.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/it/settings-default.xml?rev=1213138&view=auto
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/it/settings-default.xml (added)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/it/settings-default.xml Mon Dec 12 03:45:04 2011
@@ -0,0 +1,55 @@
+<?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.
+-->
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/it/settings-default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/it/settings-default.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/it/settings-default.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain