Skip to content

Commit

Permalink
Disconnect samples from parent pom (INT-1316)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbeams
cbeams committed Sep 2, 2010
1 parent 552432c commit 9e6e232
Show file tree
Hide file tree
Showing 27 changed files with 276 additions and 240 deletions.
2 changes: 0 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<module>spring-integration-jmx</module>
<module>spring-integration-mail</module>
<module>spring-integration-rmi</module>
<module>spring-integration-samples</module>
<module>spring-integration-security</module>
<module>spring-integration-stream</module>
<module>spring-integration-test</module>
Expand Down Expand Up @@ -259,7 +258,6 @@
<packages>org.springframework.integration.xmpp:org.springframework.integration.xmpp.*</packages>
</group>
</groups>
<excludePackageNames>org.springframework.integration.samples:com.springframework.integration.samples</excludePackageNames>
<links>
<link>http://static.springframework.org/spring/docs/3.0.3.RELEASE/javadoc-api</link>
<link>http://static.springsource.org/spring-integration/sites/${project.version}/apidocs</link>
Expand Down
8 changes: 0 additions & 8 deletions spring-integration-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,4 @@
<artifactId>cglib-nodep</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 0 additions & 8 deletions spring-integration-event/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,4 @@
<artifactId>mockito-all</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 0 additions & 8 deletions spring-integration-file/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,4 @@
<artifactId>spring-integration-test</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 0 additions & 8 deletions spring-integration-ftp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,4 @@
<version>1.4</version>
</dependency>
</dependencies>
<build>
<!-- <plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins> -->
</build>
</project>
2 changes: 2 additions & 0 deletions spring-integration-ftp/template.mf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ Bundle-ManifestVersion: 2
Import-Template:
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
org.apache.commons.lang.*;version="[2.5.0, 3.0.0)",
org.apache.commons.net.*;version="[2.0.0, 3.0.0)",
org.springframework.integration.*;version="[2.0.0, 2.0.1)",
org.springframework.scheduling.*;version="[3.0.0, 4.0.0)",
org.springframework.beans.*;version="[3.0.0, 4.0.0)",
org.springframework.context;version="[3.0.0, 4.0.0)",
org.springframework.core.*;version="[3.0.0, 4.0.0)",
Expand Down
8 changes: 0 additions & 8 deletions spring-integration-groovy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 0 additions & 8 deletions spring-integration-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,4 @@
<artifactId>spring-integration-test</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 0 additions & 8 deletions spring-integration-httpinvoker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,4 @@
<artifactId>spring-test</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 0 additions & 8 deletions spring-integration-ip/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,4 @@
<artifactId>spring-integration-test</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
4 changes: 0 additions & 4 deletions spring-integration-jdbc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down
8 changes: 0 additions & 8 deletions spring-integration-jms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 0 additions & 8 deletions spring-integration-jmx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,4 @@
<artifactId>spring-test</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
8 changes: 0 additions & 8 deletions spring-integration-mail/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,4 @@
<artifactId>spring-test</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
86 changes: 37 additions & 49 deletions spring-integration-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,7 @@
dependency definitions to be inherited by child poms. any
<dependency> declarations here will automatically show up on child
project classpaths. only items that are truly common across all
projects (modules and samples) should go here. otherwise, consider
<dependencyManagement> above
projects should go here. otherwise, consider <dependencyManagement/>
-->
<dependency>
<groupId>log4j</groupId>
Expand Down Expand Up @@ -348,54 +347,43 @@
</execution>
</executions>
</plugin>
<plugin>
<!--
configures the springsource bundlor plugin, which generates
OSGI-compatible MANIFEST.MF files during the 'compile' phase of
the maven build. For more information, see
http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
-->
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
<version>1.0.0.RELEASE</version>
<configuration>
<failOnWarnings>true</failOnWarnings>
</configuration>
<executions>
<execution>
<id>bundlor</id>
<goals>
<goal>bundlor</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!--
configures the jar plugin to pick up the manifest created by
bundlor (see above)
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
<archive>
<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<!--
configures the springsource bundlor plugin, which generates
OSGI-compatible MANIFEST.MF files during the 'compile' phase of
the maven build. this plugin is declared within the
pluginManagement section because not every module that inherits
from this pom needs bundlor's services, e.g.:
spring-integration-samples and all its children. for this reason,
all modules that wish to use bundlor must declare it explicitly.
it is not necessary to specify the <version> or <configuration>
sections, but groupId and artifactId are required. see
http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
for more info
-->
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
<version>1.0.0.RELEASE</version>
<configuration>
<failOnWarnings>true</failOnWarnings>
</configuration>
<executions>
<execution>
<id>bundlor</id>
<goals>
<goal>bundlor</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!--
configures the jar plugin to pick up the manifest created by
bundlor (see above)
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
<configuration>
<archive>
<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<reporting>
<plugins>
Expand Down
8 changes: 0 additions & 8 deletions spring-integration-rmi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,4 @@
<artifactId>spring-test</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit 9e6e232

Please sign in to comment.