You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/03/11 14:38:57 UTC
svn commit: r635919 - in /servicemix/smx4/nmr/trunk: ./ assembly/
assembly/src/main/descriptors/ bundle/ jbi/deployer/ jbi/itests/
jbi/itests/src/test/java/org/apache/servicemix/jbi/
Author: gnodet
Date: Tue Mar 11 06:38:51 2008
New Revision: 635919
URL: http://svn.apache.org/viewvc?rev=635919&view=rev
Log:
Do not embed xbean-classloader, fix pom so that the release process can work
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/nmr/trunk/bundle/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=635919&r1=635918&r2=635919&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Tue Mar 11 06:38:51 2008
@@ -119,6 +119,11 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>${geronimo.jta.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-classloader</artifactId>
+ <version>${xbean.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -128,7 +133,7 @@
<executions>
<execution>
<id>filter</id>
- <phase>generate-resources</phase>
+ <phase>package</phase>
<goals>
<goal>resources</goal>
</goals>
@@ -196,54 +201,8 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- </executions>
- </plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>assembly-src</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>unix-src</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/unix-src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>windows-src</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/windows-src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=635919&r1=635918&r2=635919&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Mar 11 06:38:51 2008
@@ -109,6 +109,7 @@
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
+ <include>org.apache.xbean:xbean-classloader</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=635919&r1=635918&r2=635919&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Mar 11 06:38:51 2008
@@ -101,6 +101,7 @@
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
+ <include>org.apache.xbean:xbean-classloader</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
Modified: servicemix/smx4/nmr/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/bundle/pom.xml?rev=635919&r1=635918&r2=635919&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/bundle/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/bundle/pom.xml Tue Mar 11 06:38:51 2008
@@ -33,6 +33,11 @@
<version>1.0-m1-SNAPSHOT</version>
<name>ServiceMix NMR :: Bundle</name>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <createSourcesJar>false</createSourcesJar>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
@@ -103,12 +108,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.0</version>
@@ -122,8 +121,25 @@
<shadedGroupFilter>org.apache.servicemix</shadedGroupFilter>
<shadedArtifactAttached>false</shadedArtifactAttached>
<createSourcesJar>${createSourcesJar}</createSourcesJar>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <promoteTransitiveDependencies>false</promoteTransitiveDependencies>
<createDependencyReducedPom>true</createDependencyReducedPom>
+ <artifactSet>
+ <includes>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.commands</include>
+ <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.management</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
+ <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.management</include>
+ </includes>
+ </artifactSet>
+<!--
<filters>
<filter>
<artifact>${project.groupId}:${project.artifactId}</artifact>
@@ -132,6 +148,7 @@
</excludes>
</filter>
</filters>
+-->
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<projectName>Apache ServiceMix</projectName>
@@ -158,7 +175,7 @@
<executions>
<execution>
<id>unpack-sources</id>
- <phase>generate-sources</phase>
+ <phase>compile</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=635919&r1=635918&r2=635919&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Tue Mar 11 06:38:51 2008
@@ -87,7 +87,6 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Private-Package>org.apache.xbean*</Private-Package>
<Export-Package>${pom.artifactId}*</Export-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=635919&r1=635918&r2=635919&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Tue Mar 11 06:38:51 2008
@@ -133,6 +133,12 @@
<version>${felix.prefs.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-classloader</artifactId>
+ <version>${xbean.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared-compat</artifactId>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=635919&r1=635918&r2=635919&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java Tue Mar 11 06:38:51 2008
@@ -72,6 +72,7 @@
getBundle("org.apache.geronimo.specs", "geronimo-stax-api_1.0_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
getBundle("org.apache.felix", "org.apache.felix.prefs"),
+ getBundle("org.apache.xbean", "xbean-classloader"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"),
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=635919&r1=635918&r2=635919&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Mar 11 06:38:51 2008
@@ -368,7 +368,6 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>2.3</version>
<configuration>
- <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>