Skip to content

Commit 0d8b1c8

Browse files
tamasblummertamasblummer
committed
upgraded poms. upgraded to leveldb 1.8
1 parent b084800 commit 0d8b1c8

3 files changed

Lines changed: 56 additions & 90 deletions

File tree

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<plugin>
1818
<groupId>com.google.protobuf.tools</groupId>
1919
<artifactId>maven-protoc-plugin</artifactId>
20-
<version>0.1.10</version>
20+
<version>0.1.10</version>
2121
<executions>
2222
<execution>
2323
<goals>

‎pom.xml‎

Lines changed: 3 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,12 @@
4545

4646
<properties>
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
48+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4849
<springframework.version>3.1.2.RELEASE</springframework.version>
49-
<stomp.version>1.16-bop-patch</stomp.version>
50-
<bop.api.version>1.0</bop.api.version>
5150
<slf4j.version>1.6.6</slf4j.version>
5251
<java.compiler.version>1.7</java.compiler.version>
5352
<bouncycastle.version>1.48</bouncycastle.version>
54-
<spring-data.version>1.1.2.RELEASE</spring-data.version>
55-
<querydsl.version>2.9.0</querydsl.version>
56-
<derby.version>10.9.1.0</derby.version>
57-
<hibernate.version>3.6.9.Final</hibernate.version>
58-
<postgresql.version>9.1-901.jdbc4</postgresql.version>
59-
<leveldbjni.version>1.6.1</leveldbjni.version>
6053
<protobuf.version>2.4.1</protobuf.version>
61-
<hibernate-validator.version>4.3.0.Final</hibernate-validator.version>
6254
<json.version>20090211</json.version>
6355
<commons-cli.version>1.2</commons-cli.version>
6456
</properties>
@@ -96,37 +88,13 @@
9688
<plugins>
9789
<plugin>
9890
<artifactId>maven-compiler-plugin</artifactId>
99-
<version>2.3.2</version>
91+
<version>3.1</version>
10092
<configuration>
10193
<source>${java.compiler.version}</source>
10294
<target>${java.compiler.version}</target>
95+
<encoding>UTF-8</encoding>
10396
</configuration>
10497
</plugin>
105-
<plugin>
106-
<groupId>org.apache.maven.plugins</groupId>
107-
<artifactId>maven-dependency-plugin</artifactId>
108-
<version>2.5.1</version>
109-
<executions>
110-
<execution>
111-
<id>copy-dependencies</id>
112-
<phase>package</phase>
113-
<goals>
114-
<goal>copy-dependencies</goal>
115-
</goals>
116-
<configuration>
117-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
118-
<overWriteReleases>false</overWriteReleases>
119-
<overWriteSnapshots>false</overWriteSnapshots>
120-
<overWriteIfNewer>true</overWriteIfNewer>
121-
<includeScope>runtime</includeScope>
122-
</configuration>
123-
</execution>
124-
</executions>
125-
</plugin>
126-
<plugin>
127-
<groupId>org.apache.maven.plugins</groupId>
128-
<artifactId>maven-source-plugin</artifactId>
129-
</plugin>
13098
<plugin>
13199
<groupId>org.apache.maven.plugins</groupId>
132100
<artifactId>maven-release-plugin</artifactId>
@@ -136,49 +104,6 @@
136104
</configuration>
137105
</plugin>
138106
</plugins>
139-
<pluginManagement>
140-
<plugins>
141-
<!--This plugin's configuration is used to store Eclipse m2e settings
142-
only. It has no influence on the Maven build itself. -->
143-
<plugin>
144-
<groupId>org.eclipse.m2e</groupId>
145-
<artifactId>lifecycle-mapping</artifactId>
146-
<version>1.0.0</version>
147-
<configuration>
148-
<lifecycleMappingMetadata>
149-
<pluginExecutions>
150-
<pluginExecution>
151-
<pluginExecutionFilter>
152-
<groupId>org.apache.maven.plugins</groupId>
153-
<artifactId>maven-dependency-plugin</artifactId>
154-
<versionRange>[2.5.1,)</versionRange>
155-
<goals>
156-
<goal>copy-dependencies</goal>
157-
</goals>
158-
</pluginExecutionFilter>
159-
<action>
160-
<ignore />
161-
</action>
162-
</pluginExecution>
163-
</pluginExecutions>
164-
</lifecycleMappingMetadata>
165-
</configuration>
166-
</plugin>
167-
<plugin>
168-
<groupId>org.apache.maven.plugins</groupId>
169-
<artifactId>maven-source-plugin</artifactId>
170-
<version>2.2.1</version>
171-
<executions>
172-
<execution>
173-
<id>attach-sources</id>
174-
<goals>
175-
<goal>jar</goal>
176-
</goals>
177-
</execution>
178-
</executions>
179-
</plugin>
180-
</plugins>
181-
</pluginManagement>
182107
<extensions>
183108
<extension>
184109
<groupId>org.apache.maven.wagon</groupId>

