Merging SAK-22775, SAK-22321 from sakai-trunk-all

git-svn-id: https://source.sakaiproject.org/svn/sakai/trunk@116388 66ffb92e-73f9-0310-93c1-f5514f145a0a
rmoorman · Nov 14, 2012 · cad2969 · cad2969
2 parents c8e9d31 + a8a03ff
commit cad2969
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 0 deletions.
diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -20,4 +20,19 @@
     <module>common</module>
     <module>shared</module>
   </modules>
+
+	<repositories> 
+		<repository> 
+			<id>sonatype-nexus-snapshots</id> 
+			<name>Sonatype Nexus Snapshots</name> 
+			<url> https://oss.sonatype.org/content/repositories/snapshots </url> 
+			<releases> 
+				<enabled>false</enabled> 
+			</releases> 
+			<snapshots> 
+				<enabled>true</enabled> 
+			</snapshots> 
+		</repository> 
+	</repositories>
+
 </project>
diff --git a/jstl-shared-deploy/pom.xml b/jstl-shared-deploy/pom.xml
@@ -34,4 +34,18 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
+
+  <repositories> 
+		<repository> 
+			<id>sonatype-nexus-snapshots</id> 
+			<name>Sonatype Nexus Snapshots</name> 
+			<url> https://oss.sonatype.org/content/repositories/snapshots </url> 
+			<releases> 
+				<enabled>false</enabled> 
+			</releases> 
+			<snapshots> 
+				<enabled>true</enabled> 
+			</snapshots> 
+		</repository> 
+	</repositories>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -215,6 +215,39 @@
                 <!-- <module>roster2</module> -->
             </modules>
         </profile>
+
+        <!-- pack profiles for building release artifacts -->
+        <profile>
+            <id>pack</id>
+            <modules>
+				<module>master</module>
+                <module>pack/pack-src</module>
+                <module>pack/pack-bin</module>
+                <module>pack/pack-demo</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>pack-bin</id>
+            <modules>
+				<module>master</module>
+                <module>pack/pack-bin</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>pack-demo</id>
+            <modules>
+                <module>master</module>
+                <module>pack/pack-demo</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>pack-src</id>
+            <modules>
+                <module>master</module>
+                <module>pack/pack-src</module>
+            </modules>
+        </profile>
+
     </profiles>
     <reporting>
         <plugins>