Skip to content

Commit cc3c2ea

Browse files
daneeldeveloperdaneeldeveloper
committed
Starting roll out of version 0.4
Switched minimum java version to 1.7 Dependancies version handled by general properties
1 parent 21d6c9b commit cc3c2ea

File tree

4 files changed

+38
-55
lines changed

4 files changed

+38
-55
lines changed

‎fj-core/pom.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-lib</artifactId>
10-
<version>0.3-SNAPSHOT</version>
10+
<version>0.4-SNAPSHOT</version>
1111
</parent>
1212

1313
<name>fj-core</name>
14-
<description>Fugerit Java Core Library for JDK 1.6 and up</description>
14+
<description>Fugerit Java Core Library for JDK 1.7 and up</description>
1515

1616
<licenses>
1717
<license>
@@ -21,21 +21,13 @@
2121
</license>
2222
</licenses>
2323

24-
<properties>
25-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
</properties>
27-
2824
<build>
2925

3026
</build>
3127

3228
<dependencies>
3329

3430
<!-- java core dependancies -->
35-
<dependency>
36-
<groupId>maven</groupId>
37-
<artifactId>maven-java-plugin</artifactId>
38-
</dependency>
3931
<dependency>
4032
<groupId>javax</groupId>
4133
<artifactId>javaee-api</artifactId>

‎fj-ext/pom.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-lib</artifactId>
10-
<version>0.3-SNAPSHOT</version>
10+
<version>0.4-SNAPSHOT</version>
1111
</parent>
1212

1313
<name>fj-ext</name>
14-
<description>Fugerit Java Extension Library for JDK 1.6 and up</description>
14+
<description>Fugerit Java Extension Library for JDK 1.7 and up</description>
1515

1616
<organization>
1717
<url>http://www.fugerit.org</url>
@@ -26,10 +26,6 @@
2626
<distribution>repo</distribution>
2727
</license>
2828
</licenses>
29-
30-
<properties>
31-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
</properties>
3329

3430
<build>
3531
<plugins>
@@ -39,10 +35,6 @@
3935
<dependencies>
4036

4137
<!-- java core dependancies -->
42-
<dependency>
43-
<groupId>maven</groupId>
44-
<artifactId>maven-java-plugin</artifactId>
45-
</dependency>
4638
<dependency>
4739
<groupId>javax</groupId>
4840
<artifactId>javaee-api</artifactId>

‎fj-tool/pom.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-lib</artifactId>
10-
<version>0.3-SNAPSHOT</version>
10+
<version>0.4-SNAPSHOT</version>
1111
</parent>
1212

1313
<name>fj-tool</name>
14-
<description>Fugerit Java Tool Library for JDK 1.6 and up</description>
14+
<description>Fugerit Java Tool Library for JDK 1.7 and up</description>
1515

1616
<organization>
1717
<url>http://www.fugerit.org</url>
@@ -27,10 +27,6 @@
2727
</license>
2828
</licenses>
2929

30-
<properties>
31-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
</properties>
33-
3430
<build>
3531
<plugins>
3632
</plugins>
@@ -51,10 +47,6 @@
5147
</dependency>
5248

5349
<!-- java core dependancies -->
54-
<dependency>
55-
<groupId>maven</groupId>
56-
<artifactId>maven-java-plugin</artifactId>
57-
</dependency>
5850
<dependency>
5951
<groupId>javax</groupId>
6052
<artifactId>javaee-api</artifactId>

‎pom.xml‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,33 @@
55
<groupId>org.fugerit.java</groupId>
66
<artifactId>fj-lib</artifactId>
77

8-
<version>0.3-SNAPSHOT</version>
8+
<version>0.4-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<name>fj-lib</name>
12-
<description>Fugerit Java Library for JDK 1.6 and up</description>
12+
<description>Fugerit Java Library for JDK 1.7 and up</description>
1313
<url>http://www.fugerit.org/java/</url>
1414

1515
<properties>
16-
<java-version-compliance>1.6</java-version-compliance>
1716
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
<java-version-compliance>1.7</java-version-compliance>
18+
<j2ee-version-compliance>6.0</j2ee-version-compliance>
1819
<maven.compiler.source>${java-version-compliance}</maven.compiler.source>
19-
<maven.compiler.target>${java-version-compliance}</maven.compiler.target>
20-
<slf4j-version>1.7.25</slf4j-version>
21-
<poi-version>3.17</poi-version>
20+
<maven.compiler.target>${java-version-compliance}</maven.compiler.target>
21+
<!-- maven plugin versions -->
22+
<mvn-source-version>3.1.0</mvn-source-version>
23+
<mvn-javadoc-version>3.1.0</mvn-javadoc-version>
24+
<mvn-jar-version>3.1.2</mvn-jar-version>
25+
<mvn-shade-version>3.2.1</mvn-shade-version>
26+
<!-- dependancy library versions -->
27+
<slf4j-version>1.7.26</slf4j-version>
28+
<poi-version>4.1.0</poi-version>
29+
<junit-version>4.12</junit-version>
30+
<dbcp-version>1.4</dbcp-version>
31+
<log4j-version>1.2.17</log4j-version>
32+
<!-- release dependancies -->
33+
<nexus-version>1.6.8</nexus-version>
34+
<mvn-gpg-version>1.6</mvn-gpg-version>
2235
</properties>
2336