‎server/pom.xml‎

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<version>1.3.7-SNAPSHOT</version>
1212
<relativePath>../</relativePath>
1313
</parent>
14+
<properties>
15+
<project.mainclass>com.bitsofproof.supernode.main.Main</project.mainclass>
16+
<activemq.version>5.8.0</activemq.version>
17+
<leveldbjni.version>1.8</leveldbjni.version>
18+
</properties>
1419

1520
<repositories>
1621
<repository>
@@ -61,18 +66,11 @@
6166
<artifactId>geronimo-jms_1.1_spec</artifactId>
6267
<version>1.1</version>
6368
</dependency>
64-
6569
<dependency>
6670
<groupId>org.apache.activemq</groupId>
6771
<artifactId>activemq-client</artifactId>
68-
<version>5.8.0</version>
72+
<version>${activemq.version}</version>
6973
</dependency>
70-
71-
<dependency>
72-
<groupId>org.fusesource.stompjms</groupId>
73-
<artifactId>stompjms-client</artifactId>
74-
<version>${stomp.version}</version>
75-
</dependency>
7674
<dependency>
7775
<groupId>org.json</groupId>
7876
<artifactId>json</artifactId>
@@ -98,14 +96,13 @@
9896
<build>
9997
<plugins>
10098
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
101100
<artifactId>maven-jar-plugin</artifactId>
102101
<version>2.4</version>
103102
<configuration>
104103
<archive>
105104
<manifest>
106-
<addClasspath>true</addClasspath>
107-
<mainClass>com.bitsofproof.supernode.main.Main</mainClass>
108-
<classpathPrefix>lib/</classpathPrefix>
105+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
109106
</manifest>
110107
</archive>
111108
</configuration>
@@ -123,6 +120,50 @@
123120
</execution>
124121
</executions>
125122
</plugin>
123+
<plugin>
124+
<groupId>org.apache.maven.plugins</groupId>
125+
<artifactId>maven-shade-plugin</artifactId>
126+
<version>2.1</version>
127+
<executions>
128+
<execution>
129+
<phase>package</phase>
130+
<goals>
131+
<goal>shade</goal>
132+
</goals>
133+
<configuration>
134+
<shadedArtifactAttached>true</shadedArtifactAttached>
135+
<shadedClassifierName>shaded</shadedClassifierName>
136+
<transformers>
137+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
138+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
139+
<manifestEntries>
140+
<Class-Path>lib-signed/bcprov-jdk15on.jar</Class-Path>
141+
<Main-Class>${project.mainclass}</Main-Class>
142+
</manifestEntries>
143+
</transformer>
144+
</transformers>
145+
146+
<!-- signatures from foreign jars are bad news -->
147+
<filters>
148+
<filter>
149+
<artifact>*:*</artifact>
150+
<excludes>
151+
<exclude>META-INF/*.SF</exclude>
152+
<exclude>META-INF/*.DSA</exclude>
153+
<exclude>META-INF/*.RSA</exclude>
154+
</excludes>
155+
</filter>
156+
</filters>
157+
158+
<artifactSet>
159+
<excludes>
160+
<exclude>org.bouncycastle:bcprov-jdk15on</exclude>
161+
</excludes>
162+
</artifactSet>
163+
</configuration>
164+
</execution>
165+
</executions>
166+
</plugin>
126167
</plugins>
127168
</build>
128169
</project>

0 commit comments

Comments
 (0)