You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/09/24 08:48:49 UTC
svn commit: r1389222 - in /karaf/branches/karaf-2.3.x: demos/web/pom.xml
shell/dev/pom.xml shell/osgi/pom.xml shell/web/pom.xml
Author: jbonofre
Date: Mon Sep 24 06:48:49 2012
New Revision: 1389222
URL: http://svn.apache.org/viewvc?rev=1389222&view=rev
Log:
Fix build warnings
Modified:
karaf/branches/karaf-2.3.x/demos/web/pom.xml
karaf/branches/karaf-2.3.x/shell/dev/pom.xml
karaf/branches/karaf-2.3.x/shell/osgi/pom.xml
karaf/branches/karaf-2.3.x/shell/web/pom.xml
Modified: karaf/branches/karaf-2.3.x/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/demos/web/pom.xml?rev=1389222&r1=1389221&r2=1389222&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/demos/web/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/demos/web/pom.xml Mon Sep 24 06:48:49 2012
@@ -142,11 +142,11 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<move todir="${project.build.directory}/karaf/WEB-INF/karaf">
<fileset dir="${project.build.directory}/karaf/WEB-INF/apache-karaf-${project.version}" />
</move>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: karaf/branches/karaf-2.3.x/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/dev/pom.xml?rev=1389222&r1=1389221&r2=1389222&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/dev/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/dev/pom.xml Mon Sep 24 06:48:49 2012
@@ -40,11 +40,6 @@
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.utils</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<scope>provided</scope>
Modified: karaf/branches/karaf-2.3.x/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/osgi/pom.xml?rev=1389222&r1=1389221&r2=1389222&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/osgi/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/osgi/pom.xml Mon Sep 24 06:48:49 2012
@@ -116,7 +116,7 @@
</DynamicImport-Package>
<Private-Package>
org.apache.karaf.util;-split-package:=merge-first,
- org.apache.felix.utils*,
+ org.apache.felix.utils*;-split-package:=merge-first,
!*
</Private-Package>
</instructions>
Modified: karaf/branches/karaf-2.3.x/shell/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/web/pom.xml?rev=1389222&r1=1389221&r2=1389222&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/web/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/web/pom.xml Mon Sep 24 06:48:49 2012
@@ -97,8 +97,8 @@
*
</Import-Package>
<Private-Package>
- org.apache.felix.utils.version,
- org.apache.felix.utils.manifest,
+ org.apache.felix.utils.version;-split-package:=merge-first,
+ org.apache.felix.utils.manifest;-split-package:=merge-first,
!*
</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>