2437
<licenses>
@@ -45,9 +58,9 @@
4558
</developers>
4659

4760
<scm>
48-
<connection>scm:git:git://github.com/fugerit79/fj-lib.git</connection>
49-
<developerConnection>scm:git:ssh://github.com/fugerit79/fj-lib.git</developerConnection>
50-
<url>http://github.com/fugerit79/fj-lib/tree/master</url>
61+
<connection>scm:git:git://github.com/fugerit-org/fj-lib.git</connection>
62+
<developerConnection>scm:git:ssh://github.com/fugerit-org/fj-lib.git</developerConnection>
63+
<url>http://github.com/fugerit-org/fj-lib</url>
5164
</scm>
5265

5366
<distributionManagement>
@@ -73,24 +86,18 @@
7386
<version>${project.version}</version>
7487
</dependency>
7588

76-
<!-- java core dependancies -->
77-
<dependency>
78-
<groupId>maven</groupId>
79-
<artifactId>maven-java-plugin</artifactId>
80-
<version>1.6</version>
81-
</dependency>
8289
<dependency>
8390
<groupId>javax</groupId>
8491
<artifactId>javaee-api</artifactId>
85-
<version>6.0</version>
92+
<version>${j2ee-version-compliance}</version>
8693
<scope>provided</scope>
8794
</dependency>
8895

8996
<!-- logging -->
9097
<dependency>
9198
<groupId>log4j</groupId>
9299
<artifactId>log4j</artifactId>
93-
<version>1.2.17</version>
100+
<version>${log4j-version}</version>
94101
</dependency>
95102
<dependency>
96103
<groupId>org.slf4j</groupId>
@@ -114,7 +121,7 @@
114121
<dependency>
115122
<groupId>commons-dbcp</groupId>
116123
<artifactId>commons-dbcp</artifactId>
117-
<version>1.4</version>
124+
<version>${dbcp-version}</version>
118125
</dependency>
119126

120127
<dependency>
@@ -127,7 +134,7 @@
127134
<dependency>
128135
<groupId>junit</groupId>
129136
<artifactId>junit</artifactId>
130-
<version>4.10</version>
137+
<version>${junit-version}</version>
131138
<scope>test</scope>
132139
</dependency>
133140

@@ -168,12 +175,12 @@
168175
<plugin>
169176
<groupId>org.apache.maven.plugins</groupId>
170177
<artifactId>maven-source-plugin</artifactId>
171-
<version>3.0.1</version>
178+
<version>${mvn-source-version}</version>
172179
</plugin>
173180
<plugin>
174181
<groupId>org.apache.maven.plugins</groupId>
175182
<artifactId>maven-javadoc-plugin</artifactId>
176-
<version>2.10.4</version>
183+
<version>${mvn-javadoc-version}</version>
177184
</plugin>
178185
</plugins>
179186
</pluginManagement>
@@ -187,7 +194,7 @@
187194
<plugin>
188195
<groupId>org.sonatype.plugins</groupId>
189196
<artifactId>nexus-staging-maven-plugin</artifactId>
190-
<version>1.6.8</version>
197+
<version>${nexus-version}</version>
191198
<extensions>true</extensions>
192199
<configuration>
193200
<serverId>ossrh</serverId>
@@ -199,7 +206,7 @@
199206
<plugin>
200207
<groupId>org.apache.maven.plugins</groupId>
201208
<artifactId>maven-gpg-plugin</artifactId>
202-
<version>1.5</version>
209+
<version>${mvn-gpg-version}</version>
203210
<executions>
204211
<execution>
205212
<id>sign-artifacts</id>
@@ -222,7 +229,7 @@
222229
<plugin>
223230
<groupId>org.apache.maven.plugins</groupId>
224231
<artifactId>maven-jar-plugin</artifactId>
225-
<version>3.0.2</version>
232+
<version>${mvn-jar-version}</version>
226233
<configuration>
227234
<archive>
228235
<manifest>
@@ -235,7 +242,7 @@
235242
<plugin>
236243
<groupId>org.apache.maven.plugins</groupId>
237244
<artifactId>maven-shade-plugin</artifactId>
238-
<version>3.1.0</version>
245+
<version>${mvn-shade-version}</version>
239246
<executions>
240247
<execution>
241248
<phase>package</phase>

0 commit comments

Comments
 (0)