You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/07/13 00:38:02 UTC

svn commit: r1360990 - in /maven/plugins/trunk: maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/ maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/ maven-ear-plugin/src/test/filtered-resources/ mave...

Author: olamy
Date: Thu Jul 12 22:38:02 2012
New Revision: 1360990

URL: http://svn.apache.org/viewvc?rev=1360990&view=rev
Log:
this repository doesn't exist anymore

Added:
    maven/plugins/trunk/maven-ear-plugin/src/test/filtered-resources/
    maven/plugins/trunk/maven-ear-plugin/src/test/filtered-resources/settings.xml   (contents, props changed)
      - copied, changed from r1360989, maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml
Removed:
    maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml
Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml
    maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml
    maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-295/pom.xml

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml?rev=1360990&r1=1360989&r2=1360990&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/massembly-99/pom.xml Thu Jul 12 22:38:02 2012
@@ -48,7 +48,7 @@
   <pluginRepositories>
     <pluginRepository>
       <id>apache.snapshots</id>
-      <url>http://people.apache.org/maven-snapshot-repository/</url>
+      <url>http://repository.apache.org/snapshots</url>
     </pluginRepository>
   </pluginRepositories>
 </project>

Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml?rev=1360990&r1=1360989&r2=1360990&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/pom.xml Thu Jul 12 22:38:02 2012
@@ -47,7 +47,7 @@
   <pluginRepositories>
     <pluginRepository>
       <id>apache.snapshots</id>
-      <url>http://people.apache.org/maven-snapshot-repository/</url>
+      <url>http://repository.apache.org/snapshots</url>
     </pluginRepository>
   </pluginRepositories>
 </project>

Copied: maven/plugins/trunk/maven-ear-plugin/src/test/filtered-resources/settings.xml (from r1360989, maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/filtered-resources/settings.xml?p2=maven/plugins/trunk/maven-ear-plugin/src/test/filtered-resources/settings.xml&p1=maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml&r1=1360989&r2=1360990&rev=1360990&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/settings.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/filtered-resources/settings.xml Thu Jul 12 22:38:02 2012
@@ -1,3 +1,5 @@
+<?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
@@ -7,7 +9,7 @@ to you under the Apache License, Version
 "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
+  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
@@ -17,25 +19,35 @@ specific language governing permissions 
 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">
-  <activeProfiles>
-    <activeProfile>test</activeProfile>
-  </activeProfiles>
+<settings>
   <profiles>
     <profile>
-      <id>test</id>
+      <id>it-repo</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <repositories>
         <repository>
-          <id>apache.snapshots</id>
-          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+          <id>local.central</id>
+          <url>file://${settings.localRepository}</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
         </repository>
       </repositories>
       <pluginRepositories>
         <pluginRepository>
-          <id>apache.snapshots</id>
-          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+          <id>local.central</id>
+          <url>file://${settings.localRepository}</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
         </pluginRepository>
       </pluginRepositories>
     </profile>

Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/filtered-resources/settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-ear-plugin/src/test/filtered-resources/settings.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-295/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-295/pom.xml?rev=1360990&r1=1360989&r2=1360990&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-295/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-295/pom.xml Thu Jul 12 22:38:02 2012
@@ -259,7 +259,7 @@ under the License.
     <pluginRepository>
       <id>apache.snapshots</id>
       <name>snapshot plugins</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <url>http://repository.apache.org/snapshots</url>
       <releases>
         <enabled>false</enabled>
       </releases>
@@ -267,10 +267,6 @@ under the License.
         <enabled>true</enabled>
       </snapshots>
     </pluginRepository>
-    <pluginRepository>
-      <id>brianf.apache.org</id>
-      <url>http://people.apache.org/~brianf/staging-repository</url>
-    </pluginRepository>
   </pluginRepositories>
 
   <profiles>