Skip to content

Commit ac3759e

Browse files
RuslanPopenkoRuslanPopenko
authored
Merge pull request #26 from jayway/release-1.29-beta2
Release 1.29 beta2
2 parents 6decde6 + ce8ef2e commit ac3759e

File tree

46 files changed

+3425
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3425
-129
lines changed

‎client/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-client</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>jar</packaging>
1212
<name>Streamflow client</name>
1313
<description>Streamflow client</description>

‎common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-common</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>jar</packaging>
1212
<name>Streamflow common</name>
1313
<description>Streamflow common</description>

‎dci/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-dci</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>jar</packaging>
1212
<name>Streamflow dci</name>
1313
<description>Streamflow Data Context Interaction</description>

‎dist/ear/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>dist</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>ear</artifactId>
99
<groupId>se.streamsource.streamflow.dist</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>ear</packaging>
1212
<name>Streamflow Ear</name>
1313
<description>Streamflow Ear Distribution</description>

‎dist/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>dist</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>pom</packaging>
1212
<name>Streamflow Distribution</name>
1313
<description>Streamflow Distribution</description>

‎dist/zip/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>dist</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>zip</artifactId>
99
<groupId>se.streamsource.streamflow.dist</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>pom</packaging>
1212
<name>Streamflow Zip</name>
1313
<description>Streamflow Complete Distribution</description>

‎fileconfig/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-fileconfig</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>jar</packaging>
1212
<name>Streamflow Fileconfig</name>
1313
<description>Streamflow Fileconfig helper to locate differnt directories on different platforms</description>

‎help/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<parent>
55
<groupId>se.streamsource.streamflow</groupId>
66
<artifactId>streamflow</artifactId>
7-
<version>1.28.3</version>
7+
<version>1.29-beta2</version>
88
</parent>
99
<groupId>se.streamsource.streamflow</groupId>
1010
<artifactId>streamflow-help</artifactId>
11-
<version>1.28.3</version>
11+
<version>1.29-beta2</version>
1212
<packaging>pom</packaging>
1313
<name>Streamflow help</name>
1414
<description>Streamflow help</description>

‎help/sv_gov/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<parent>
55
<groupId>se.streamsource.streamflow</groupId>
66
<artifactId>streamflow-help</artifactId>
7-
<version>1.28.3</version>
7+
<version>1.29-beta2</version>
88
</parent>
99
<groupId>se.streamsource.streamflow</groupId>
1010
<artifactId>streamflow-help-sv_gov</artifactId>
11-
<version>1.28.3</version>
11+
<version>1.29-beta2</version>
1212
<packaging>jar</packaging>
1313
<name>Streamflow help sv_gov</name>
1414
<description>Streamflow help sv_gov</description>

‎infrastructure/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-infrastructure</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>jar</packaging>
1212
<name>Streamflow Infrastructure</name>
1313
<description>Streamflow Infrastructure, common code for all streamflow components</description>

‎infrastructure/src/main/java/se/streamsource/infrastructure/index/elasticsearch/ElasticSearchIndexer.java

