Merge branch 'release/1.0'

QROWD · Sep 11, 2019 · 982c375 · 982c375
2 parents b3e5809 + 37340c0
commit 982c375
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/nifi-sparql-integrate-nar/pom.xml b/nifi-sparql-integrate-nar/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <groupId>org.aksw.sparql-integrate</groupId>
         <artifactId>nifi-sparql-integrate-bundle</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>nifi-sparql-integrate-nar</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <packaging>nar</packaging>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.aksw.sparql-integrate</groupId>
             <artifactId>nifi-sparql-integrate-processors</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
     </dependencies>
 

diff --git a/nifi-sparql-integrate-processors/pom.xml b/nifi-sparql-integrate-processors/pom.xml
@@ -19,15 +19,15 @@
     <parent>
         <groupId>org.aksw.sparql-integrate</groupId>
         <artifactId>nifi-sparql-integrate-bundle</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>nifi-sparql-integrate-processors</artifactId>
     <packaging>jar</packaging>
 
    <properties>
-        <jena.version>3.10.0</jena.version>
-        <jena-sparql-api.subversion>1-SNAPSHOT</jena-sparql-api.subversion>
+        <jena.version>3.11.0</jena.version>
+        <jena-sparql-api.subversion>1</jena-sparql-api.subversion>
         <jena-sparql-api.version>${jena.version}-${jena-sparql-api.subversion}</jena-sparql-api.version>
         <spring-boot.version>1.5.8.RELEASE</spring-boot.version>
         <!-- Project Settings -->

diff --git a/pom.xml b/pom.xml
@@ -24,13 +24,16 @@
 
     <groupId>org.aksw.sparql-integrate</groupId>
     <artifactId>nifi-sparql-integrate-bundle</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <packaging>pom</packaging>
 
     <modules>
         <module>nifi-sparql-integrate-processors</module>
         <module>nifi-sparql-integrate-nar</module>
     </modules>
+    <properties>
+        <allowSnapshots>true</allowSnapshots>
+    </properties>
 
     <dependencyManagement>
         <dependencies>
@@ -42,4 +45,28 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.amashchenko.maven.plugin</groupId>
+                <artifactId>gitflow-maven-plugin</artifactId>
+                <version>1.13.0</version>
+                <configuration>
+                    <installProject>false</installProject>
+                    <pushRemote>false</pushRemote>
+                    <gitFlowConfig>
+                        <versionTagPrefix>v</versionTagPrefix>
+                        <!-- These values should be defaults -->
+                        <!-- <productionBranch>master</productionBranch> -->
+                        <!-- <developmentBranch>develop</developmentBranch> -->
+                        <!-- <featureBranchPrefix>feature/</featureBranchPrefix> -->
+                        <!-- <releaseBranchPrefix>release/</releaseBranchPrefix> -->
+                        <!-- <hotfixBranchPrefix>hotfix/</hotfixBranchPrefix> -->
+                        <!-- <supportBranchPrefix>support/</supportBranchPrefix> -->
+                        <!-- <origin>origin</origin> -->
+                    </gitFlowConfig>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>