karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1482771 - in /karaf/trunk/assemblies/features/framework: ./ src/main/release/ src/main/release/resources/ src/main/release/resources/etc/ src/main/resources/resources/etc/ src/main/snapshot/ src/main/snapshot/resources/ src/main/snapshot/r...
Date Wed, 15 May 2013 11:28:53 GMT
Author: jbonofre
Date: Wed May 15 11:28:53 2013
New Revision: 1482771

URL: http://svn.apache.org/r1482771
Log:
[KARAF-2314] Use a different etc/org.ops4j.pax.url.mvn.cfg file depending if the distribution
is a SNAPSHOT or a release

Added:
    karaf/trunk/assemblies/features/framework/src/main/release/
    karaf/trunk/assemblies/features/framework/src/main/release/resources/
    karaf/trunk/assemblies/features/framework/src/main/release/resources/etc/
    karaf/trunk/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg
      - copied, changed from r1482305, karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
    karaf/trunk/assemblies/features/framework/src/main/snapshot/
    karaf/trunk/assemblies/features/framework/src/main/snapshot/resources/
    karaf/trunk/assemblies/features/framework/src/main/snapshot/resources/etc/
    karaf/trunk/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg
      - copied, changed from r1482305, karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
Removed:
    karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
Modified:
    karaf/trunk/assemblies/features/framework/pom.xml

Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1482771&r1=1482770&r2=1482771&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Wed May 15 11:28:53 2013
@@ -431,4 +431,38 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>snapshot</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>${project.basedir}/src/main/snapshot</directory>
+                        <filtering>false</filtering>
+                        <includes>
+                            <include>**/*</include>
+                        </includes>
+                    </resource>
+                </resources>
+            </build>
+        </profile>
+        <profile>
+            <id>release</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>${project.basedir}/src/main/release</directory>
+                        <filtering>false</filtering>
+                        <includes>
+                            <include>**/*</include>
+                        </includes>
+                    </resource>
+                </resources>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Copied: karaf/trunk/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg
(from r1482305, karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg?p2=karaf/trunk/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg&p1=karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg&r1=1482305&r2=1482771&rev=1482771&view=diff
==============================================================================
    (empty)

Copied: karaf/trunk/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg
(from r1482305, karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg?p2=karaf/trunk/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg&p1=karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg&r1=1482305&r2=1482771&rev=1482771&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
(original)
+++ karaf/trunk/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg
Wed May 15 11:28:53 2013
@@ -79,27 +79,26 @@ org.ops4j.pax.url.mvn.defaultLocalRepoAs
 
 #
 # Comma separated list of repositories scanned when resolving an artifact.
-# The default list includes the following repositories containing releases:
-#    http://repo1.maven.org/maven2
-#    http://repository.apache.org/content/groups/snapshots-group
-#    http://svn.apache.org/repos/asf/servicemix/m2-repo
-#    http://repository.springsource.com/maven/bundles/release
-#    http://repository.springsource.com/maven/bundles/external
+# The default list includes the following repositories:
+#    http://repo1.maven.org/maven2@id=central
+#    http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
+#    http://repository.springsource.com/maven/bundles/release@id=spring.ebr
+#    http://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease
+#    http://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
+#    file:${karaf.home}/${karaf.default.repository}@id=system.repository
+#    file:${karaf.data}/kar@id=kar.repository@multi
 # To add repositories to the default ones, prepend '+' to the list of repositories
 # to add.
 # A repository url can be appended with zero or more of the following flags:
-#    @snapshots  : the repository contains snaphots
+#    @snapshots  : the repository contains snapshots
 #    @noreleases : the repository does not contain any released artifacts
-#    @id=reponid : the id for the repository, just like in the settings.xml this is optional
but recomendet 
-#
-# The default list doesn't contain any repository containing snapshots as it can impact the
artifacts resolution.
-# You may want to add the following repositories containing snapshots:
-#    http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
-#    http://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease
-#    http://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
+#    @id=repository.id : the id for the repository, just like in the settings.xml this is
optional but recommended
 #
 org.ops4j.pax.url.mvn.repositories= \
     http://repo1.maven.org/maven2@id=central, \
+    http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases,
\
     http://repository.springsource.com/maven/bundles/release@id=spring.ebr, \
+    http://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease,
\
+    http://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases,
\
     file:${karaf.home}/${karaf.default.repository}@id=system.repository, \
     file:${karaf.data}/kar@id=kar.repository@multi



Mime
View raw message