+4
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ private void index( BulkRequestBuilder bulkBuilder, String identity, String json
208208
* {
209209
* "_identity": "ENTITY-IDENTITY",
210210
* "_types": [ "All", "Entity", "types" ],
211+
* "_modified": 123,
212+
* "_description": "Main entity type",
211213
* "property.name": property.value,
212214
* "association.name": "ASSOCIATED-IDENTITY",
213215
* "manyassociation.name": [ "ASSOCIATED", "IDENTITIES" ]
@@ -223,6 +225,8 @@ private String toJSON( EntityState state, Map<String, EntityState> newStates, En
223225
json = new JSONObject();
224226

225227
json.put( "_identity", state.identity().identity() );
228+
json.put( "_modified", state.lastModified() );
229+
json.put( "_description", state.entityDescriptor().toString() );
226230

227231
json.put( "_types", Iterables.addAll( new ArrayList<String>(), Iterables.map( toClassName(), state.entityDescriptor().mixinTypes()) ) );
228232
EntityType entityType = state.entityDescriptor().entityType();

‎pom.xml

+29-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>se.streamsource.streamflow</groupId>
44
<artifactId>streamflow</artifactId>
55
<name>Streamflow (Build POM)</name>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
<packaging>pom</packaging>
88

99
<!-- This POM is ONLY to initiate the modules to be built. -->
@@ -47,14 +47,17 @@
4747
<name>MyGrid Repository</name>
4848
<url>http://www.mygrid.org.uk/maven/repository/</url>
4949
</repository>
50-
</repositories>
51-
<!-- <repositories>
50+
5251
<repository>
53-
<id>nexus</id>
54-
<url>http://79.125.6.136/nexus/content/groups/public</url>
52+
<id>JBoss 3rd-party</id>
53+
<name>JBoss 3rd-party Repository</name>
54+
<url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/</url>
55+
</repository>
56+
<repository>
57+
<id>Clojars</id>
58+
<name>Clojars Repository</name>
59+
<url>http://clojars.org/repo/</url>
5560
</repository>
56-
</repositories>
57-
-->
5861
<!-- <repositories>
5962
<repository>
6063
<id>streamflow-release</id>
@@ -103,7 +106,7 @@
103106
<connection>scm:git:https://github.com/jayway/streamflow-core.git</connection>
104107
<developerConnection>scm:git:https://github.com/jayway/streamflow-core.git
105108
</developerConnection>
106-
<tag>HEAD</tag>
109+
<tag>streamflow-1.29-beta2</tag>
107110
</scm>
108111

109112
<!-- <distributionManagement>
@@ -224,6 +227,18 @@
224227
</roles>
225228
<timezone>UTC+1</timezone>
226229
</developer>
230+
<developer>
231+
<id>ruslanpopenko</id>
232+
<name>Ruslan Popenko</name>
233+
<email>[email protected]</email>
234+
<url>http://imcode.com</url>
235+
<organization>imCode</organization>
236+
<organizationUrl>http://ubrainians.com</organizationUrl>
237+
<roles>
238+
<role>Developer</role>
239+
</roles>
240+
<timezone>UTC+2</timezone>
241+
</developer>
227242
</developers>
228243

229244
<contributors>
@@ -807,6 +822,12 @@
807822
<version>2.3</version>
808823
</dependency>
809824

825+
<dependency>
826+
<groupId>info.aduna</groupId>
827+
<artifactId>aduna-iteration</artifactId>
828+
<version>1.5</version>
829+
</dependency>
830+
810831
<!-- Scheduler -->
811832
<dependency>
812833
<groupId>org.quartz-scheduler</groupId>

‎referenceplugin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-reference-plugin</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>war</packaging>
1212
<name>Streamflow Reference Implementation Plugins</name>
1313
<description>Streamflow Reference Implementation plugins</description>

‎serverplugin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-server-plugin-spi</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>jar</packaging>
1212
<name>Streamflow server plugin SPI</name>
1313
<description>Streamflow server plugin SPI</description>

‎statistics/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>streamflow</artifactId>
44
<groupId>se.streamsource.streamflow</groupId>
5-
<version>1.28.3</version>
5+
<version>1.29-beta2</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>streamflow-statistic</artifactId>

‎streamflow-client-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-client-api</artifactId>
99
<packaging>jar</packaging>

‎streamflow-client-api/src/main/java/se/streamsource/streamflow/api/workspace/cases/CaseOutputConfigDTO.java

+3
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,7 @@ public interface CaseOutputConfigDTO
4242

4343
@UseDefaults
4444
Property<Boolean> caselog();
45+
46+
@UseDefaults
47+
Property<Boolean> notes();
4548
}

‎streamflow-surface-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-surface-api</artifactId>
99
<packaging>jar</packaging>

‎war/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88

99
<groupId>se.streamsource.streamflow</groupId>
1010
<artifactId>streamflow-war</artifactId>
11-
<version>1.28.3</version>
11+
<version>1.29-beta2</version>
1212

1313
<packaging>war</packaging>
1414
<name>Streamflow war</name>

‎web/pom.xml

+13-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<parent>
44
<groupId>se.streamsource.streamflow</groupId>
55
<artifactId>streamflow</artifactId>
6-
<version>1.28.3</version>
6+
<version>1.29-beta2</version>
77
</parent>
88
<artifactId>streamflow-web</artifactId>
99
<groupId>se.streamsource.streamflow</groupId>
10-
<version>1.28.3</version>
10+
<version>1.29-beta2</version>
1111
<packaging>war</packaging>
1212
<name>Streamflow web application</name>
1313
<description>Streamflow web application</description>
@@ -183,6 +183,12 @@
183183
<artifactId>aduna-commons-collections</artifactId>
184184
</dependency>
185185

186+
<dependency>
187+
<groupId>info.aduna</groupId>
188+
<artifactId>aduna-iteration</artifactId>
189+
</dependency>
190+
191+
186192
<dependency>
187193
<groupId>org.openrdf.sesame</groupId>
188194
<artifactId>sesame-model</artifactId>
@@ -292,6 +298,11 @@
292298
<artifactId>mysql-connector-java</artifactId>
293299
<version>5.1.14</version>
294300
</dependency>
301+
<dependency>
302+
<groupId>com.microsoft.sqlserver</groupId>
303+
<artifactId>sqljdbc4</artifactId>
304+
<version>4.0</version>
305+
</dependency>
295306

296307
<dependency>
297308
<groupId>c3p0</groupId>

0 commit comments

Comments
 (0)