Author: jbonofre
Date: Thu May 16 06:47:11 2013
New Revision: 1483205
URL: http://svn.apache.org/r1483205
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/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/release/
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/release/etc/
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/snapshot/
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/snapshot/etc/
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg
- copied, changed from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
Removed:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
Modified:
karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml
karaf/branches/karaf-2.x/pom.xml
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml?rev=1483205&r1=1483204&r2=1483205&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml Thu May 16
06:47:11 2013
@@ -536,76 +536,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>unix-minimal-bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>src/main/descriptors/unix-minimal-bin.xml</descriptor>
- </descriptors>
-
<finalName>${project.artifactId}-${project.version}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- <execution>
- <id>unix-bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>src/main/descriptors/unix-bin.xml</descriptor>
- </descriptors>
-
<finalName>${project.artifactId}-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- <execution>
- <id>windows-minimal-bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>src/main/descriptors/windows-minimal-bin.xml</descriptor>
- </descriptors>
-
<finalName>${project.artifactId}-${project.version}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <assemblyId />
- </configuration>
- </execution>
- <execution>
- <id>windows-bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>src/main/descriptors/windows-bin.xml</descriptor>
- </descriptors>
-
<finalName>${project.artifactId}-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <duplicateBehaviour>skip</duplicateBehaviour>
- <assemblyId />
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>${project.version}</version>
@@ -728,6 +658,165 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>snapshot</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>unix-minimal-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/descriptors/unix-minimal-bin-snapshot.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unix-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/descriptors/unix-bin-snapshot.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>windows-minimal-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/descriptors/windows-minimal-bin-snapshot.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <assemblyId />
+ </configuration>
+ </execution>
+ <execution>
+ <id>windows-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/descriptors/windows-bin-snapshot.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+
<duplicateBehaviour>skip</duplicateBehaviour>
+ <assemblyId />
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>unix-minimal-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/descriptors/unix-minimal-bin-release.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unix-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/descriptors/unix-bin-release.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>windows-minimal-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/descriptors/windows-minimal-bin-release.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <assemblyId />
+ </configuration>
+ </execution>
+ <execution>
+ <id>windows-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/descriptors/windows-bin-release.xml</descriptor>
+ </descriptors>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+
<duplicateBehaviour>skip</duplicateBehaviour>
+ <assemblyId />
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
Thu May 16 06:47:11 2013
@@ -43,7 +43,7 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>src/main/distribution/unix-text</directory>
+ <directory>src/main/distribution/release</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
Thu May 16 06:47:11 2013
@@ -43,7 +43,7 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>src/main/distribution/unix-text</directory>
+ <directory>src/main/distribution/snapshot</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
Thu May 16 06:47:11 2013
@@ -43,7 +43,7 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>src/main/distribution/unix-text</directory>
+ <directory>src/main/distribution/release</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
Thu May 16 06:47:11 2013
@@ -43,7 +43,7 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>src/main/distribution/unix-text</directory>
+ <directory>src/main/distribution/snapshot</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
Thu May 16 06:47:11 2013
@@ -42,6 +42,11 @@
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
+ <directory>src/main/distribution/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
<directory>src/main/distribution/windows-text</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>dos</lineEnding>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
Thu May 16 06:47:11 2013
@@ -42,6 +42,11 @@
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
+ <directory>src/main/distribution/snapshot</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
<directory>src/main/distribution/windows-text</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>dos</lineEnding>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
Thu May 16 06:47:11 2013
@@ -43,6 +43,11 @@
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
+ <directory>src/main/distribution/release</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
<directory>src/main/distribution/windows-text</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>dos</lineEnding>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
Thu May 16 06:47:11 2013
@@ -43,6 +43,11 @@
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
+ <directory>src/main/distribution/snapshot</directory>
+ <outputDirectory>/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
<directory>src/main/distribution/windows-text</directory>
<outputDirectory>/</outputDirectory>
<lineEnding>dos</lineEnding>
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/release/etc/org.ops4j.pax.url.mvn.cfg&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg
(from r1482362,
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg?p2=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg&p1=karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg&r1=1482362&r2=1483205&rev=1483205&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/snapshot/etc/org.ops4j.pax.url.mvn.cfg
Thu May 16 06:47:11 2013
@@ -79,6 +79,9 @@ org.ops4j.pax.url.mvn.defaultRepositorie
# Comma separated list of repositories scanned when resolving an artifact.
# The default list includes the following repositories containing releases:
# http://repo1.maven.org/maven2@id=central
+#
http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache
+#
http://oss.sonatype.org/content/repositories/snapshots@snapshots@noreleases@id=sonatype.snapshot
+#
http://oss.sonatype.org/content/repositories/ops4j-snapshots@snapshots@noreleases@id=ops4j.snapshot
# http://repository.springsource.com/maven.bundles/release@id=spring.ebr
# http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix
#
http://repository.springsource.com/maven/bundles/release@id=springsource.release
@@ -90,14 +93,11 @@ org.ops4j.pax.url.mvn.defaultRepositorie
# @snapshots : the repository contains snapshots
# @noreleases : the repository does not contain any released artifacts
#
-# 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@snapshots@noreleases@id=apache
-#
http://oss.sonatype.org/content/repositories/snapshots@snapshots@noreleases@id=sonatype.snapshot
-#
http://oss.sonatype.org/content/repositories/ops4j-snapshots@snapshots@noreleases@id=ops4j.snapshot
-#
org.ops4j.pax.url.mvn.repositories= \
http://repo1.maven.org/maven2@id=central, \
+
http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache,
\
+
http://oss.sonatype.org/content/repositories/snapshots@snapshots@noreleases@id=sonatype.snapshot,
\
+
http://oss.sonatype.org/content/repositories/ops4j-snapshots@snapshots@noreleases@id=ops4j.snapshot,
\
http://repository.springsource.com/maven/bundles/release@id=spring.ebr, \
http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix, \
http://repository.springsource.com/maven/bundles/release@id=springsource.release,
\
Modified: karaf/branches/karaf-2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/pom.xml?rev=1483205&r1=1483204&r2=1483205&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/pom.xml (original)
+++ karaf/branches/karaf-2.x/pom.xml Thu May 16 06:47:11 2013
@@ -1587,10 +1587,10 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[2.2.1,3)</version>
+ <version>[2.2.1,4)</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.5,1.7.1)</version>
+ <version>[1.5,1.9)</version>
</requireJavaVersion>
</rules>
</configuration>
