Skip to content

Commit

Permalink
Fixes #447.
Browse files Browse the repository at this point in the history 
Fixes #448.
  • Loading branch information
@mdogan
mdogan committed Mar 21, 2013
1 parent 60ee6dd commit 49d67ce
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 127 deletions.
156 changes: 95 additions & 61 deletions hazelcast-all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,38 +38,72 @@


<build>
<resources>
<!-- Include all class files, that should be part of hazelcast-all.jar and should get processed by bnd-tool -->
<resource><directory>../hazelcast/target/classes</directory></resource>
<resource><directory>../hazelcast-client/target/classes</directory></resource>
<resource><directory>../hazelcast-hibernate/target/classes</directory></resource>
<resource><directory>../hazelcast-spring/target/classes</directory></resource>
<resource><directory>../hazelcast-cloud/target/classes</directory></resource>
<resource><directory>../hazelcast-wm/target/classes</directory></resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven.bundle.plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<configuration>
<tasks>
<property name="jar.name" value="hazelcast-all-${project.parent.version}.jar"/>
<delete file="target/${jar.name}" failonerror="false"/>
<jar jarfile="target/${jar.name}" manifest="src/main/resources/META-INF/MANIFEST.MF">
<fileset dir="../hazelcast/target/classes/"/>
<fileset dir="../hazelcast-client/target/classes/"/>
<fileset dir="../hazelcast-hibernate/target/classes/"/>
<fileset dir="../hazelcast-spring/target/classes/"/>
<fileset dir="../hazelcast-cloud/target/classes/"/>
<fileset dir="../hazelcast-wm/target/classes/"/>
<manifest>
<attribute name="Built-By" value="Hazelcast.com"/>
<attribute name="Main-Class" value="com.hazelcast.examples.TestApp"/>
</manifest>
</jar>
</tasks>
</configuration>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>run</goal>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Import-Package>
!junit.framework,
!org.junit,
!org.mockito,
org.apache.log4j;resolution:=optional,
org.apache.log4j.*;resolution:=optional,
org.slf4j;resolution:=optional,
org.hibernate;resolution:=optional,
org.hibernate.*;resolution:=optional,
com.mongodb;resolution:=optional,
com.mongodb.*;resolution:=optional,
org.springframework;resolution:=optional,
org.springframework.*;resolution:=optional,
org.bson;resolution:=optional,
org.bson.*;resolution:=optional,
*
</Import-Package>
<!--<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>-->
</instructions>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven.jar.plugin.version}</version>
<configuration>
<archive>
<index>true</index>
<compress>true</compress>
<manifest>
<mainClass>com.hazelcast.examples.TestApp</mainClass>
<addClasspath>false</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -162,43 +196,43 @@
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-client</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-hibernate</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-spring</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-cloud</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-wm</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<!--<dependencies>-->
<!--<dependency>-->
<!--<groupId>com.hazelcast</groupId>-->
<!--<artifactId>hazelcast</artifactId>-->
<!--<version>${project.parent.version}</version>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.hazelcast</groupId>-->
<!--<artifactId>hazelcast-client</artifactId>-->
<!--<version>${project.parent.version}</version>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.hazelcast</groupId>-->
<!--<artifactId>hazelcast-hibernate</artifactId>-->
<!--<version>${project.parent.version}</version>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.hazelcast</groupId>-->
<!--<artifactId>hazelcast-spring</artifactId>-->
<!--<version>${project.parent.version}</version>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.hazelcast</groupId>-->
<!--<artifactId>hazelcast-cloud</artifactId>-->
<!--<version>${project.parent.version}</version>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.hazelcast</groupId>-->
<!--<artifactId>hazelcast-wm</artifactId>-->
<!--<version>${project.parent.version}</version>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--</dependencies>-->

</project>
56 changes: 0 additions & 56 deletions hazelcast-all/src/main/resources/META-INF/MANIFEST.MF
View file

This file was deleted.

4 changes: 2 additions & 2 deletions hazelcast-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
org.slf4j;resolution:=optional,
*
</Import-Package>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<!--<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>-->
</instructions>
</configuration>
</execution>
Expand All @@ -132,7 +132,7 @@
<compress>true</compress>
<manifest>
<mainClass>com.hazelcast.client.examples.TestClientApp</mainClass>
<addClasspath>true</addClasspath>
<addClasspath>false</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
Expand Down
4 changes: 2 additions & 2 deletions hazelcast-cloud/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
org.slf4j;resolution:=optional,
*
</Import-Package>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<!--<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>-->
</instructions>
</configuration>
</execution>
Expand All @@ -113,7 +113,7 @@
<index>true</index>
<compress>true</compress>
<manifest>
<addClasspath>true</addClasspath>
<addClasspath>false</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
Expand Down
5 changes: 3 additions & 2 deletions hazelcast-hibernate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
org.slf4j;resolution:=optional,
*
</Import-Package>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<!--<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>-->
</instructions>
</configuration>
</execution>
Expand All @@ -127,7 +127,7 @@
<index>true</index>
<compress>true</compress>
<manifest>
<addClasspath>true</addClasspath>
<addClasspath>false</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
Expand All @@ -148,6 +148,7 @@
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
Expand Down
5 changes: 3 additions & 2 deletions hazelcast-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
com.hazelcast.hibernate;resolution:=optional,
*
</Import-Package>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<!--<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>-->
</instructions>
</configuration>
</execution>
Expand All @@ -125,7 +125,7 @@
<index>true</index>
<compress>true</compress>
<manifest>
<addClasspath>true</addClasspath>
<addClasspath>false</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
Expand Down Expand Up @@ -171,6 +171,7 @@
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
Expand Down
4 changes: 2 additions & 2 deletions hazelcast-wm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
org.slf4j;resolution:=optional,
*
</Import-Package>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<!--<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>-->
</instructions>
</configuration>
</execution>
Expand All @@ -124,7 +124,7 @@
<index>true</index>
<compress>true</compress>
<manifest>
<addClasspath>true</addClasspath>
<addClasspath>false</addClasspath>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
Expand Down

0 comments on commit 49d67ce

Please sign in to comment.