Skip to content
This repository was archived by the owner on May 24, 2022. It is now read-only.

Commit 4ffd569

Browse files
committed
Merge pull request #9 from zazi/master
upgrade to java 8
2 parents 3aac582 + 2e15c0b commit 4ffd569

File tree

2 files changed

+49
-6
lines changed

2 files changed

+49
-6
lines changed

pom.xml

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424
<name>d:swarm - common</name>
2525
<description>utils commonly used</description>
2626

27+
<prerequisites>
28+
<maven>3.0.4</maven>
29+
</prerequisites>
30+
2731

2832
<properties>
2933
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30-
<java.source.version>1.7</java.source.version>
31-
<java.target.version>1.7</java.target.version>
34+
<java.source.version>1.8</java.source.version>
35+
<java.target.version>1.8</java.target.version>
3236
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
3337
<maven-assembly-plugin.version>2.5.3</maven-assembly-plugin.version>
3438
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
@@ -37,12 +41,16 @@
3741
<maven-clean-plugin.version>2.6.1</maven-clean-plugin.version>
3842
<maven-release-plugin.version>2.5.1</maven-release-plugin.version>
3943
<javax.ws.rs-api.version>2.0</javax.ws.rs-api.version>
40-
<slf4j-api.version>1.7.10</slf4j-api.version>
41-
<jena.version>2.12.0</jena.version>
44+
<slf4j-api.version>1.7.12</slf4j-api.version>
45+
<jena.version>2.13.0</jena.version>
4246
<version.guava>18.0</version.guava>
4347
<version.jackson>2.5.0</version.jackson>
44-
<junit.version>4.11</junit.version>
45-
<version.apache.commons>3.3.2</version.apache.commons>
48+
<junit.version>4.12</junit.version>
49+
<version.apache.commons>3.4</version.apache.commons>
50+
<version.maven.plugin.version>2.1</version.maven.plugin.version>
51+
<version.maven.plugin.jar>2.6</version.maven.plugin.jar>
52+
<version.maven.plugin.site>3.4</version.maven.plugin.site>
53+
<version.maven.plugin.deploy>2.8.2</version.maven.plugin.deploy>
4654
</properties>
4755

4856
<build>
@@ -135,6 +143,29 @@
135143
</execution>
136144
</executions>
137145
</plugin>
146+
<plugin>
147+
<groupId>org.codehaus.mojo</groupId>
148+
<artifactId>versions-maven-plugin</artifactId>
149+
<version>${version.maven.plugin.version}</version>
150+
<configuration>
151+
<allowSnapshots>false</allowSnapshots>
152+
</configuration>
153+
</plugin>
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-jar-plugin</artifactId>
157+
<version>${version.maven.plugin.jar}</version>
158+
</plugin>
159+
<plugin>
160+
<groupId>org.apache.maven.plugins</groupId>
161+
<artifactId>maven-site-plugin</artifactId>
162+
<version>${version.maven.plugin.site}</version>
163+
</plugin>
164+
<plugin>
165+
<groupId>org.apache.maven.plugins</groupId>
166+
<artifactId>maven-deploy-plugin</artifactId>
167+
<version>${version.maven.plugin.deploy}</version>
168+
</plugin>
138169
</plugins>
139170
<resources>
140171
<resource>
@@ -150,6 +181,16 @@
150181
</testResources>
151182
</build>
152183

184+
<reporting>
185+
<plugins>
186+
<plugin>
187+
<groupId>org.codehaus.mojo</groupId>
188+
<artifactId>versions-maven-plugin</artifactId>
189+
<version>${version.maven.plugin.version}</version>
190+
</plugin>
191+
</plugins>
192+
</reporting>
193+
153194
<distributionManagement>
154195
<repository>
155196
<id>deployment</id>

src/main/java/org/dswarm/common/DMPStatics.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ public interface DMPStatics {
7474
public static final String AT_MOST_IDENTIFIER = "at_most";
7575

7676
public static final String ENABLE_VERSIONING_IDENTIFIER = "enable_versioning";
77+
78+
public static final String ALL_VERSIONS_IDENTIFIER = "all_versions";
7779
}

0 commit comments

Comments
 (0)