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

Commit cc2dec1

Browse files
knutwalkerknutwalker
committed
Merge pull request #1 from zazi/master
upgrade to java 8
2 parents e1cd4b3 + a89e5de commit cc2dec1

File tree

2 files changed

+71
-32
lines changed

2 files changed

+71
-32
lines changed

‎pom.xml‎

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,59 @@
2121

2222
<groupId>org.dswarm</groupId>
2323
<artifactId>graph-model</artifactId>
24-
<version>0.0.2-SNAPSHOT</version>
24+
<version>0.0.3-SNAPSHOT</version>
2525
<packaging>jar</packaging>
2626

2727
<url>http://dswarm.org/</url>
2828
<name>d:swarm - Graph Model</name>
2929

30+
<prerequisites>
31+
<maven>3.0.4</maven>
32+
</prerequisites>
33+
3034
<properties>
3135
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32-
<java.source.version>1.7</java.source.version>
33-
<java.target.version>1.7</java.target.version>
34-
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
35-
<maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
36-
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
37-
<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
38-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
39-
<maven-clean-plugin.version>2.5</maven-clean-plugin.version>
40-
<maven-release-plugin.version>2.4.2</maven-release-plugin.version>
36+
<java.source.version>1.8</java.source.version>
37+
<java.target.version>1.8</java.target.version>
38+
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
39+
<maven-assembly-plugin.version>2.5.3</maven-assembly-plugin.version>
40+
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
41+
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
42+
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
43+
<maven-clean-plugin.version>2.6.1</maven-clean-plugin.version>
44+
<maven-release-plugin.version>2.5.1</maven-release-plugin.version>
45+
<version.maven.plugin.deploy>2.8.2</version.maven.plugin.deploy>
46+
<version.maven.plugin.jar>2.6</version.maven.plugin.jar>
47+
<version.maven.plugin.site>3.4</version.maven.plugin.site>
48+
<version.maven.plugin.version>2.1</version.maven.plugin.version>
49+
<version.maven.plugin.license>2.7</version.maven.plugin.license>
4150
</properties>
4251

4352
<build>
4453
<plugins>
54+
<plugin>
55+
<groupId>org.codehaus.mojo</groupId>
56+
<artifactId>versions-maven-plugin</artifactId>
57+
<version>${version.maven.plugin.version}</version>
58+
<configuration>
59+
<allowSnapshots>false</allowSnapshots>
60+
</configuration>
61+
</plugin>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-deploy-plugin</artifactId>
65+
<version>${version.maven.plugin.deploy}</version>
66+
</plugin>
67+
<plugin>
68+
<groupId>org.apache.maven.plugins</groupId>
69+
<artifactId>maven-site-plugin</artifactId>
70+
<version>${version.maven.plugin.site}</version>
71+
</plugin>
72+
<plugin>
73+
<groupId>org.apache.maven.plugins</groupId>
74+
<artifactId>maven-jar-plugin</artifactId>
75+
<version>${version.maven.plugin.jar}</version>
76+
</plugin>
4577
<plugin>
4678
<groupId>org.apache.maven.plugins</groupId>
4779
<artifactId>maven-compiler-plugin</artifactId>
@@ -106,7 +138,7 @@
106138
<plugin>
107139
<groupId>com.mycila</groupId>
108140
<artifactId>license-maven-plugin</artifactId>
109-
<version>2.6</version>
141+
<version>${version.maven.plugin.license}</version>
110142
<configuration>
111143
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
112144
<properties>
@@ -146,6 +178,16 @@
146178
</testResources>
147179
</build>
148180

181+
<reporting>
182+
<plugins>
183+
<plugin>
184+
<groupId>org.codehaus.mojo</groupId>
185+
<artifactId>versions-maven-plugin</artifactId>
186+
<version>${version.maven.plugin.version}</version>
187+
</plugin>
188+
</plugins>
189+
</reporting>
190+
149191
<distributionManagement>
150192
<repository>
151193
<id>deployment</id>

‎src/main/java/org/dswarm/graph/model/GraphStatics.java‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,23 @@
2020
*/
2121
public final class GraphStatics {
2222

23-
public static final String ID = "__ID__";
24-
public static final String UUID_W_DATA_MODEL = "__UUID_W_DATA_MODEL__";
25-
public static final String UUID = "__UUID__";
26-
public static final String HASH = "__HASH__";
27-
public static final String URI = "__URI__";
28-
public static final String URI_W_DATA_MODEL = "__URI_W_DATA_MODEL__";
29-
public static final String VALUE = "__VALUE__";
23+
public static final String ID = "id";
24+
public static final String UUID = "h";
25+
public static final String HASH = "hash";
26+
public static final String URI = "u";
27+
public static final String URI_W_DATA_MODEL = "uwdm";
28+
public static final String VALUE = "v";
3029

31-
public static final String UUID_PROPERTY = "__UUID__";
32-
public static final String UUID_W_DATA_MODEL_PROPERTY = "__UUID_W_DATA_MODEL__";
33-
public static final String URI_PROPERTY = "__URI__";
34-
public static final String URI_W_DATA_MODEL_PROPERTY = "__URI_W_DATA_MODEL__";
35-
public static final String VALUE_PROPERTY = "__VALUE__";
36-
public static final String ORDER_PROPERTY = "__ORDER__";
37-
public static final String INDEX_PROPERTY = "__INDEX__";
38-
public static final String PROVENANCE_PROPERTY = "__PROVENANCE__";
39-
public static final String EVIDENCE_PROPERTY = "__EVIDENCE__";
40-
public static final String CONFIDENCE_PROPERTY = "__CONFIDENCE__";
41-
public static final String DATA_MODEL_PROPERTY = "__DATA_MODEL__";
42-
public static final String RESOURCE_PROPERTY = "__RESOURCE__";
43-
public static final String DATATYPE_PROPERTY = "__DATATYPE__";
44-
public static final String NODETYPE_PROPERTY = "__NODETYPE__";
30+
public static final String UUID_PROPERTY = "uuid";
31+
public static final String URI_PROPERTY = "uri";
32+
public static final String URI_W_DATA_MODEL_PROPERTY = "uwdm";
33+
public static final String VALUE_PROPERTY = "value";
34+
public static final String ORDER_PROPERTY = "order";
35+
public static final String INDEX_PROPERTY = "index";
36+
public static final String EVIDENCE_PROPERTY = "evidence";
37+
public static final String CONFIDENCE_PROPERTY = "confidence";
38+
public static final String DATA_MODEL_PROPERTY = "datamodel";
39+
public static final String RESOURCE_PROPERTY = "resource";
40+
public static final String DATATYPE_PROPERTY = "datatype";
41+
public static final String NODETYPE_PROPERTY = "nodetype";
4542
}

0 commit comments

Comments
 (0)