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

Commit

Permalink
Merge pull request #1 from zazi/master
Browse files Browse the repository at this point in the history 
upgrade to java 8
  • Loading branch information
@knutwalker
knutwalker committed Jun 4, 2015
2 parents e1cd4b3 + a89e5de commit cc2dec1
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 32 deletions.
64 changes: 53 additions & 11 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,59 @@

<groupId>org.dswarm</groupId>
<artifactId>graph-model</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.3-SNAPSHOT</version>
<packaging>jar</packaging>

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

<prerequisites>
<maven>3.0.4</maven>
</prerequisites>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.source.version>1.7</java.source.version>
<java.target.version>1.7</java.target.version>
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
<maven-clean-plugin.version>2.5</maven-clean-plugin.version>
<maven-release-plugin.version>2.4.2</maven-release-plugin.version>
<java.source.version>1.8</java.source.version>
<java.target.version>1.8</java.target.version>
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-assembly-plugin.version>2.5.3</maven-assembly-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
<maven-clean-plugin.version>2.6.1</maven-clean-plugin.version>
<maven-release-plugin.version>2.5.1</maven-release-plugin.version>
<version.maven.plugin.deploy>2.8.2</version.maven.plugin.deploy>
<version.maven.plugin.jar>2.6</version.maven.plugin.jar>
<version.maven.plugin.site>3.4</version.maven.plugin.site>
<version.maven.plugin.version>2.1</version.maven.plugin.version>
<version.maven.plugin.license>2.7</version.maven.plugin.license>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${version.maven.plugin.version}</version>
<configuration>
<allowSnapshots>false</allowSnapshots>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${version.maven.plugin.deploy}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${version.maven.plugin.site}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${version.maven.plugin.jar}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down Expand Up @@ -106,7 +138,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.6</version>
<version>${version.maven.plugin.license}</version>
<configuration>
<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
<properties>
Expand Down Expand Up @@ -146,6 +178,16 @@
</testResources>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${version.maven.plugin.version}</version>
</plugin>
</plugins>
</reporting>

<distributionManagement>
<repository>
<id>deployment</id>
Expand Down
39 changes: 18 additions & 21 deletions src/main/java/org/dswarm/graph/model/GraphStatics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,23 @@
*/
public final class GraphStatics {

public static final String ID = "__ID__";
public static final String UUID_W_DATA_MODEL = "__UUID_W_DATA_MODEL__";
public static final String UUID = "__UUID__";
public static final String HASH = "__HASH__";
public static final String URI = "__URI__";
public static final String URI_W_DATA_MODEL = "__URI_W_DATA_MODEL__";
public static final String VALUE = "__VALUE__";
public static final String ID = "id";
public static final String UUID = "h";
public static final String HASH = "hash";
public static final String URI = "u";
public static final String URI_W_DATA_MODEL = "uwdm";
public static final String VALUE = "v";

public static final String UUID_PROPERTY = "__UUID__";
public static final String UUID_W_DATA_MODEL_PROPERTY = "__UUID_W_DATA_MODEL__";
public static final String URI_PROPERTY = "__URI__";
public static final String URI_W_DATA_MODEL_PROPERTY = "__URI_W_DATA_MODEL__";
public static final String VALUE_PROPERTY = "__VALUE__";
public static final String ORDER_PROPERTY = "__ORDER__";
public static final String INDEX_PROPERTY = "__INDEX__";
public static final String PROVENANCE_PROPERTY = "__PROVENANCE__";
public static final String EVIDENCE_PROPERTY = "__EVIDENCE__";
public static final String CONFIDENCE_PROPERTY = "__CONFIDENCE__";
public static final String DATA_MODEL_PROPERTY = "__DATA_MODEL__";
public static final String RESOURCE_PROPERTY = "__RESOURCE__";
public static final String DATATYPE_PROPERTY = "__DATATYPE__";
public static final String NODETYPE_PROPERTY = "__NODETYPE__";
public static final String UUID_PROPERTY = "uuid";
public static final String URI_PROPERTY = "uri";
public static final String URI_W_DATA_MODEL_PROPERTY = "uwdm";
public static final String VALUE_PROPERTY = "value";
public static final String ORDER_PROPERTY = "order";
public static final String INDEX_PROPERTY = "index";
public static final String EVIDENCE_PROPERTY = "evidence";
public static final String CONFIDENCE_PROPERTY = "confidence";
public static final String DATA_MODEL_PROPERTY = "datamodel";
public static final String RESOURCE_PROPERTY = "resource";
public static final String DATATYPE_PROPERTY = "datatype";
public static final String NODETYPE_PROPERTY = "nodetype";
}

0 comments on commit cc2dec1

Please sign in to comment.