mvn-deploy reenabled

olir · Mar 28, 2018 · 301e22b · 301e22b
1 parent 25c7bb3
commit 301e22b
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 51 deletions.
diff --git a/app/src/main/java/de/serviceflow/frankenstein/fxml/FxMain.java b/app/src/main/java/de/serviceflow/frankenstein/fxml/FxMain.java
@@ -114,7 +114,7 @@ private void buildUI() {
 		FXMLLoader loader;
 
 		PropertyResourceBundle bundleConfiguration = (PropertyResourceBundle) ResourceBundle
-				.getBundle("de/screenflow/frankenstein/bundles/configuration", locale);
+				.getBundle("de/serviceflow/frankenstein/bundles/configuration", locale);
 		loader = new FXMLLoader(getClass().getResource("ConfigurationScene.fxml"), bundleConfiguration);
 		try {
 			sceneRoot = (BorderPane) loader.load();
@@ -127,7 +127,7 @@ private void buildUI() {
 		cController.configure(this, theStage);
 
 		PropertyResourceBundle bundleProcessing = (PropertyResourceBundle) ResourceBundle
-				.getBundle("de/screenflow/frankenstein/bundles/processing", locale);
+				.getBundle("de/serviceflow/frankenstein/bundles/processing", locale);
 		loader = new FXMLLoader(getClass().getResource("ProcessingScene.fxml"), bundleProcessing);
 		try {
 			sceneRoot = (BorderPane) loader.load();

diff --git a/app/src/main/java/de/serviceflow/frankenstein/fxml/ProcessingSceneController.java b/app/src/main/java/de/serviceflow/frankenstein/fxml/ProcessingSceneController.java
@@ -829,7 +829,7 @@ public void filterAdd() {
 	public void filterSetup() {
 
 		PropertyResourceBundle bundleConfiguration = (PropertyResourceBundle) ResourceBundle
-				.getBundle("de/screenflow/frankenstein/bundles/filtersetup", FxMain.getLocale());
+				.getBundle("de/serviceflow/frankenstein/bundles/filtersetup", FxMain.getLocale());
 		FXMLLoader loader = new FXMLLoader(getClass().getResource("FilterSetupPopup.fxml"), bundleConfiguration);
 		Stage stage = new Stage();
 		try {

diff --git a/jniplugin/java/pom.xml b/jniplugin/java/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <groupId>de.serviceflow.frankenstein</groupId>
         <artifactId>jniplugin-parent</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>de.serviceflow.frankenstein</groupId>
     <artifactId>jniplugin-java</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1-SNAPSHOT</version>
 
     <name>Native OpenCV Filters - Java Part</name>
     <!-- Credits to http://www.tricoder.net/blog/?p=197 -->
@@ -65,11 +65,11 @@
         </executions>
       </plugin>
 
-      <!-- Java Documentation -->
+      <!-- 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
 					  <id>attach-javadocs</id>
@@ -78,25 +78,6 @@
 					  </goals>
 					</execution>
 				</executions>
-				<configuration>
-					<doctitle>My API for ${project.name} ${project.version}</doctitle>
-					<windowtitle>My API for ${project.name} ${project.version}</windowtitle>
-					<testDoctitle>My Test API for ${project.name} ${project.version}</testDoctitle>
-					<testWindowtitle>My Test API for ${project.name} ${project.version}</testWindowtitle>
-					<show>private</show>
-					<failOnError>false</failOnError>
-					<sourcepath>${basedir}/target/generated</sourcepath>
-				</configuration>
-				<!--
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>javadoc-no-fork</report>
-							<report>test-javadoc-no-fork</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-				-->
       </plugin>
       
       <plugin>
@@ -112,7 +93,25 @@
 					</execution>
 				</executions>
 			</plugin>
-
+      
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.5</version>
+				<configuration>
+					<skip>false</skip>
+				</configuration>
+				<executions>
+					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>sign</goal>
+						</goals>
+					</execution>
+				</executions>
+      </plugin>
+      -->
 
     </plugins>
   </build>

diff --git a/jniplugin/native/pom.xml b/jniplugin/native/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>de.serviceflow.frankenstein</groupId>
         <artifactId>jniplugin-parent</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>de.serviceflow.frankenstein</groupId>
     <artifactId>jniplugin-native</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Native OpenCV Filters - native switch</name>

diff --git a/jniplugin/native/src/main/native/ExternalSample.cpp b/jniplugin/native/src/main/native/ExternalSample.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace cv;
 
-JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_external_ExternalSample_init
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_external_ExternalSample_init
   (JNIEnv* env, jobject obj)
 {
   JwMat* mat = JwMat::matptr;
@@ -21,7 +21,7 @@ JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_external_ExternalSampl
   }
 }
 
-JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_external_ExternalSample_process
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_external_ExternalSample_process
   (JNIEnv* env, jobject obj,
    jobject matobj, jint frameId, jobject context)
 {

diff --git a/jniplugin/native/src/main/native/MatBlender.cpp b/jniplugin/native/src/main/native/MatBlender.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace cv;
 
-JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_jni_MatBlender_init
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_jni_MatBlender_init
   (JNIEnv* env, jobject obj)
 {
   JwMat* mat = JwMat::matptr;
@@ -21,7 +21,7 @@ JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_jni_MatBlender_init
   }
 }
 
-JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_jni_MatBlender_process
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_jni_MatBlender_process
   (JNIEnv* env, jobject obj,
    jobject matobj, jint frameId, jobject context, jobject overlaymatobj)
 {

diff --git a/jniplugin/native/src/main/native/VideoEqualizer.cpp b/jniplugin/native/src/main/native/VideoEqualizer.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace cv;
 
-JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_jni_VideoEqualizer_init
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_jni_VideoEqualizer_init
   (JNIEnv* env, jobject obj)
 {
   JwMat* mat = JwMat::matptr;
@@ -21,7 +21,7 @@ JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_jni_VideoEqualizer_ini
   }
 }
 
-JNIEXPORT void JNICALL Java_de_screenflow_frankenstein_vf_jni_VideoEqualizer_process
+JNIEXPORT void JNICALL Java_de_serviceflow_frankenstein_vf_jni_VideoEqualizer_process
   (JNIEnv* env, jobject obj,
    jobject matobj, jint frameId, jobject context, jint brightness, jint contrast, jint saturation)
 {

diff --git a/jniplugin/native/win32/pom.xml b/jniplugin/native/win32/pom.xml
@@ -5,12 +5,12 @@
     <parent>
       <groupId>de.serviceflow.frankenstein</groupId>
       <artifactId>jniplugin-native</artifactId>
-      <version>0.2.0</version>
+      <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>de.serviceflow.frankenstein</groupId>
     <artifactId>jniplugin-32</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>dll</packaging>
 
     <name>Native OpenCV Filters - win32</name>

diff --git a/jniplugin/native/win64/pom.xml b/jniplugin/native/win64/pom.xml
@@ -5,12 +5,12 @@
     <parent>
       <groupId>de.serviceflow.frankenstein</groupId>
       <artifactId>jniplugin-native</artifactId>
-      <version>0.2.0</version>
+      <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>de.serviceflow.frankenstein</groupId>
     <artifactId>jniplugin-64</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>dll</packaging>
 
     <name>Native OpenCV Filters - win64</name>

diff --git a/jniplugin/pom.xml b/jniplugin/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>de.serviceflow.frankenstein</groupId>
         <artifactId>root</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>de.serviceflow.frankenstein</groupId>
     <artifactId>jniplugin-parent</artifactId>
-    <version>0.2.0</version>
+    <version>0.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Native OpenCV Filters - Parent</name>
@@ -21,14 +21,6 @@
       <module>native</module>
    </modules>
 
-  <dependencies>
-    <dependency>
-      <groupId>de.serviceflow.frankenstein</groupId>
-      <artifactId>app</artifactId>
-      <version>0.2.0</version>
-    </dependency>
-  </dependencies>
-
   <build>
 
 	<pluginManagement>

diff --git a/pom.xml b/pom.xml
@@ -21,14 +21,14 @@
   <!-- Maven Coordinates -->
   <groupId>de.serviceflow.frankenstein</groupId>
   <artifactId>root</artifactId>
-  <version>0.2.0</version>
+  <version>0.2.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Frankenstein - POM</name>
 
   <!-- Native Implementation Plugin -->
   <modules>
-    <!-- <module>jniplugin</module> -->
+    <module>jniplugin</module>
     <module>app</module>
   </modules>