Fixes build problems as consequence of RH tech preview consolidation

* Removal or repositories from individual plugin poms * Addition of settings.xml if user wishes to ensure repositories are used * Root pom modified to include all repositories required
Teiid-Designer · Mar 13, 2015 · 38f7cd5 · 38f7cd5
1 parent 76332bd
commit 38f7cd5
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 39 deletions.
diff --git a/plugins/teiid/org.teiid.runtime.client/pom.xml b/plugins/teiid/org.teiid.runtime.client/pom.xml
@@ -346,40 +346,6 @@
             </plugins>
         </pluginManagement>
     </build>
-    <repositories>
-        <repository>
-            <id>jboss-public-repository</id>
-            <name>JBoss Public Maven Repository Group</name>
-            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-        </repository>
-        <repository>
-            <id>jboss-developer-repository-group</id>
-            <name>JBoss Developer Maven Repository Group</name>
-            <url>http://repository.jboss.org/nexus/content/groups/developer/</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>jboss-eap-alpha</id>
-            <name>JBoss EAP6.1 Alpha</name>
-            <url>http://maven.repository.redhat.com/techpreview/eap6/6.1.0.Alpha1/maven-repository/</url>
-            <layout>default</layout>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>javax.resource</groupId>
@@ -584,4 +550,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -37,6 +37,64 @@
 		<module>site</module>
 	</modules>
 
+	<repositories>
+		<repository>
+			<id>jboss-public-repository-group</id>
+			<name>JBoss Public Repository Group</name>
+			<url>http://repository.jboss.org/nexus/content/groups/public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>sonatype</id>
+			<url>http://oss.sonatype.org/content/repositories/snapshots</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>jboss-maven2-release-repository</id>
+			<url>https://repository.jboss.org/nexus/content/groups/m2-proxy/</url>
+		</repository>
+		<repository>
+			<id>redhat-techpreview-all-repository</id>
+			<name>Red Hat Tech Preview repository (all)</name>
+			<url>http://maven.repository.redhat.com/techpreview/all/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>jboss-earlyaccess</id>
+			<name>JBoss Early Access</name>
+			<url>https://maven.repository.redhat.com/earlyaccess/all/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 	<build>
 		<plugins>
 

diff --git a/settings.xml b/settings.xml
@@ -4,6 +4,41 @@
 http://maven.apache.org/xsd/settings-1.0.0.xsd">
   <profiles>
     <profile>
+            <id>redhat-techpreview-all-repository</id>
+            <repositories>
+                <repository>
+                    <id>redhat-techpreview-all-repository</id>
+                    <name>Red Hat Tech Preview repository (all)</name>
+                    <url>http://maven.repository.redhat.com/techpreview/all/</url>
+                    <layout>default</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </snapshots>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>redhat-techpreview-all-repository</id>
+                    <name>Red Hat Tech Preview repository (all)</name>
+                    <url>http://maven.repository.redhat.com/techpreview/all/</url>
+                    <layout>default</layout>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+	    <profile>
       <id>jboss-public-repository</id>
       <repositories>
         <repository>
@@ -56,12 +91,30 @@ http://maven.apache.org/xsd/settings-1.0.0.xsd">
           </snapshots>
         </repository>
       </repositories> 
-    </profile>    
-  </profiles>
-
+    </profile>
+    <profile>
+      <id>jboss-earlyaccess</id>
+      <repositories>
+        <repository>
+          <id>jboss-earlyaccess</id>
+          <name>JBoss Early Access</name>
+          <url>https://maven.repository.redhat.com/earlyaccess/all/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+    </profiles>
   <activeProfiles>
+    <activeProfile>redhat-techpreview-all-repository</activeProfile>
     <activeProfile>jboss-public-repository</activeProfile>
     <activeProfile>jboss-developer-repository</activeProfile>
+    <activeProfile>jboss-earlyaccess</activeProfile>
   </activeProfiles>
-
 </settings>